Changeset adee9cc

Timestamp:

May 4, 2009, 9:55:11 PM (16 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:

d6bd3f1

Parents:

790ab12

git-author:

Nelson Elhage <nelhage@mit.edu> (05/03/09 15:31:50)

git-committer:

Nelson Elhage <nelhage@mit.edu> (05/04/09 21:55:11)

Message:

Enable signals, and add an interrupted flag.

Files:

• global.c (modified) (2 diffs)
• owl.c (modified) (3 diffs)
• owl.h (modified) (1 diff)
• select.c (modified) (1 diff)

global.c

@@ -116 +116 @@
   owl_list_create(&(g->dispatchlist));
   g->timerlist = NULL;
+  g->interrupted = FALSE;
 }
 
@@ -934 +935 @@
   return &(g->timerlist);
 }
+
+/*
+ * 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;
+}
+
+void owl_global_set_interrupted(owl_global *g) {
+  g->interrupted = 1;
+}
+
+void owl_global_unset_interrupted(owl_global *g) {
+  g->interrupted = 0;
+}

owl.c

@@ -137 +137 @@
   sigaction(SIGHUP, &sigact, NULL);
 
+  sigact.sa_sigaction=sigint_handler;
+  sigaction(SIGINT, &sigact, NULL);
+
   /* save initial terminal settings */
   tcgetattr(0, owl_global_get_startup_tio(&g));
@@ -156 +159 @@
   use_default_colors();
 #endif
-  raw();
+  cbreak();
   noecho();
 
@@ -675 +678 @@
 }
 
+void sigint_handler(int sig, siginfo_t *si, void *data)
+{
+  owl_global_set_interrupted(&g);
+}
+
 void usage()
 {

owl.h

@@ -595 +595 @@
   owl_timer *aim_nop_timer;
   int load_initial_subs;
+  int interrupted;
 } owl_global;
 

select.c

@@ -326 +326 @@
 
   if ( select(max_fd+1, &r, &aim_wfds, &e, &timeout) ) {
+    owl_global_unset_interrupted(&g);
     /* Merge fd_sets and clear AIM FDs. */
     for(i = 0; i <= max_fd; i++) {