github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-24 07:16:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct a comment and clean up code that listens for universal notifier

Browse Source 
changes
This commit is contained in:
ridiculousfish 2014-05-14 14:16:53 +08:00
parent a0e6d4375a
commit 30cfb3e795
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
input_common.cpp
View File

@ -184,19 +184,16 @@ static wint_t readb()
}
}
/* Notifiers either poll or have an fd, not both. So at most one of these branches will be taken. */
if (notifier.poll())
{
env_universal_barrier();
}
/* Check to see if we want a barrier */
bool barrier_from_poll = notifier.poll();
bool barrier_from_readability = false;
if (notifier_fd > 0 && FD_ISSET(notifier_fd, &fdset))
{
bool notified = notifier.notification_fd_became_readable(notifier_fd);
if (notified)
{
env_universal_barrier();
}
barrier_from_readability = notifier.notification_fd_became_readable(notifier_fd);
}
if (barrier_from_poll || barrier_from_readability)
{
env_universal_barrier();
}
if (ioport > 0 && FD_ISSET(ioport, &fdset))