Changeset 3a84694

Timestamp:

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

bf66f4e

Parents:

d6bd3f1

git-author:

Nelson Elhage <nelhage@mit.edu> (05/04/09 20:24:31)

git-committer:

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

Message:

Turn unhandled SIGINTs into fake keystrokes.

File:

• select.c (modified) (4 diffs)

select.c

@@ -41 +41 @@
 }
 
-void owl_select_process_timers(struct timeval *timeout)
+void owl_select_process_timers(struct timespec *timeout)
 {
   time_t now = time(NULL);
@@ -79 +79 @@
   }
 
-  timeout->tv_usec = 0;
+  timeout->tv_nsec = 0;
 }
 
@@ -287 +287 @@
 }
 
+void owl_select_handle_intr()
+{
+  owl_input in;
+  in.ch = in.uch = owl_global_get_startup_tio(&g)->c_cc[VINTR];
+  owl_process_input_char(in);
+}
+
 void owl_select()
 {
-  int i, max_fd, aim_max_fd, aim_done;
+  int i, max_fd, aim_max_fd, aim_done, ret;
   fd_set r;
   fd_set e;
   fd_set aim_rfds, aim_wfds;
-  struct timeval timeout;
+  struct timespec timeout;
+  sigset_t mask, intr;
+
+  sigemptyset(&intr);
+  sigaddset(&intr, SIGINT);
 
   owl_select_process_timers(&timeout);
+
+  sigprocmask(SIG_BLOCK, &intr, &mask);
+  if(owl_global_is_interrupted(&g)) {
+     owl_select_handle_intr();
+    return;
+  }
 
   max_fd = owl_select_dispatch_prepare_fd_sets(&r, &e);
@@ -325 +342 @@
   /* END AIM HACK */
 
-  if ( select(max_fd+1, &r, &aim_wfds, &e, &timeout) ) {
-    owl_global_unset_interrupted(&g);
+
+  ret = pselect(max_fd+1, &r, &aim_wfds, &e, &timeout, &mask);
+
+  if(ret < 0 && errno == EINTR) {
+    if(owl_global_is_interrupted(&g)) {
+      owl_select_handle_intr();
+    }
+    return;
+  }
+
+  sigprocmask(SIG_UNBLOCK, &intr, NULL);
+
+  if(ret > 0) {
     /* Merge fd_sets and clear AIM FDs. */
     for(i = 0; i <= max_fd; i++) {