1.0.10.14: remove locking and gc inhibition from hash-tables, power of 2 sizes

[sbcl.git] / src / runtime / globals.c

diff --git a/src/runtime/globals.c b/src/runtime/globals.c
index e266ba4..07d56b5 100644 (file)
--- a/src/runtime/globals.c
+++ b/src/runtime/globals.c
@@ -17,12 +17,14 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "runtime.h"
 #include "sbcl.h"
+#include "runtime.h"
 #include "globals.h"
 #include "validate.h"
 
+#ifdef FOREIGN_FUNCTION_CALL_FLAG
 int foreign_function_call_active;
+#endif
 
 lispobj *current_control_stack_pointer;
 lispobj *current_control_frame_pointer;
@@ -32,7 +34,7 @@ lispobj *current_binding_stack_pointer;
 
 /* ALLOCATION_POINTER is x86 or RT.  Anyone want to do an RT port?   */
 
-#ifndef ALLOCATION_POINTER
+# if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
 /* The Object Formerly Known As current_dynamic_space_free_pointer */
 lispobj *dynamic_space_free_pointer;
 #endif
@@ -41,13 +43,18 @@ lispobj *dynamic_space_free_pointer;
 lispobj *current_auto_gc_trigger;
 #endif
 
+#ifdef LISP_FEATURE_SB_THREAD
+boolean stop_the_world=0;
+#endif
+
 /* For copying GCs, this points to the start of the dynamic space
  * currently in use (that will become the from_space when the next GC
  * is done).  For the GENCGC, it always points to DYNAMIC_SPACE_START. */
 lispobj *current_dynamic_space;
 
-boolean stop_the_world=0;
-pid_t parent_pid;
+#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_GCC_TLS)
+pthread_key_t specials=0;
+#endif
 
 void globals_init(void)
 {
@@ -55,23 +62,16 @@ void globals_init(void)
      * validate() and coreparse(). */
     current_control_frame_pointer = (lispobj *)0;
 
-#ifndef LISP_FEATURE_GENCGC 
+#ifndef LISP_FEATURE_GENCGC
     /* no GC trigger yet */
     current_auto_gc_trigger = NULL;
 #endif
 
-    /* Set foreign function call active. */
+#ifdef FOREIGN_FUNCTION_CALL_FLAG
     foreign_function_call_active = 1;
-
-    /* Initialize the current Lisp state. */
-#ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD
-    current_control_stack_pointer = (lispobj *)CONTROL_STACK_END;
-#else
-    current_control_stack_pointer = (lispobj *)CONTROL_STACK_START;
 #endif
 
-    current_control_frame_pointer = (lispobj *)0;
-#ifndef BINDING_STACK_POINTER
-    current_binding_stack_pointer = native_pointer(BINDING_STACK_START);
+#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_GCC_TLS)
+    pthread_key_create(&specials,0);
 #endif
 }