Changeset 47128d9 for functions.c

Timestamp:

May 23, 2011, 8:57:46 PM (14 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:

• functions.c (modified) (3 diffs)

functions.c

@@ -2995 +2995 @@
       i--;
     }
-#if 0
-    /* FIXME!!! */
-    owl_function_mask_sigint(NULL);
-    if(owl_global_is_interrupted(&g)) {
-      owl_global_unset_interrupted(&g);
-      owl_function_unmask_sigint(NULL);
+    if (owl_global_take_interrupt(&g)) {
       owl_function_makemsg("Search interrupted!");
       owl_mainwin_redisplay(owl_global_get_mainwin(&g));
       return;
     }
-    owl_function_unmask_sigint(NULL);
-#endif
   }
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
@@ -3089 +3082 @@
           ret=ZLocateUser(zstr(user), &numlocs, ZAUTH);
 
-#if 0
-          /* FIXME!! */
-          owl_function_mask_sigint(NULL);
-          if(owl_global_is_interrupted(&g)) {
+          if (owl_global_take_interrupt(&g)) {
             interrupted = 1;
-            owl_global_unset_interrupted(&g);
-            owl_function_unmask_sigint(NULL);
             owl_function_makemsg("Interrupted!");
             break;
           }
-
-          owl_function_unmask_sigint(NULL);
-#endif
 
           if (ret!=ZERR_NONE) {
@@ -3506 +3491 @@
 }
 
-void owl_function_mask_sigint(sigset_t *oldmask) {
-  sigset_t intr;
-
-  sigemptyset(&intr);
-  sigaddset(&intr, SIGINT);
-  sigprocmask(SIG_BLOCK, &intr, oldmask);
-}
-
-void owl_function_unmask_sigint(sigset_t *oldmask) {
-  sigset_t intr;
-
-  sigemptyset(&intr);
-  sigaddset(&intr, SIGINT);
-  sigprocmask(SIG_UNBLOCK, &intr, oldmask);
-}
-
 void _owl_function_mark_message(const owl_message *m)
 {