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

Inline struct scm_vm into struct scm_i_thread

Browse source 
* libguile/threads.h (scm_i_thread): Inline struct scm_vm into struct
  scm_i_thread, as these exist in a one-to-one relationship.
* libguile/threads.c (guilify_self_1, thread_mark, on_thread_exit):
* libguile/control.c (scm_suspendable_continuation_p):
* libguile/vm.c (init_vm, thread_vm): Adapt users.
This commit is contained in:
Andy Wingo 2018-06-24 08:59:42 +02:00
parent aad5bfed60
commit 2480761bde
4 changed files with 13 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libguile/threads.c
View file

@ -114,8 +114,8 @@ thread_mark (GC_word *addr, struct GC_ms_entry *mark_stack_ptr,
}
}
if (t->vp)
mark_stack_ptr = scm_i_vm_mark_stack (t->vp, mark_stack_ptr,
if (t->vm.stack_bottom)
mark_stack_ptr = scm_i_vm_mark_stack (&t->vm, mark_stack_ptr,
mark_stack_limit);
return mark_stack_ptr;
@ -380,23 +380,17 @@ guilify_self_1 (struct GC_stack_base *base, int needs_unregister)
cause GC to run, and GC could cause finalizers, which could invoke
Scheme functions, which need the current thread to be set. */
memset (&t, 0, sizeof (t));
t.pthread = scm_i_pthread_self ();
t.handle = SCM_BOOL_F;
t.result = SCM_BOOL_F;
t.freelists = NULL;
t.pointerless_freelists = NULL;
t.dynamic_state = NULL;
t.dynstack.base = NULL;
t.dynstack.top = NULL;
t.dynstack.limit = NULL;
t.pending_asyncs = SCM_EOL;
t.block_asyncs = 1;
t.base = base->mem_base;
t.continuation_root = SCM_EOL;
t.continuation_base = t.base;
scm_i_pthread_cond_init (&t.sleep_cond, NULL);
t.wake = NULL;
t.vp = NULL;
if (pipe2 (t.sleep_pipe, O_CLOEXEC) != 0)
/* FIXME: Error conditions during the initialization phase are handled
@ -514,12 +508,7 @@ on_thread_exit (void *v)
t->dynstack.base = NULL;
t->dynstack.top = NULL;
t->dynstack.limit = NULL;
{
struct scm_vm *vp = t->vp;
t->vp = NULL;
if (vp)
scm_i_vm_free_stack (vp);
}
scm_i_vm_free_stack (&t->vm);
#ifdef SCM_HAVE_THREAD_STORAGE_CLASS
scm_i_current_thread = NULL;