h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-07-03 01:41:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Add sigio-based universal notifier strategy

Browse Source 
Introduce a new strategy for notifying other fish processes of universal
variable changes, as a planned replacement for the complex
strategy_named_pipe. The new strategy still uses a named pipe, but instead
of select() on it, it arranges for SIGIO to be delivered when data is
available. If a SIGIO has been seen since the last check, it means the file
needs to be re-read.
This commit is contained in:
ridiculousfish
2020-10-01 12:35:18 -07:00
parent 700fe4f131
commit 558dd6e53d
5 changed files with 157 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/fish_tests.cpp
View File

@@ -3776,13 +3776,11 @@ static void test_universal_ok_to_save() {
}
bool poll_notifier(const std::unique_ptr<universal_notifier_t> &note) {
bool result = false;
if (note->usec_delay_between_polls() > 0) {
result = note->poll();
}
if (note->poll()) return true;
bool result = false;
int fd = note->notification_fd();
if (!result && fd >= 0) {
if (fd >= 0) {
fd_set fds;
FD_ZERO(&fds);
FD_SET(fd, &fds);
@@ -3805,7 +3803,8 @@ static void trigger_or_wait_for_notification(universal_notifier_t::notifier_stra
usleep(40000);
break;
}
case universal_notifier_t::strategy_named_pipe: {
case universal_notifier_t::strategy_named_pipe:
case universal_notifier_t::strategy_sigio: {
break; // nothing required
}
}
@@ -3816,6 +3815,9 @@ static void test_notifiers_with_strategy(universal_notifier_t::notifier_strategy
std::unique_ptr<universal_notifier_t> notifiers[16];
size_t notifier_count = sizeof notifiers / sizeof *notifiers;
// Set up SIGIO handler as needed.
signal_set_handlers(false);
// Populate array of notifiers.
for (size_t i = 0; i < notifier_count; i++) {
notifiers[i] = universal_notifier_t::new_notifier_for_strategy(strategy, UVARS_TEST_PATH);