Changeset 0cb6c26 for global.c

Timestamp:

May 5, 2009, 1:30:07 AM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

1e6e74e

Parents:

e0473d2

Message:

Fix a race that could cause us to miss a SIGINT

When I refactored the previous commits to unmask SIGINT in
owl_global_is_interrupted, I accidentally opened a window for us to miss
a SIGINT for a cycle of the event loop if it arrived in owl_select()
between a call to that functuon and pselect().

Undo that refactoring to make is_interrupted() just poll the flag, add
owl_function_(un)mask_sigint() for convenience, and use them in the
relevant locations.

File:

• global.c (modified) (1 diff)

global.c

@@ -936 +936 @@
 }
 
-/*
- * Note: This must be called with SIGINT masked in order to avoid
- * races. This will unset the interrupt flag and unblock SIGINT before
- * returning.
- */
 int owl_global_is_interrupted(owl_global *g) {
-  int interrupted;
-  sigset_t intr;
-  sigemptyset(&intr);
-  sigaddset(&intr, SIGINT);
-
-  interrupted = g->interrupted;
-  g->interrupted = 0;
-
-  sigprocmask(SIG_UNBLOCK, &intr, NULL);
-  return interrupted;
+  return g->interrupted;
 }