Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-12 21:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up and adopt owning_lock in intern.cpp

Browse source
This commit is contained in:
ridiculousfish 2017-01-29 21:19:39 -08:00
parent f220250ada
commit 6db372133d
1 changed files with 9 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/intern.cpp
View file

@ -12,53 +12,29 @@
#include "fallback.h" // IWYU pragma: keep
#include "intern.h"
/// Comparison function for intern'd strings.
class string_table_compare_t {
public:
bool operator()(const wchar_t *a, const wchar_t *b) const { return wcscmp(a, b) < 0; }
};
bool string_less_than_string(const wchar_t *a, const wchar_t *b) {
return wcscmp(a, b) < 0;
}
// A sorted vector ends up being a little more memory efficient than a std::set for the intern'd
// string table.
#define USE_SET 0
#if USE_SET
/// The table of intern'd strings.
typedef std::set<const wchar_t *, string_table_compare_t> string_table_t;
#else
/// The table of intern'd strings.
typedef std::vector<const wchar_t *> string_table_t;
#endif
static string_table_t string_table;
/// The lock to provide thread safety for intern'd strings.
static pthread_mutex_t intern_lock = PTHREAD_MUTEX_INITIALIZER;
owning_lock<std::vector<const wchar_t *>> string_table;
static const wchar_t *intern_with_dup(const wchar_t *in, bool dup) {
if (!in) return NULL;
debug(5, L"intern %ls", in);
scoped_lock locker(intern_lock);
const wchar_t *result;
auto lock_string_table = string_table.acquire();
std::vector<const wchar_t *> &string_table = lock_string_table.value;
#if USE_SET
string_table_t::const_iterator iter = string_table.find(in);
if (iter != string_table.end()) {
result = *iter;
} else {
result = dup ? wcsdup(in) : in;
string_table.insert(result);
}
#else
string_table_t::iterator iter =
std::lower_bound(string_table.begin(), string_table.end(), in, string_table_compare_t());
const wchar_t *result;
auto iter = std::lower_bound(string_table.begin(), string_table.end(),
in, string_less_than_string);
if (iter != string_table.end() && wcscmp(*iter, in) == 0) {
result = *iter;
} else {
result = dup ? wcsdup(in) : in;
string_table.insert(iter, result);
}
#endif
return result;
}