Changeset 47128d9 for owl.c

Timestamp:

May 23, 2011, 8:57:46 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

6bd485e

Parents:

1491439

git-author:

David Benjamin <davidben@mit.edu> (02/26/11 14:38:04)

git-committer:

David Benjamin <davidben@mit.edu> (05/23/11 20:57:46)

Message:

Allow interrupts to be taken at any point

This way we can catch SIGINT in the middle of a search if we care.
(Though ideally we wouldn't block the event loop when searching like
this.)

File:

• owl.c (modified) (2 diffs)

owl.c

@@ -362 +362 @@
   } else if (sig == SIGTERM || sig == SIGHUP) {
     owl_function_quit();
-  } else if (sig == SIGINT) {
+  } else if (sig == SIGINT && owl_global_take_interrupt(&g)) {
     owl_input in;
     in.ch = in.uch = owl_global_get_startup_tio(&g)->c_cc[VINTR];
@@ -374 +374 @@
   GSource *source;
 
-  /* TODO: Special-case SIGINT so that it can interrupt outside the
-   * event loop. */
-
+  /* If it was an interrupt, set a flag so we can handle it earlier if
+   * needbe. sig_handler_main_thread will check the flag to make sure
+   * no one else took it. */
+  if (sig == SIGINT) {
+    owl_global_add_interrupt(&g);
+  }
   /* Send a message to the main thread. */
   source = g_idle_source_new();