Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-11 23:47:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'death_of_fishd' of https://github.com/fish-shell/fish-shell into death_of_fishd

Browse source
This commit is contained in:
ridiculousfish 2014-05-03 19:36:22 -07:00
commit 8cbd66b0f9
2 changed files with 55 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
env_universal_common.cpp
View file

@ -1590,32 +1590,18 @@ class universal_notifier_inotify_t : public universal_notifier_t
{ {
int watch_fd; int watch_fd;
int watch_descriptor; int watch_descriptor;
const std::string narrow_path;
void setup_inotify(const wchar_t *test_path) void reestablish_watch()
{ {
#if FISH_INOTIFY_AVAILABLE #if FISH_INOTIFY_AVAILABLE
const wcstring path = test_path ? test_path : default_vars_path();
// Construct the watchfd
#if HAVE_INOTIFY_INIT1
this->watch_fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
#else
this->watch_fd = inotify_init();
if (this->watch_fd >= 0) if (this->watch_fd >= 0)
{ {
int flags = fcntl(this->watch_fd, F_GETFL, 0); if (this->watch_descriptor >= 0)
fcntl(this->watch_fd, F_SETFL, flags | O_NONBLOCK | FD_CLOEXEC); {
} inotify_rm_watch(this->watch_fd, this->watch_descriptor);
#endif }
if (this->watch_fd < 0) this->watch_descriptor = inotify_add_watch(this->watch_fd, narrow_path.c_str(), IN_MODIFY | IN_MOVE_SELF | IN_DELETE_SELF | IN_EXCL_UNLINK);
{
wperror(L"inotify_init");
}
else
{
std::string narrow_path = wcs2string(path);
this->watch_descriptor = inotify_add_watch(this->watch_fd, narrow_path.c_str(), IN_MODIFY | IN_EXCL_UNLINK);
if (this->watch_descriptor < 0) if (this->watch_descriptor < 0)
{ {
wperror(L"inotify_add_watch"); wperror(L"inotify_add_watch");
@ -1624,9 +1610,33 @@ class universal_notifier_inotify_t : public universal_notifier_t
#endif #endif
} }
void setup_inotify(const wchar_t *test_path)
{
#if FISH_INOTIFY_AVAILABLE
// Construct the watchfd
#if HAVE_INOTIFY_INIT1
this->watch_fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
#else
this->watch_fd = inotify_init();
#endif
if (this->watch_fd < 0)
{
wperror(L"inotify_init");
}
else
{
int flags = fcntl(this->watch_fd, F_GETFL, 0);
fcntl(this->watch_fd, F_SETFL, flags | O_NONBLOCK | FD_CLOEXEC);
}
reestablish_watch();
#endif
}
public: public:
universal_notifier_inotify_t(const wchar_t *test_path) : watch_fd(-1), watch_descriptor(-1) universal_notifier_inotify_t(const wchar_t *test_path) : watch_fd(-1), watch_descriptor(-1), narrow_path(wcs2string(test_path ? test_path : default_vars_path()))
{ {
setup_inotify(test_path); setup_inotify(test_path);
} }
@ -1651,9 +1661,28 @@ public:
bool result = false; bool result = false;
#if FISH_INOTIFY_AVAILABLE #if FISH_INOTIFY_AVAILABLE
struct inotify_event evt = {}; for (;;)
ssize_t read_amt = read(watch_fd, &evt, sizeof evt); {
result = (read_amt > 0); struct inotify_event evt = {};
ssize_t read_amt = read(watch_fd, &evt, sizeof evt);
if (read_amt >= sizeof evt)
{
if (evt.mask & (IN_DELETE_SELF | IN_MOVE_SELF))
{
// When a file is deleted, the watch is lost. Recreate it.
reestablish_watch();
result = true;
}
if (evt.mask & IN_MODIFY)
{
result = true;
}
}
else
{
break;
}
}
#endif #endif
return result; return result;
} }

4
fish_tests.cpp
View file

@ -2292,7 +2292,7 @@ static void trigger_or_wait_for_notification(universal_notifier_t *notifier, uni
{ {
// Hacktastic. Replace the file, then wait // Hacktastic. Replace the file, then wait
char cmd[512]; char cmd[512];
sprintf(cmd, "cp %ls %ls ; mv %ls %ls", UVARS_TEST_PATH, UVARS_TEST_PATH L".tmp", UVARS_TEST_PATH ".tmp", UVARS_TEST_PATH); sprintf(cmd, "touch %ls ; mv %ls %ls", UVARS_TEST_PATH L".tmp", UVARS_TEST_PATH ".tmp", UVARS_TEST_PATH);
if (system(cmd)) err(L"Command failed: %s", cmd); if (system(cmd)) err(L"Command failed: %s", cmd);
usleep(1000000 / 25); usleep(1000000 / 25);
break; break;
@ -2371,8 +2371,6 @@ static void test_universal_notifiers()
test_notifiers_with_strategy(universal_notifier_t::strategy_notifyd); test_notifiers_with_strategy(universal_notifier_t::strategy_notifyd);
#endif #endif
#if __linux || linux #if __linux || linux
if (system("mkdir -p /tmp/fish_uvars_test/ && touch /tmp/fish_uvars_test/varsfile.txt")) err(L"mkdir failed");
test_notifiers_with_strategy(universal_notifier_t::strategy_inotify); test_notifiers_with_strategy(universal_notifier_t::strategy_inotify);
#endif #endif
} }