mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00
Code Activity

fix deadlock in before-gc-hook on certain 7.2alpha gc versions

Browse source 
* libguile/gc.c (scm_init_gc): Only adjust gc frequency in the gc start
  hook if we know that it won't take a lock.
This commit is contained in:
Andy Wingo 2011-12-01 12:57:49 +01:00
parent fd51e66190
commit 738c899e4c
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libguile/gc.c
View file

@ -1024,11 +1024,20 @@ scm_init_gc ()
after_gc_async_thunk), after_gc_async_thunk),
SCM_BOOL_F); SCM_BOOL_F);
scm_c_hook_add (&scm_before_gc_c_hook, adjust_gc_frequency, NULL, 0);
scm_c_hook_add (&scm_before_gc_c_hook, queue_after_gc_hook, NULL, 0); scm_c_hook_add (&scm_before_gc_c_hook, queue_after_gc_hook, NULL, 0);
scm_c_hook_add (&scm_before_gc_c_hook, start_gc_timer, NULL, 0); scm_c_hook_add (&scm_before_gc_c_hook, start_gc_timer, NULL, 0);
scm_c_hook_add (&scm_after_gc_c_hook, accumulate_gc_timer, NULL, 0); scm_c_hook_add (&scm_after_gc_c_hook, accumulate_gc_timer, NULL, 0);
#if HAVE_GC_GET_HEAP_USAGE_SAFE
/* GC_get_heap_usage does not take a lock, and so can run in the GC
start hook. */
scm_c_hook_add (&scm_before_gc_c_hook, adjust_gc_frequency, NULL, 0);
#else
/* GC_get_heap_usage might take a lock (and did from 7.2alpha1 to
7.2alpha7), so call it in the after_gc_hook. */
scm_c_hook_add (&scm_after_gc_c_hook, adjust_gc_frequency, NULL, 0);
#endif
#ifdef HAVE_GC_SET_START_CALLBACK #ifdef HAVE_GC_SET_START_CALLBACK
GC_set_start_callback (run_before_gc_c_hook); GC_set_start_callback (run_before_gc_c_hook);
#endif #endif