diff options
author | Andy Wingo <wingo@pobox.com> | 2011-01-22 19:55:31 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-01-22 19:55:31 +0100 |
commit | cde24ce12bcef1205d36ac73aa7cc043c79ab257 (patch) | |
tree | efcaa02c68d55fc885e0fbe62fd4220b6cfd0185 /libguile/threads.h | |
parent | 6d6b2d4fcd3fa1cf5f5d0be7cf6f35cb7287a682 (diff) |
scm_with_guile calls GC_call_with_gc_active
* configure.ac: Check for GC_call_with_gc_active.
* libguile/threads.h (scm_i_thread): Remove "top", as it's not used.
* libguile/threads.c (with_gc_inactive, with_gc_active): Define shims to
GC_do_blocking and GC_call_with_gc_active.
(scm_i_init_thread_for_guile): Don't do thread base adjustment here,
do it in scm_i_with_guile_and_parent. The previous logic would never
be run.
(scm_i_with_guile_and_parent): If we enter Guile mode, leave it too.
Take care of adjusting the thread stack base here too. Also, call
with_gc_active.
(scm_without_guile): Refactor.
Diffstat (limited to 'libguile/threads.h')
-rw-r--r-- | libguile/threads.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libguile/threads.h b/libguile/threads.h index 4b06590e4..b5e3c2153 100644 --- a/libguile/threads.h +++ b/libguile/threads.h @@ -3,7 +3,7 @@ #ifndef SCM_THREADS_H #define SCM_THREADS_H -/* Copyright (C) 1996,1997,1998,2000,2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,2000,2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -109,7 +109,6 @@ typedef struct scm_i_thread { /* For keeping track of the stack and registers. */ SCM vm; SCM_STACKITEM *base; - SCM_STACKITEM *top; scm_i_jmp_buf regs; #ifdef __ia64__ void *register_backing_store_base; |