github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 10:43:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove the narrow_vars_path from universal variables

Browse Source 
This was a cache of the wide vars_path, but it's not worth its
complexity.
This commit is contained in:
ridiculousfish 2021-05-09 18:04:39 -07:00
parent 6ab7945623
commit 0d8cb0125a
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/env_universal_common.cpp
View File

@ -253,9 +253,7 @@ static wcstring encode_serialized(const wcstring_list_t &vals) {
} }
env_universal_t::env_universal_t(wcstring path, bool load_legacy) env_universal_t::env_universal_t(wcstring path, bool load_legacy)
: vars_path(std::move(path)), : vars_path(std::move(path)), load_legacy(load_legacy) {}
narrow_vars_path(wcs2string(vars_path)),
load_legacy(load_legacy) {}
env_universal_t::env_universal_t() : env_universal_t(default_vars_path(), true /* load_legacy */) {} env_universal_t::env_universal_t() : env_universal_t(default_vars_path(), true /* load_legacy */) {}
@ -411,7 +409,7 @@ void env_universal_t::load_from_fd(int fd, callback_data_list_t &callbacks) {
} }
} }
bool env_universal_t::load_from_path(const std::string &path, callback_data_list_t &callbacks) { bool env_universal_t::load_from_path(const wcstring &path, callback_data_list_t &callbacks) {
ASSERT_IS_LOCKED(lock); ASSERT_IS_LOCKED(lock);
// Check to see if the file is unchanged. We do this again in load_from_fd, but this avoids // Check to see if the file is unchanged. We do this again in load_from_fd, but this avoids
@ -422,7 +420,7 @@ bool env_universal_t::load_from_path(const std::string &path, callback_data_list
} }
bool result = false; bool result = false;
autoclose_fd_t fd{open_cloexec(path.c_str(), O_RDONLY)}; autoclose_fd_t fd{wopen_cloexec(path, O_RDONLY)};
if (fd.valid()) { if (fd.valid()) {
FLOGF(uvar_file, L"universal log reading from file"); FLOGF(uvar_file, L"universal log reading from file");
this->load_from_fd(fd.fd(), callbacks); this->load_from_fd(fd.fd(), callbacks);
@ -431,10 +429,6 @@ bool env_universal_t::load_from_path(const std::string &path, callback_data_list
return result; return result;
} }
bool env_universal_t::load_from_path(const wcstring &path, callback_data_list_t &callbacks) {
return load_from_path(wcs2string(path), callbacks);
}
uint64_t env_universal_t::get_export_generation() const { uint64_t env_universal_t::get_export_generation() const {
scoped_lock locker(lock); scoped_lock locker(lock);
return export_generation; return export_generation;
@ -500,7 +494,7 @@ void env_universal_t::initialize(callback_data_list_t &callbacks) {
if (vars_path.empty()) return; if (vars_path.empty()) return;
scoped_lock locker(lock); scoped_lock locker(lock);
if (load_from_path(narrow_vars_path, callbacks)) { if (load_from_path(vars_path, callbacks)) {
// Successfully loaded from our normal path. // Successfully loaded from our normal path.
return; return;
} }
@ -571,7 +565,7 @@ static bool lock_uvar_file(int fd) {
return check_duration(start_time); return check_duration(start_time);
} }
bool env_universal_t::open_and_acquire_lock(const std::string &path, autoclose_fd_t *out_fd) { bool env_universal_t::open_and_acquire_lock(const wcstring &path, autoclose_fd_t *out_fd) {
// Attempt to open the file for reading at the given path, atomically acquiring a lock. On BSD, // Attempt to open the file for reading at the given path, atomically acquiring a lock. On BSD,
// we can use O_EXLOCK. On Linux, we open the file, take a lock, and then compare fstat() to // we can use O_EXLOCK. On Linux, we open the file, take a lock, and then compare fstat() to
// stat(); if they match, it means that the file was not replaced before we acquired the lock. // stat(); if they match, it means that the file was not replaced before we acquired the lock.
@ -592,7 +586,7 @@ bool env_universal_t::open_and_acquire_lock(const std::string &path, autoclose_f
autoclose_fd_t fd{}; autoclose_fd_t fd{};
while (!fd.valid()) { while (!fd.valid()) {
double start_time = timef(); double start_time = timef();
fd = autoclose_fd_t{open_cloexec(path, flags, 0644)}; fd = autoclose_fd_t{wopen_cloexec(path, flags, 0644)};
if (!fd.valid()) { if (!fd.valid()) {
if (errno == EINTR) continue; // signaled; try again if (errno == EINTR) continue; // signaled; try again
#ifdef O_EXLOCK #ifdef O_EXLOCK
@ -672,7 +666,7 @@ bool env_universal_t::sync(callback_data_list_t &callbacks) {
// with fire anyways. // with fire anyways.
// If we have no changes, just load. // If we have no changes, just load.
if (modified.empty()) { if (modified.empty()) {
this->load_from_path(narrow_vars_path, callbacks); this->load_from_path(vars_path, callbacks);
FLOGF(uvar_file, L"universal log no modifications"); FLOGF(uvar_file, L"universal log no modifications");
return false; return false;
} }
@ -683,7 +677,7 @@ bool env_universal_t::sync(callback_data_list_t &callbacks) {
FLOGF(uvar_file, L"universal log performing full sync"); FLOGF(uvar_file, L"universal log performing full sync");
// Open the file. // Open the file.
if (!this->open_and_acquire_lock(narrow_vars_path, &vars_fd)) { if (!this->open_and_acquire_lock(vars_path, &vars_fd)) {
FLOGF(uvar_file, L"universal log open_and_acquire_lock() failed"); FLOGF(uvar_file, L"universal log open_and_acquire_lock() failed");
return false; return false;
} }

20
src/env_universal_common.h
View File

@ -29,7 +29,7 @@ struct callback_data_t {
bool is_erase() const { return !val.has_value(); } bool is_erase() const { return !val.has_value(); }
}; };
typedef std::vector<callback_data_t> callback_data_list_t; using callback_data_list_t = std::vector<callback_data_t>;
// List of fish universal variable formats. // List of fish universal variable formats.
// This is exposed for testing. // This is exposed for testing.
@ -39,6 +39,12 @@ bool get_hostname_identifier(wcstring &result);
/// Class representing universal variables. /// Class representing universal variables.
class env_universal_t { class env_universal_t {
// Path that we save to.
const wcstring vars_path;
// Whether to load from legacy paths.
const bool load_legacy;
// The table of variables. Note this is sorted; this ensures that the output file is in sorted // The table of variables. Note this is sorted; this ensures that the output file is in sorted
// order. // order.
var_table_t vars; var_table_t vars;
@ -47,10 +53,6 @@ class env_universal_t {
// vars indicates a deleted value. // vars indicates a deleted value.
std::unordered_set<wcstring> modified; std::unordered_set<wcstring> modified;
// Path that we save to.
const wcstring vars_path;
const std::string narrow_vars_path;
// A generation count which is incremented every time an exported variable is modified. // A generation count which is incremented every time an exported variable is modified.
uint64_t export_generation{1}; uint64_t export_generation{1};
@ -58,11 +60,7 @@ class env_universal_t {
// fish wrote the uvars contents. // fish wrote the uvars contents.
bool ok_to_save{true}; bool ok_to_save{true};
// Whether to load from legacy paths.
const bool load_legacy;
mutable std::mutex lock; mutable std::mutex lock;
bool load_from_path(const std::string &path, callback_data_list_t &callbacks);
bool load_from_path(const wcstring &path, callback_data_list_t &callbacks); bool load_from_path(const wcstring &path, callback_data_list_t &callbacks);
void load_from_fd(int fd, callback_data_list_t &callbacks); void load_from_fd(int fd, callback_data_list_t &callbacks);
@ -70,7 +68,7 @@ class env_universal_t {
bool remove_internal(const wcstring &key); bool remove_internal(const wcstring &key);
// Functions concerned with saving. // Functions concerned with saving.
bool open_and_acquire_lock(const std::string &path, autoclose_fd_t *out_fd); bool open_and_acquire_lock(const wcstring &path, autoclose_fd_t *out_fd);
autoclose_fd_t open_temporary_file(const wcstring &directory, wcstring *out_path); autoclose_fd_t open_temporary_file(const wcstring &directory, wcstring *out_path);
bool write_to_fd(int fd, const wcstring &path); bool write_to_fd(int fd, const wcstring &path);
bool move_new_vars_file_into_place(const wcstring &src, const wcstring &dst); bool move_new_vars_file_into_place(const wcstring &src, const wcstring &dst);
@ -152,7 +150,7 @@ class env_universal_t {
/// variable change notifications. These notifications do not contain the change, but merely /// variable change notifications. These notifications do not contain the change, but merely
/// indicate that the uvar file has changed. It is up to the uvar subsystem to re-read the file. /// indicate that the uvar file has changed. It is up to the uvar subsystem to re-read the file.
/// ///
/// We support a few notificatins strategies. Not all strategies are supported on all platforms. /// We support a few notification strategies. Not all strategies are supported on all platforms.
/// ///
/// Notifiers may request polling, and/or provide a file descriptor to be watched for readability in /// Notifiers may request polling, and/or provide a file descriptor to be watched for readability in
/// select(). /// select().