summaryrefslogtreecommitdiff
path: root/libguile/init.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-03-25 13:01:51 +0100
committerAndy Wingo <wingo@pobox.com>2011-03-25 13:01:51 +0100
commit12c1d8616d8dfedcad65f34e3968f9544b629ae1 (patch)
tree7db72f78e6df7001d6294d62888527e9bf9675f5 /libguile/init.h
parent2a6f90e52436afdbbcdcf99bfe8a5c24cefd9769 (diff)
downloadguile-12c1d8616d8dfedcad65f34e3968f9544b629ae1.tar.gz
threading / with_guile refactor to use more GC_stack_base
* libguile/init.h: * libguile/init.c (scm_i_init_guile): Change arg to this internal function from SCM_STACKITEM* to void*. Actually it's a struct GC_stack_base*. * libguile/bdw-gc.h: Don't do pthread redirects, because we don't want to affect applications' pthread_* bindings. * libguile/pthread-threads.h (scm_i_pthread_create) (scm_i_pthread_detach, scm_i_pthread_exit, scm_i_pthread_cancel) (scm_i_pthread_sigmask): Do pthread redirects here, in this internal header. * libguile/threads.h: Remove declaration of internal scm_i_with_guile_and_parent. Remove declaration of undefined scm_threads_init_first_thread. Make declaration of internal scm_threads_prehistory actually internal, and take a void* (actually a struct GC_stack_base*). * libguile/threads.c (GC_get_stack_base): Implement a shim if this function is unavailable, and fold in the implementations of get_thread_stack_base. (GC_call_with_stack_base): Actually implement. (guilify_self_1): Take a GC_stack_base* as an arg. (scm_i_init_thread_for_guile): Likewise, and set up libgc for registration of other threads. (scm_init_guile): Use GC_get_stack_base instead of our own guesswork. (with_guile_and_parent, scm_i_with_guile_and_parent): Rework to trampoline through a GC_call_with_stack_base. (scm_threads_prehistory): Pass the "base" arg on to guilify_self_1.
Diffstat (limited to 'libguile/init.h')
-rw-r--r--libguile/init.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/init.h b/libguile/init.h
index 7cfae76d5..bc6cddf93 100644
--- a/libguile/init.h
+++ b/libguile/init.h
@@ -3,7 +3,7 @@
#ifndef SCM_INIT_H
#define SCM_INIT_H
-/* Copyright (C) 1995,1996,1997,2000, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,2000, 2006, 2008, 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
@@ -38,7 +38,7 @@ SCM_API void scm_boot_guile (int argc, char **argv,
char **argv),
void *closure);
-SCM_INTERNAL void scm_i_init_guile (SCM_STACKITEM *base);
+SCM_INTERNAL void scm_i_init_guile (void *base);
SCM_API void scm_load_startup_files (void);