mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

sigaction critical section refactor.

Browse source 
* libguile/scmsigs.c (scm_sigaction_for_thread): Use critical section
  dynwinds instead of SCM_CRITICAL_SECTION_START.
This commit is contained in:
Andy Wingo 2016-11-01 21:40:34 +01:00
parent 0a663877ac
commit 465466ce4d
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libguile/scmsigs.c
View file

@ -334,7 +334,9 @@ SCM_DEFINE (scm_sigaction_for_thread, "sigaction", 1, 3, 0,
scm_i_ensure_signal_delivery_thread (); scm_i_ensure_signal_delivery_thread ();
SCM_CRITICAL_SECTION_START; scm_dynwind_begin (0);
scm_dynwind_critical_section (SCM_BOOL_F);
old_handler = SCM_SIMPLE_VECTOR_REF (*signal_handlers, csig); old_handler = SCM_SIMPLE_VECTOR_REF (*signal_handlers, csig);
if (SCM_UNBNDP (handler)) if (SCM_UNBNDP (handler))
query_only = 1; query_only = 1;
@ -353,7 +355,6 @@ SCM_DEFINE (scm_sigaction_for_thread, "sigaction", 1, 3, 0,
} }
else else
{ {
SCM_CRITICAL_SECTION_END;
SCM_OUT_OF_RANGE (2, handler); SCM_OUT_OF_RANGE (2, handler);
} }
} }
@ -440,7 +441,9 @@ SCM_DEFINE (scm_sigaction_for_thread, "sigaction", 1, 3, 0,
} }
if (old_action.sa_handler == SIG_DFL || old_action.sa_handler == SIG_IGN) if (old_action.sa_handler == SIG_DFL || old_action.sa_handler == SIG_IGN)
old_handler = scm_from_long ((long) old_action.sa_handler); old_handler = scm_from_long ((long) old_action.sa_handler);
SCM_CRITICAL_SECTION_END;
scm_dynwind_end ();
return scm_cons (old_handler, scm_from_int (old_action.sa_flags)); return scm_cons (old_handler, scm_from_int (old_action.sa_flags));
#else #else
if (query_only) if (query_only)
@ -459,7 +462,9 @@ SCM_DEFINE (scm_sigaction_for_thread, "sigaction", 1, 3, 0,
} }
if (old_chandler == SIG_DFL || old_chandler == SIG_IGN) if (old_chandler == SIG_DFL || old_chandler == SIG_IGN)
old_handler = scm_from_long ((long) old_chandler); old_handler = scm_from_long ((long) old_chandler);
SCM_CRITICAL_SECTION_END;
scm_dynwind_end ();
return scm_cons (old_handler, scm_from_int (0)); return scm_cons (old_handler, scm_from_int (0));
#endif #endif
} }