Changeset 47128d9 for functions.c


Ignore:
Timestamp:
May 23, 2011, 8:57:46 PM (10 years ago)
Author:
David Benjamin <davidben@mit.edu>
Branches:
master, 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:
1 edited

Legend:

Unmodified
Added
Removed
  • functions.c

    r3535a6e r47128d9  
    29952995      i--;
    29962996    }
    2997 #if 0
    2998     /* FIXME!!! */
    2999     owl_function_mask_sigint(NULL);
    3000     if(owl_global_is_interrupted(&g)) {
    3001       owl_global_unset_interrupted(&g);
    3002       owl_function_unmask_sigint(NULL);
     2997    if (owl_global_take_interrupt(&g)) {
    30032998      owl_function_makemsg("Search interrupted!");
    30042999      owl_mainwin_redisplay(owl_global_get_mainwin(&g));
    30053000      return;
    30063001    }
    3007     owl_function_unmask_sigint(NULL);
    3008 #endif
    30093002  }
    30103003  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
     
    30893082          ret=ZLocateUser(zstr(user), &numlocs, ZAUTH);
    30903083
    3091 #if 0
    3092           /* FIXME!! */
    3093           owl_function_mask_sigint(NULL);
    3094           if(owl_global_is_interrupted(&g)) {
     3084          if (owl_global_take_interrupt(&g)) {
    30953085            interrupted = 1;
    3096             owl_global_unset_interrupted(&g);
    3097             owl_function_unmask_sigint(NULL);
    30983086            owl_function_makemsg("Interrupted!");
    30993087            break;
    31003088          }
    3101 
    3102           owl_function_unmask_sigint(NULL);
    3103 #endif
    31043089
    31053090          if (ret!=ZERR_NONE) {
     
    35063491}
    35073492
    3508 void owl_function_mask_sigint(sigset_t *oldmask) {
    3509   sigset_t intr;
    3510 
    3511   sigemptyset(&intr);
    3512   sigaddset(&intr, SIGINT);
    3513   sigprocmask(SIG_BLOCK, &intr, oldmask);
    3514 }
    3515 
    3516 void owl_function_unmask_sigint(sigset_t *oldmask) {
    3517   sigset_t intr;
    3518 
    3519   sigemptyset(&intr);
    3520   sigaddset(&intr, SIGINT);
    3521   sigprocmask(SIG_UNBLOCK, &intr, oldmask);
    3522 }
    3523 
    35243493void _owl_function_mark_message(const owl_message *m)
    35253494{
Note: See TracChangeset for help on using the changeset viewer.