fix scheduling

Handle kevent interruptions in the haskell code, so it can yield to other threads
This commit is contained in:
Joey Hess 2012-06-19 04:52:55 +00:00
parent a5cceb7d4f
commit 03b9341356
2 changed files with 16 additions and 15 deletions

View file

@ -17,6 +17,8 @@
/* The specified fds are added to the set of fds being watched for changes.
* Fds passed to prior calls still take effect, so it's most efficient to
* not pass the same fds repeatedly.
*
* Returns the fd that changed, or -1 on error.
*/
signed int helper(const int kq, const int fdcnt, const int *fdlist, int nodelay) {
int i, nev;
@ -32,12 +34,7 @@ signed int helper(const int kq, const int fdcnt, const int *fdlist, int nodelay)
0, 0);
}
while ((nev = kevent(kq, chlist, fdcnt, evlist, 1, timeout))) {
if (!(nev == -1 && errno == EINTR)) {
break;
}
}
nev = kevent(kq, chlist, fdcnt, evlist, 1, timeout);
if (nev == 1)
return evlist[0].ident;
else
@ -59,10 +56,7 @@ void addfds_kqueue(const int kq, const int fdcnt, const int *fdlist) {
helper(kq, fdcnt, fdlist, 1);
}
/* Waits for a change event on a kqueue.
*
* Returns the fd that changed, or -1 on error.
*/
/* Waits for a change event on a kqueue. */
signed int waitchange_kqueue(const int kq) {
return helper(kq, 0, NULL, 0);
}