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

(scm_async_click): Reset pending_asyncs, handle

Browse source 
signal_asyncs.  Don't set cdr of a non-signal async to #f.
(scm_i_queue_async_cell): Do not check cdr of cell for #f, queue
always.  Set pending_asyncs.
(scm_system_async_mark_for_thread): Check that thread has not
exited.
(scm_unmask_signals, decrease_block): Call scm_async_click after
block_asyncs becomes zero.
This commit is contained in:
Marius Vollmer 2002-10-27 20:22:01 +00:00
parent 1ceead47c4
commit 402858a4d3
1 changed files with 46 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

76
libguile/async.c
View file

@ -167,22 +167,34 @@ SCM_DEFINE (scm_run_asyncs, "run-asyncs", 1, 0, 0,
void void
scm_async_click () scm_async_click ()
{ {
SCM asyncs; /* Reset pending_asyncs even when asyncs are blocked and not really
executed.
*/
scm_root->pending_asyncs = 0;
if (scm_root->block_asyncs == 0) if (scm_root->block_asyncs == 0)
{ {
SCM asyncs;
while (!SCM_NULLP(asyncs = scm_root->active_asyncs)) while (!SCM_NULLP(asyncs = scm_root->active_asyncs))
{ {
scm_root->active_asyncs = SCM_EOL; scm_root->active_asyncs = SCM_EOL;
do do
{ {
SCM c = SCM_CDR (asyncs);
SCM_SETCDR (asyncs, SCM_BOOL_F);
scm_call_0 (SCM_CAR (asyncs)); scm_call_0 (SCM_CAR (asyncs));
asyncs = c; asyncs = SCM_CDR (asyncs);
} }
while (!SCM_NULLP(asyncs)); while (!SCM_NULLP(asyncs));
} }
for (asyncs = scm_root->signal_asyncs; !SCM_NULLP(asyncs);
asyncs = SCM_CDR (asyncs))
{
if (!SCM_FALSEP (SCM_CAR (asyncs)))
{
SCM proc = SCM_CAR (asyncs);
SCM_SETCAR (asyncs, SCM_BOOL_F);
scm_call_0 (proc);
}
}
} }
} }
@ -206,24 +218,22 @@ SCM_DEFINE (scm_system_async, "system-async", 1, 0, 0,
void void
scm_i_queue_async_cell (SCM c, scm_root_state *root) scm_i_queue_async_cell (SCM c, scm_root_state *root)
{ {
if (SCM_CDR (c) == SCM_BOOL_F) SCM p = root->active_asyncs;
SCM_SETCDR (c, SCM_EOL);
if (p == SCM_EOL)
root->active_asyncs = c;
else
{ {
SCM p = root->active_asyncs; SCM pp;
SCM_SETCDR (c, SCM_EOL); while ((pp = SCM_CDR(p)) != SCM_EOL)
if (p == SCM_EOL)
root->active_asyncs = c;
else
{ {
SCM pp; if (SCM_CAR (p) == SCM_CAR (c))
while ((pp = SCM_CDR(p)) != SCM_EOL) return;
{ p = pp;
if (SCM_CAR (p) == SCM_CAR (c))
return;
p = pp;
}
SCM_SETCDR (p, c);
} }
SCM_SETCDR (p, c);
} }
root->pending_asyncs = 1;
} }
SCM_DEFINE (scm_system_async_mark_for_thread, "system-async-mark", 1, 1, 0, SCM_DEFINE (scm_system_async_mark_for_thread, "system-async-mark", 1, 1, 0,
@ -242,8 +252,11 @@ SCM_DEFINE (scm_system_async_mark_for_thread, "system-async-mark", 1, 1, 0,
if (SCM_UNBNDP (thread)) if (SCM_UNBNDP (thread))
thread = scm_current_thread (); thread = scm_current_thread ();
else else
SCM_VALIDATE_THREAD (2, thread); {
SCM_VALIDATE_THREAD (2, thread);
if (scm_c_thread_exited_p (thread))
SCM_MISC_ERROR ("thread has already exited", SCM_EOL);
}
scm_i_queue_async_cell (scm_cons (proc, SCM_BOOL_F), scm_i_queue_async_cell (scm_cons (proc, SCM_BOOL_F),
scm_i_thread_root (thread)); scm_i_thread_root (thread));
#else #else
@ -292,6 +305,7 @@ SCM_DEFINE (scm_unmask_signals, "unmask-signals", 0, 0, 0,
if (scm_root->block_asyncs == 0) if (scm_root->block_asyncs == 0)
SCM_MISC_ERROR ("signals already unmasked", SCM_EOL); SCM_MISC_ERROR ("signals already unmasked", SCM_EOL);
scm_root->block_asyncs = 0; scm_root->block_asyncs = 0;
scm_async_click ();
return SCM_UNSPECIFIED; return SCM_UNSPECIFIED;
} }
#undef FUNC_NAME #undef FUNC_NAME
@ -324,6 +338,8 @@ static void
decrease_block (void *unused) decrease_block (void *unused)
{ {
scm_root->block_asyncs--; scm_root->block_asyncs--;
if (scm_root->block_asyncs == 0)
scm_async_click ();
} }
SCM_DEFINE (scm_call_with_blocked_asyncs, "call-with-blocked-asyncs", 1, 0, 0, SCM_DEFINE (scm_call_with_blocked_asyncs, "call-with-blocked-asyncs", 1, 0, 0,
@ -336,17 +352,17 @@ SCM_DEFINE (scm_call_with_blocked_asyncs, "call-with-blocked-asyncs", 1, 0, 0,
return scm_internal_dynamic_wind (increase_block, return scm_internal_dynamic_wind (increase_block,
(scm_t_inner) scm_call_0, (scm_t_inner) scm_call_0,
decrease_block, decrease_block,
proc, NULL); (void *)proc, NULL);
} }
#undef FUNC_NAME #undef FUNC_NAME
void * void *
scm_c_call_with_blocked_asyncs (void *(*proc) (void *data), void *data) scm_c_call_with_blocked_asyncs (void *(*proc) (void *data), void *data)
{ {
return scm_internal_dynamic_wind (increase_block, return (void *)scm_internal_dynamic_wind (increase_block,
(scm_t_inner) proc, (scm_t_inner) proc,
decrease_block, decrease_block,
data, NULL); data, NULL);
} }
@ -362,7 +378,7 @@ SCM_DEFINE (scm_call_with_unblocked_asyncs, "call-with-unblocked-asyncs", 1, 0,
return scm_internal_dynamic_wind (decrease_block, return scm_internal_dynamic_wind (decrease_block,
(scm_t_inner) scm_call_0, (scm_t_inner) scm_call_0,
increase_block, increase_block,
proc, NULL); (void *)proc, NULL);
} }
#undef FUNC_NAME #undef FUNC_NAME
@ -372,10 +388,10 @@ scm_c_call_with_unblocked_asyncs (void *(*proc) (void *data), void *data)
if (scm_root->block_asyncs == 0) if (scm_root->block_asyncs == 0)
scm_misc_error ("scm_c_call_with_unblocked_asyncs", scm_misc_error ("scm_c_call_with_unblocked_asyncs",
"asyncs already unblocked", SCM_EOL); "asyncs already unblocked", SCM_EOL);
return scm_internal_dynamic_wind (decrease_block, return (void *)scm_internal_dynamic_wind (decrease_block,
(scm_t_inner) proc, (scm_t_inner) proc,
increase_block, increase_block,
data, NULL); data, NULL);
} }