Steel Bank Common Lisp

Update of /cvsroot/sbcl/sbcl/src/runtime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4325/src/runtime

Modified Files:
      Tag: lutex-branch
	x86-assem.S x86-arch.c thread.c interrupt.c bsd-os.c 
Log Message:
0.9.10.46.lutex-branch.14
    * align stack to 16-bytes in arrange_return_to_lisp_function and skip padding
      in post_signal_tramp
    * updated bugs list and added debugging info for current blockers
    * lots of debugging FSHOWs (many of these can go away once things work)


Index: x86-assem.S
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/x86-assem.S,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -d -r1.32 -r1.32.2.1
--- x86-assem.S	15 Mar 2006 05:40:17 -0000	1.32
+++ x86-assem.S	27 Mar 2006 19:45:16 -0000	1.32.2.1
@@ -842,6 +842,10 @@
 	addl $12,%esp  	/* clear call_into_lisp args from stack */
 	popal           /* restore registers */
         popfl
+#ifdef LISP_FEATURE_DARWIN
+        /* skip two padding words */
+        addl $8,%esp
+#endif
 	leave
 	ret
 	SIZE(GNAME(post_signal_tramp))

Index: x86-arch.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/x86-arch.c,v
retrieving revision 1.38.2.4
retrieving revision 1.38.2.5
diff -u -d -r1.38.2.4 -r1.38.2.5
--- x86-arch.c	25 Mar 2006 16:20:57 -0000	1.38.2.4
+++ x86-arch.c	27 Mar 2006 19:45:18 -0000	1.38.2.5
@@ -214,6 +214,8 @@
     unsigned int trap;
 
 #if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
+    FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in sigtrap_handler\n",
+                  *CONTEXT_ADDR_FROM_STEM(fs)));
     os_restore_tls_segment_register(context);
 #endif
 
@@ -310,7 +312,7 @@
     os_context_t *context = (os_context_t*)void_context;
 
 #if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
-    FSHOW_SIGNAL((stderr, " sigill handler restoring fs: %x\n",
+    FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in sigill_handler\n",
                   *CONTEXT_ADDR_FROM_STEM(fs)));
     os_restore_tls_segment_register(context);
 #endif

Index: thread.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/thread.c,v
retrieving revision 1.62.2.4
retrieving revision 1.62.2.5
diff -u -d -r1.62.2.4 -r1.62.2.5
--- thread.c	25 Mar 2006 16:20:33 -0000	1.62.2.4
+++ thread.c	27 Mar 2006 19:45:18 -0000	1.62.2.5
@@ -125,7 +125,6 @@
 free_thread_stack_later(struct thread *thread_to_be_cleaned_up)
 {
     struct freeable_stack *new_freeable_stack = 0;
-
     if (thread_to_be_cleaned_up) {
         new_freeable_stack = (struct freeable_stack *)
             os_validate(0, sizeof(struct freeable_stack));
@@ -136,9 +135,8 @@
     new_freeable_stack = (struct freeable_stack *)
         swap_lispobjs((lispobj *)(void *)&freeable_stack,
                       (lispobj)new_freeable_stack);
-
     if (new_freeable_stack) {
-        FSHOW((stderr,"/reaping %lu\n", new_freeable_stack->os_thread));
+        FSHOW((stderr,"/reaping %p\n", (void*) new_freeable_stack->os_thread));
         /* #if !defined(LISP_FEATURE_DARWIN) */
         /* Under NPTL pthread_join really waits until the thread
          * exists and the stack can be safely freed. This is sadly not
@@ -193,7 +191,7 @@
     os_invalidate((os_vm_address_t)th->interrupt_data,
                   (sizeof (struct interrupt_data)));
     free_thread_stack_later(th);
-    FSHOW((stderr,"/exiting thread %lu\n", thread_self()));
+    FSHOW((stderr,"/exiting thread %p\n", thread_self()));
     return result;
 }
 

Index: interrupt.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/interrupt.c,v
retrieving revision 1.110.2.3
retrieving revision 1.110.2.4
diff -u -d -r1.110.2.3 -r1.110.2.4
--- interrupt.c	25 Mar 2006 16:19:54 -0000	1.110.2.3
+++ interrupt.c	27 Mar 2006 19:45:18 -0000	1.110.2.4
@@ -332,6 +332,8 @@
     lispobj context_sap;
 
 #if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
+    FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in interrupt_internal_error\n",
+                  *CONTEXT_ADDR_FROM_STEM(fs)));
     os_restore_tls_segment_register(context);
 #endif
 
@@ -467,6 +469,8 @@
     union interrupt_handler handler;
 
 #if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
+    FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in interrupt_handle_now\n",
+                  *CONTEXT_ADDR_FROM_STEM(fs)));
     os_restore_tls_segment_register(context);
 #endif
 
@@ -585,6 +589,11 @@
      * pending handler before calling it. Trust the handler to finish
      * with the siginfo before enabling interrupts. */
     void (*pending_handler) (int, siginfo_t*, void*)=data->pending_handler;
+    os_context_t *context = arch_os_get_context(&v_context);
+
+    FSHOW_SIGNAL((stderr, "/run_deferred_handler: signal %d context fs is: %p\n",
+                  data->pending_signal,
+                  *CONTEXT_ADDR_FROM_STEM(fs)));
     data->pending_handler=0;
     (*pending_handler)(data->pending_signal,&(data->pending_info), v_context);
 }
@@ -608,9 +617,10 @@
         store_signal_data_for_later(data,handler,signal,info,context);
         SetSymbolValue(INTERRUPT_PENDING, T,thread);
         FSHOW_SIGNAL((stderr,
-                      "/maybe_defer_handler(%x,%d),thread=%lu: deferred\n",
+                      "/maybe_defer_handler(%x,%d),thread=%lu, fs=%p: deferred\n",
                       (unsigned int)handler,signal,
-                      (unsigned long)thread->os_thread));
+                      (unsigned long)thread->os_thread,
+                      *CONTEXT_ADDR_FROM_STEM(fs)));
         return 1;
     }
     /* a slightly confusing test.  arch_pseudo_atomic_atomic() doesn't
@@ -630,9 +640,10 @@
         store_signal_data_for_later(data,handler,signal,info,context);
         arch_set_pseudo_atomic_interrupted(context);
         FSHOW_SIGNAL((stderr,
-                      "/maybe_defer_handler(%x,%d),thread=%lu: deferred(PA)\n",
+                      "/maybe_defer_handler(%x,%d),thread=%lu, fs=%p: deferred(PA)\n",
                       (unsigned int)handler,signal,
-                      (unsigned long)thread->os_thread));
+                      (unsigned long)thread->os_thread,
+                      *CONTEXT_ADDR_FROM_STEM(fs)));
         return 1;
     }
     FSHOW_SIGNAL((stderr,
@@ -656,6 +667,9 @@
     data->pending_signal = signal;
     if(info)
         memcpy(&(data->pending_info), info, sizeof(siginfo_t));
+
+    FSHOW_SIGNAL((stderr, "/store_signal_data_for_later: signal: %d\n", signal));
+
     if(context) {
         /* the signal mask in the context (from before we were
          * interrupted) is copied to be restored when
@@ -676,6 +690,8 @@
     struct interrupt_data *data;
 
 #if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
+    FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in maybe_now_maybe_later\n",
+                  *CONTEXT_ADDR_FROM_STEM(fs)));
     os_restore_tls_segment_register(context);
 #endif
 
@@ -705,6 +721,8 @@
 #endif
 
 #if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
+    FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in low_level_interrupt_handle_now\n",
+                  *CONTEXT_ADDR_FROM_STEM(fs)));
     os_restore_tls_segment_register(context);
 #endif
 
@@ -725,6 +743,8 @@
     struct interrupt_data *data;
 
 #if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
+    FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in low_level_maybe_now_maybe_later\n",
+                  *CONTEXT_ADDR_FROM_STEM(fs)));
     os_restore_tls_segment_register(context);
 #endif
 
@@ -754,6 +774,8 @@
     os_context_t *context = arch_os_get_context(&void_context);
 
 #if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
+    FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in sig_stop_for_gc_handler\n",
+                  *CONTEXT_ADDR_FROM_STEM(fs)));
     os_restore_tls_segment_register(context);
 #endif
 
@@ -898,6 +920,35 @@
 
     u32 *sp=(u32 *)*os_context_register_addr(context,reg_ESP);
 
+    FSHOW_SIGNAL((stderr, "/arrange_return_to_lisp_function: preparing to go back\n"));
+
+#if defined(LISP_FEATURE_DARWIN)
+
+    /* return address for call_into_lisp: */
+    *(sp-17) = (u32)post_signal_tramp;
+    *(sp-16) = function;        /* args for call_into_lisp : function*/
+    *(sp-15) = 0;               /*                           arg array */
+    *(sp-14) = 0;               /*                           no. args */
+    /* this order matches that used in POPAD */
+    *(sp-13)=*os_context_register_addr(context,reg_EDI);
+    *(sp-12)=*os_context_register_addr(context,reg_ESI);
+
+    *(sp-11)=*os_context_register_addr(context,reg_ESP)-10;
+    /* POPAD ignores the value of ESP:  */
+    *(sp-10)=0;
+    *(sp-9)=*os_context_register_addr(context,reg_EBX);
+
+    *(sp-8)=*os_context_register_addr(context,reg_EDX);
+    *(sp-7)=*os_context_register_addr(context,reg_ECX);
+    *(sp-6)=*os_context_register_addr(context,reg_EAX);
+    *(sp-5)=*context_eflags_addr(context);
+    *(sp-4)=0;
+    *(sp-3)=0;
+    *(sp-2)=*os_context_register_addr(context,reg_EBP);
+    *(sp-1)=*os_context_pc_addr(context);
+
+#else
+
     /* return address for call_into_lisp: */
     *(sp-15) = (u32)post_signal_tramp;
     *(sp-14) = function;        /* args for call_into_lisp : function*/
@@ -919,6 +970,8 @@
     *(sp-2)=*os_context_register_addr(context,reg_EBP);
     *(sp-1)=*os_context_pc_addr(context);
 
+#endif
+
 #elif defined(LISP_FEATURE_X86_64)
     u64 *sp=(u64 *)*os_context_register_addr(context,reg_RSP);
     /* return address for call_into_lisp: */
@@ -953,6 +1006,13 @@
 #endif
 
 #ifdef LISP_FEATURE_X86
+
+#if defined(LISP_FEATURE_DARWIN)
+    *os_context_pc_addr(context) = (os_context_register_t)call_into_lisp;
+    *os_context_register_addr(context,reg_ECX) = 0;
+    *os_context_register_addr(context,reg_EBP) = (os_context_register_t)(sp-4);
+    *os_context_register_addr(context,reg_ESP) = (os_context_register_t)(sp-17);
+#else
     *os_context_pc_addr(context) = (os_context_register_t)call_into_lisp;
     *os_context_register_addr(context,reg_ECX) = 0;
     *os_context_register_addr(context,reg_EBP) = (os_context_register_t)(sp-2);
@@ -961,7 +1021,9 @@
         (os_context_register_t)(sp-15);
 #else
     *os_context_register_addr(context,reg_ESP) = (os_context_register_t)(sp-15);
-#endif
+#endif /* __NETBSD__ */
+#endif /* LISP_FEATURE_DARWIN */
+
 #elif defined(LISP_FEATURE_X86_64)
     *os_context_pc_addr(context) = (os_context_register_t)call_into_lisp;
     *os_context_register_addr(context,reg_RCX) = 0;
@@ -997,6 +1059,8 @@
     os_context_t *context = (os_context_t*)arch_os_get_context(&v_context);
 
 #if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
+    FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in interrupt_thread_handler\n",
+                  *CONTEXT_ADDR_FROM_STEM(fs)));
     os_restore_tls_segment_register(context);
 #endif
 
@@ -1101,6 +1165,11 @@
 interrupt_maybe_gc_int(int signal, siginfo_t *info, void *void_context)
 {
     os_context_t *context=(os_context_t *) void_context;
+#if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
+    FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in interrupt_maybe_gc_int\n",
+                  *CONTEXT_ADDR_FROM_STEM(fs)));
+    os_restore_tls_segment_register(context);
+#endif
 #ifndef LISP_FEATURE_WIN32
     struct thread *thread=arch_os_get_current_thread();
 #endif
@@ -1225,6 +1294,13 @@
 unblock_me_trampoline(int signal, siginfo_t *info, void *void_context)
 {
     sigset_t unblock;
+#if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
+    os_context_t *context = (os_context_t*)void_context;
+    FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in unblock_me_trampoline\n",
+                  *CONTEXT_ADDR_FROM_STEM(fs)));
+    os_restore_tls_segment_register(context);
+#endif
+
     sigemptyset(&unblock);
     sigaddset(&unblock, signal);
     thread_sigmask(SIG_UNBLOCK, &unblock, 0);
@@ -1235,6 +1311,14 @@
 low_level_unblock_me_trampoline(int signal, siginfo_t *info, void *void_context)
 {
     sigset_t unblock;
+
+#if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
+    os_context_t *context = (os_context_t*)void_context;
+    FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in low_level_unblock_me_trampoline\n",
+                  *CONTEXT_ADDR_FROM_STEM(fs)));
+    os_restore_tls_segment_register(context);
+#endif
+
     sigemptyset(&unblock);
     sigaddset(&unblock, signal);
     thread_sigmask(SIG_UNBLOCK, &unblock, 0);

Index: bsd-os.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/bsd-os.c,v
retrieving revision 1.38.2.5
retrieving revision 1.38.2.6
diff -u -d -r1.38.2.5 -r1.38.2.6
--- bsd-os.c	26 Mar 2006 18:51:36 -0000	1.38.2.5
+++ bsd-os.c	27 Mar 2006 19:45:18 -0000	1.38.2.6
@@ -190,6 +190,8 @@
 
 #if defined LISP_FEATURE_GENCGC
 
+#define MEMORY_FAULT_DEBUG
+
 /*
  * The GENCGC needs to be hooked into whatever signal is raised for
  * page fault on this OS.
@@ -201,6 +203,8 @@
     void *fault_addr = arch_get_bad_addr(signal, siginfo, context);
 
 #if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
+    FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in memory_fault_handler\n",
+                  *CONTEXT_ADDR_FROM_STEM(fs)));
     os_restore_tls_segment_register(context);
 #endif
 
@@ -243,14 +247,16 @@
                                                  interrupt_thread_handler);
     undoably_install_low_level_interrupt_handler(SIG_STOP_FOR_GC,
                                                  sig_stop_for_gc_handler);
+#ifdef LISP_FEATURE_DARWIN
     undoably_install_low_level_interrupt_handler(SIG_RESUME_FROM_GC,
                                                  sig_stop_for_gc_handler);
 #endif
+#endif
 
     SHOW("leaving os_install_interrupt_handlers()");
 }
 
-#else /* Currently Darwin only */
+#else /* Currently PPC/Darwin/Cheney only */
 
 static void
 sigsegv_handler(int signal, siginfo_t *info, void* void_context)
@@ -363,6 +369,7 @@
         lose("unexpected i386_set_ldt(..) failure\n");
     }
 
+    FSHOW_SIGNAL((stderr, "/ TLS: Allocated LDT %x\n", n));
     sel.index = n;
     sel.rpl = USER_PRIV;
     sel.ti = SEL_LDT;
@@ -401,6 +408,8 @@
     /* Set the %%fs register back to 0 and free the the ldt
      * by setting it to NULL.
      */
+    FSHOW_SIGNAL((stderr, "/ TLS: Freeing LDT %x\n", n));
+
     __asm__ __volatile__ ("mov %0, %%fs" : : "r"(0));
     i386_set_ldt(n, NULL, 1);
 #endif

Update of /cvsroot/sbcl/sbcl/doc/internals-notes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4325/doc/internals-notes

Modified Files:
      Tag: lutex-branch
	x86-darwin-threads 
Log Message:
0.9.10.46.lutex-branch.14
    * align stack to 16-bytes in arrange_return_to_lisp_function and skip padding
      in post_signal_tramp
    * updated bugs list and added debugging info for current blockers
    * lots of debugging FSHOWs (many of these can go away once things work)


Index: x86-darwin-threads
===================================================================
RCS file: /cvsroot/sbcl/sbcl/doc/internals-notes/Attic/x86-darwin-threads,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- x86-darwin-threads	25 Mar 2006 22:26:55 -0000	1.1.2.1
+++ x86-darwin-threads	27 Mar 2006 19:45:18 -0000	1.1.2.2
@@ -13,11 +13,7 @@
 
 2. Occasional Illegal Instruction Errors
 
-3. threads.impure.lisp and timer.impure.lisp fail. The odd thing is
-   that semaphore_signal, and friends, occasionally fail with an error
-   KERN_INVALID_NAME or KERN_INVALID_RIGHT. This is bad. It's possible
-   the OS is doing something very wrong here, it's also possible we're
-   trashing the semaphore before we hand it off to the OS.
+3. threads.impure.lisp and timer.impure.lisp fail.
 
 4. Leaking semaphores? (Perhaps same as 3) I think we leak semaphores
    at the moment.
@@ -37,6 +33,12 @@
 
 * Set %fs to 0 when freeing the LDT
 
+* semaphore_signal, and friends, occasionally fail with an error
+  KERN_INVALID_NAME or KERN_INVALID_RIGHT. This is bad. It's possible
+  the OS is doing something very wrong here, it's also possible we're
+  trashing the semaphore before we hand it off to the OS. Using carbon
+  semaphores seems to fix this problem.
+
 ====================================
 Lutexes
 ====================================
@@ -129,3 +131,119 @@
 approach that Apple has taken here and other OSes may require this as
 well, therefore it's a feature rather than an arch/os specific ifdef.
 
+====================================
+DEBUGGING NOTES
+====================================
+
+The two tests that stress threads, timer.impure.lisp and
+threads.impure.lisp both fail.
+
+1. threads.impure.lisp
+
+this test currently fails in one of two ways
+
+1A. sometimes we get a SIGILL
+and the process terminates while trying to free a thread
+
+1B. if we make it through 1A we later catch a SIGSEGV:
+
+interrupting child #<THREAD {1222A701}>
+/WITH-MUTEX
+/Entering RELEASE-MUTEX
+/waking semaphore @ 0x3f8000, *semaphore=0x100080
+/MPSignalSemaphore said 0
+/ TLS: restoring fs: 0x1a7 in low_level_maybe_now_maybe_later
+/maybe_defer_handler(5d42,29),thread=117460480: not deferred
+/ TLS: restoring fs: 0x1a7 in low_level_interrupt_handle_now
+/ TLS: restoring fs: 0x1a7 in interrupt_thread_handler
+/arrange_return_to_lisp_function: preparing to go back
+/WITH-MUTEX
+/Entering RELEASE-MUTEX
+/waking semaphore @ 0x3f8000, *semaphore=0x100080
+/MPSignalSemaphore said 0
+child pid #<THREAD {1222A701}>
+/ TLS: restoring fs: 0x1a7 in interrupt_handle_now
+/entering interrupt_handle_now(11, info, context)
+/calling Lisp-level handler
+/entering ERROR, argument list=..
+0x1222cc5b
+/cold-printing ERROR arguments one by one..
+0x1222cc4f
+/done cold-printing ERROR arguments
+/entering INFINITE-ERROR-PROTECTOR, *CURRENT-ERROR-DEPTH*=..
+0x00000000
+/returning normally from INFINITE-ERROR-PROTECTOR
+/back from INFINITE-ERROR-PROTECTOR
+/in INFINITE-ERROR-PROTECT, incremented error depth
+/ TLS: restoring fs: 0x1a7 in memory_fault_handler
+Memory fault at: 0x10012fac, PC: 10b8868b
+Stack pointer: da12400
+heap WP violation? fault_addr=10012fac, page_index=18
+0: (BACKTRACE 8 #<SYNONYM-STREAM :SYMBOL *TERMINAL-IO* {10143539}>)
+1: (ERROR "segmentation violation at #X~X")
+2: ((FLET #:G188))
+3: (SB-UNIX::SIGSEGV-HANDLER
+    #<unused argument>
+    #<unused argument>
+    #.(SB-SYS:INT-SAP #X0DA12BFA))
+4: (SB-SYS:INVOKE-INTERRUPTION #<CLOSURE (LAMBDA #) {1222C8AD}>)
+5: ("foreign function: call_into_lisp")
+6: ("foreign function: funcall3")
+7: ("foreign function: interrupt_handle_now")
+/done coercing DATUM to CONDITION
+/signalling CONDITION from within ERROR
+/done signalling CONDITION within ERROR
+/ TLS: restoring fs: 0x1a7 in memory_fault_handler
+Memory fault at: 0x100fbfd0, PC: 1048b8ed
+Stack pointer: da12608
+heap WP violation? fault_addr=100fbfd0, page_index=251
+/ TLS: restoring fs: 0x1a7 in memory_fault_handler
+Memory fault at: 0x10220758, PC: 1048b96e
+Stack pointer: da12608
+heap WP violation? fault_addr=10220758, page_index=544
+/ TLS: restoring fs: 0x1a7 in memory_fault_handler
+Memory fault at: 0x1021f778, PC: 1048b9f1
+Stack pointer: da12608
+heap WP violation? fault_addr=1021f778, page_index=543
+
+debugger invoked on a SIMPLE-ERROR in thread #<THREAD {1222A701}>:
+  segmentation violation at #X7F270DA1
+
+
+2. timer.impure.lisp
+
+this test fails with a segmentation violation:
+
+/Entering RELEASE-MUTEX
+/waking semaphore @ 0x601100, *semaphore=0x100004
+/ TLS: restoring fs: 0x97 in memory_fault_handler
+/MPSignalSemaphore said 0
+Memory fault at: 0x10297d14, PC: 102d6613
+/returning from interrupt_handle_now(14, info, context)
+Stack pointer: 6a06668
+heap WP violation? fault_addr=10297d14, page_index=663
+0: (BACKTRACE 8 #<SYNONYM-STREAM :SYMBOL *TERMINAL-IO* {10143539}>)
+/ TLS: restoring fs: 0x97 in memory_fault_handler
+Memory fault at: 0x11d45598, PC: 102927a9
+Stack pointer: 6a06668
+heap WP violation? fault_addr=11d45598, page_index=7493
+1: (ERROR "segmentation violation at #X~X")
+2: ((FLET #:G188))
+3: (SB-UNIX::SIGSEGV-HANDLER
+    #<unused argument>
+    #<unused argument>
+    #.(SB-SYS:INT-SAP #X06A06C3A))
+4: (SB-SYS:INVOKE-INTERRUPTION #<CLOSURE (LAMBDA #) {1243D0C5}>)
+5: ("foreign function: call_into_lisp")
+6: ("foreign function: funcall3")
+7: ("foreign function: interrupt_handle_now")
+/done coercing DATUM to CONDITION
+/signalling CONDITION from within ERROR
+/done signalling CONDITION within ERROR
+unhandled SIMPLE-ERROR in thread #<SB-THREAD:THREAD {1243CD71}>:
+  segmentation violation at #X7F2706A0
+
+reducing the number of timer alarms in the timer streams test from 200
+to 20 or so makes the situation better, but we still occasionally
+fail, so there's some underlying problem we need to address.
+

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4325

Modified Files:
      Tag: lutex-branch
	version.lisp-expr 
Log Message:
0.9.10.46.lutex-branch.14
    * align stack to 16-bytes in arrange_return_to_lisp_function and skip padding
      in post_signal_tramp
    * updated bugs list and added debugging info for current blockers
    * lots of debugging FSHOWs (many of these can go away once things work)


Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.2745.2.13
retrieving revision 1.2745.2.14
diff -u -d -r1.2745.2.13 -r1.2745.2.14
--- version.lisp-expr	26 Mar 2006 18:54:43 -0000	1.2745.2.13
+++ version.lisp-expr	27 Mar 2006 19:45:18 -0000	1.2745.2.14
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.10.46.lutex-branch.13"
+"0.9.10.46.lutex-branch.14"

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30839/src/code

Modified Files:
	target-format.lisp 
Log Message:
0.9.11.3:
	FORMAT ~:C and printing characters.  (PFD ansi-tests)


Index: target-format.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/target-format.lisp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- target-format.lisp	8 Nov 2005 20:31:34 -0000	1.29
+++ target-format.lisp	27 Mar 2006 08:22:21 -0000	1.30
@@ -228,12 +228,16 @@
             (prin1 (next-arg) stream)
             (write-char (next-arg) stream)))))
 
+;;; "printing" as defined in the ANSI CL glossary, which is normative.
+(defun char-printing-p (char)
+  (and (not (eql char #\Space))
+       (graphic-char-p char)))
+
 (defun format-print-named-character (char stream)
-  (let* ((name (char-name char)))
-    (cond (name
-           (write-string (string-capitalize name) stream))
-          (t
-           (write-char char stream)))))
+  (cond ((not (char-printing-p char))
+         (write-string (string-capitalize (char-name char)) stream))
+        (t
+         (write-char char stream))))
 
 (def-format-interpreter #\W (colonp atsignp params)
   (interpret-bind-defaults () params

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30839

Modified Files:
	NEWS version.lisp-expr 
Log Message:
0.9.11.3:
	FORMAT ~:C and printing characters.  (PFD ansi-tests)


Index: NEWS
===================================================================
RCS file: /cvsroot/sbcl/sbcl/NEWS,v
retrieving revision 1.971
retrieving revision 1.972
diff -u -d -r1.971 -r1.972
--- NEWS	27 Mar 2006 08:19:36 -0000	1.971
+++ NEWS	27 Mar 2006 08:22:21 -0000	1.972
@@ -5,6 +5,8 @@
        the method is not one of the generic functions' methods.
     ** objects declared as MEMBER types can be admissible arguments to 
        structure accessors.
+    ** printing characters should simply be printed by the FORMAT ~:C
+       directive.
 
 changes in sbcl-0.9.11 relative to sbcl-0.9.10:
   * new platform: experimental support for SBCL x86/Darwin, including

Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.2750
retrieving revision 1.2751
diff -u -d -r1.2750 -r1.2751
--- version.lisp-expr	27 Mar 2006 08:19:36 -0000	1.2750
+++ version.lisp-expr	27 Mar 2006 08:22:21 -0000	1.2751
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.11.2"
+"0.9.11.3"

Update of /cvsroot/sbcl/sbcl/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30839/tests

Modified Files:
	print.impure.lisp 
Log Message:
0.9.11.3:
	FORMAT ~:C and printing characters.  (PFD ansi-tests)


Index: print.impure.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/print.impure.lisp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- print.impure.lisp	16 Mar 2006 03:24:21 -0000	1.36
+++ print.impure.lisp	27 Mar 2006 08:22:21 -0000	1.37
@@ -410,4 +410,6 @@
 (with-test (:name (:print-readable :character :iso-8859-1))
   (test-readable-character (code-char #xfffe) :iso-8859-1))
 
+(assert (string= (eval '(format nil "~:C" #\a)) "a"))
+(assert (string= (format nil (formatter "~:C") #\a) "a"))
 ;;; success

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28516/src/code

Modified Files:
	late-type.lisp 
Log Message:
0.9.11.2:
	Fix for MISC.629 (PFD ansi-tests)
	... all paths lead to the type system.


Index: late-type.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/late-type.lisp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- late-type.lisp	8 Mar 2006 18:49:55 -0000	1.126
+++ late-type.lisp	27 Mar 2006 08:19:36 -0000	1.127
@@ -1155,6 +1155,12 @@
          ;; those types can be other types in disguise.  So we'd
          ;; better delegate.
          (invoke-complex-subtypep-arg1-method type1 type2))
+        ((and (or (eq type2 *instance-type*)
+                  (eq type2 *funcallable-instance-type*))
+              (member-type-p type1))
+         ;; member types can be subtypep INSTANCE and
+         ;; FUNCALLABLE-INSTANCE in surprising ways.
+         (invoke-complex-subtypep-arg1-method type1 type2))
         ((and (eq type2 *instance-type*) (classoid-p type1))
          (if (member type1 *non-instance-classoid-types* :key #'find-classoid)
              (values nil t)
@@ -1206,7 +1212,8 @@
                  type1
                  nil)
              *empty-type*)
-         (if (type-might-contain-other-types-p type1)
+         (if (or (type-might-contain-other-types-p type1)
+                 (member-type-p type1))
              nil
              *empty-type*)))
     ((eq type2 *funcallable-instance-type*)
@@ -1221,7 +1228,8 @@
                  nil))
          (if (fun-type-p type1)
              nil
-             (if (type-might-contain-other-types-p type1)
+             (if (or (type-might-contain-other-types-p type1)
+                     (member-type-p type1))
                  nil
                  *empty-type*))))
     (t (hierarchical-intersection2 type1 type2))))

Update of /cvsroot/sbcl/sbcl/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28516/tests

Modified Files:
	type.impure.lisp type.pure.lisp 
Log Message:
0.9.11.2:
	Fix for MISC.629 (PFD ansi-tests)
	... all paths lead to the type system.


Index: type.impure.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/type.impure.lisp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- type.impure.lisp	10 Oct 2005 14:54:48 -0000	1.41
+++ type.impure.lisp	27 Mar 2006 08:19:36 -0000	1.42
@@ -445,4 +445,46 @@
                  t)))
   (assert (null (values (subtypep `(not ,t2) `(not ,t1))))))
 
+(defstruct misc-629a)
+(defclass misc-629b () ())
+(defclass misc-629c () () (:metaclass sb-mop:funcallable-standard-class))
+
+(assert (typep (make-misc-629a) 'sb-kernel:instance))
+(assert-t-t (subtypep `(member ,(make-misc-629a)) 'sb-kernel:instance))
+(assert-nil-t (subtypep `(and (member ,(make-misc-629a)) sb-kernel:instance)
+                        nil))
+(let ((misc-629a (make-misc-629a)))
+  (assert-t-t (subtypep `(member ,misc-629a)
+                        `(and (member ,misc-629a) sb-kernel:instance)))
+  (assert-t-t (subtypep `(and (member ,misc-629a)
+                          sb-kernel:funcallable-instance)
+                        nil)))
+
+(assert (typep (make-instance 'misc-629b) 'sb-kernel:instance))
+(assert-t-t (subtypep `(member ,(make-instance 'misc-629b))
+                      'sb-kernel:instance))
+(assert-nil-t (subtypep `(and (member ,(make-instance 'misc-629b))
+                          sb-kernel:instance)
+                        nil))
+(let ((misc-629b (make-instance 'misc-629b)))
+  (assert-t-t (subtypep `(member ,misc-629b)
+                        `(and (member ,misc-629b) sb-kernel:instance)))
+  (assert-t-t (subtypep `(and (member ,misc-629b)
+                          sb-kernel:funcallable-instance)
+                        nil)))
+
+(assert (typep (make-instance 'misc-629c) 'sb-kernel:funcallable-instance))
+(assert-t-t (subtypep `(member ,(make-instance 'misc-629c))
+                      'sb-kernel:funcallable-instance))
+(assert-nil-t (subtypep `(and (member ,(make-instance 'misc-629c))
+                          sb-kernel:funcallable-instance)
+                        nil))
+(let ((misc-629c (make-instance 'misc-629c)))
+  (assert-t-t (subtypep `(member ,misc-629c)
+                        `(and (member ,misc-629c)
+                          sb-kernel:funcallable-instance)))
+  (assert-t-t (subtypep `(and (member ,misc-629c)
+                          sb-kernel:instance)
+                        nil)))
+
 ;;; success

Index: type.pure.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/type.pure.lisp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- type.pure.lisp	14 Feb 2006 17:15:01 -0000	1.28
+++ type.pure.lisp	27 Mar 2006 08:19:36 -0000	1.29
@@ -330,3 +330,6 @@
   (sb-kernel:type=
    (sb-kernel:specifier-type '(simple-array an-unkown-type (7)))
    (sb-kernel:specifier-type '(simple-array an-unkown-type (8))))))
+
+(assert (typep #p"" 'sb-kernel:instance))
+(assert (subtypep '(member #p"") 'sb-kernel:instance))

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28516

Modified Files:
	NEWS version.lisp-expr 
Log Message:
0.9.11.2:
	Fix for MISC.629 (PFD ansi-tests)
	... all paths lead to the type system.


Index: NEWS
===================================================================
RCS file: /cvsroot/sbcl/sbcl/NEWS,v
retrieving revision 1.970
retrieving revision 1.971
diff -u -d -r1.970 -r1.971
--- NEWS	27 Mar 2006 08:13:03 -0000	1.970
+++ NEWS	27 Mar 2006 08:19:36 -0000	1.971
@@ -3,6 +3,8 @@
   * fixed some bugs revealed by Paul Dietz' test suite:
     ** REMOVE-METHOD returns its generic function argument even when
        the method is not one of the generic functions' methods.
+    ** objects declared as MEMBER types can be admissible arguments to 
+       structure accessors.
 
 changes in sbcl-0.9.11 relative to sbcl-0.9.10:
   * new platform: experimental support for SBCL x86/Darwin, including

Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.2749
retrieving revision 1.2750
diff -u -d -r1.2749 -r1.2750
--- version.lisp-expr	27 Mar 2006 08:13:06 -0000	1.2749
+++ version.lisp-expr	27 Mar 2006 08:19:36 -0000	1.2750
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.11.1"
+"0.9.11.2"

Update of /cvsroot/sbcl/sbcl/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23973/tests

Modified Files:
	clos.impure.lisp 
Log Message:
0.9.11.1:
	REMOVE-METHOD must return its generic function argument, even
	if the method isn't one of the generic function's.  Caught by
	PFD ansi-tests


Index: clos.impure.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/clos.impure.lisp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- clos.impure.lisp	10 Mar 2006 17:40:27 -0000	1.77
+++ clos.impure.lisp	27 Mar 2006 08:13:07 -0000	1.78
@@ -1256,4 +1256,16 @@
 (assert (not (typep-backwards-3 (make-instance 'backwards-2))))
 (assert (typep-backwards-3 (make-instance 'backwards-3)))
 
+(defgeneric remove-method-1 (x)
+  (:method ((x integer)) (1+ x)))
+(defgeneric remove-method-2 (x)
+  (:method ((x integer)) (1- x)))
+(assert (eq #'remove-method-1
+            (remove-method #'remove-method-1
+                           (find-method #'remove-method-2
+                                        nil
+                                        (list (find-class 'integer))))))
+(assert (= (remove-method-1 3) 4))
+(assert (= (remove-method-2 3) 2))
+
 ;;;; success

Update of /cvsroot/sbcl/sbcl/src/pcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23973/src/pcl

Modified Files:
	methods.lisp 
Log Message:
0.9.11.1:
	REMOVE-METHOD must return its generic function argument, even
	if the method isn't one of the generic function's.  Caught by
	PFD ansi-tests


Index: methods.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/pcl/methods.lisp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- methods.lisp	13 Feb 2006 15:59:16 -0000	1.53
+++ methods.lisp	27 Mar 2006 08:13:07 -0000	1.54
@@ -573,7 +573,7 @@
         generic-function)))
 
 (defun real-remove-method (generic-function method)
-  (when  (eq generic-function (method-generic-function method))
+  (when (eq generic-function (method-generic-function method))
     (let* ((name (generic-function-name generic-function))
            (specializers (method-specializers method))
            (methods (generic-function-methods generic-function))
@@ -590,8 +590,8 @@
       (map-dependents generic-function
                       (lambda (dep)
                         (update-dependent generic-function
-                                          dep 'remove-method method)))
-      generic-function)))
+                                          dep 'remove-method method)))))
+  generic-function)
 
 (defun compute-applicable-methods-function (generic-function arguments)
   (values (compute-applicable-methods-using-types

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23973

Modified Files:
	NEWS version.lisp-expr 
Log Message:
0.9.11.1:
	REMOVE-METHOD must return its generic function argument, even
	if the method isn't one of the generic function's.  Caught by
	PFD ansi-tests


Index: NEWS
===================================================================
RCS file: /cvsroot/sbcl/sbcl/NEWS,v
retrieving revision 1.969
retrieving revision 1.970
diff -u -d -r1.969 -r1.970
--- NEWS	20 Mar 2006 02:49:16 -0000	1.969
+++ NEWS	27 Mar 2006 08:13:03 -0000	1.970
@@ -1,4 +1,9 @@
 ;;;; -*- coding: utf-8; -*-
+changes in sbcl-0.9.12 relative to sbcl-0.9.11:
+  * fixed some bugs revealed by Paul Dietz' test suite:
+    ** REMOVE-METHOD returns its generic function argument even when
+       the method is not one of the generic functions' methods.
+
 changes in sbcl-0.9.11 relative to sbcl-0.9.10:
   * new platform: experimental support for SBCL x86/Darwin, including
     MacOS X 10.4.5 on Intel.

Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.2748
retrieving revision 1.2749
diff -u -d -r1.2748 -r1.2749
--- version.lisp-expr	26 Mar 2006 23:59:14 -0000	1.2748
+++ version.lisp-expr	27 Mar 2006 08:13:06 -0000	1.2749
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.11"
+"0.9.11.1"

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9405

Modified Files:
	version.lisp-expr 
Log Message:
0.9.11:
	release, will be tagged as sbcl_0_9_11


Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.2747
retrieving revision 1.2748
diff -u -d -r1.2747 -r1.2748
--- version.lisp-expr	24 Mar 2006 16:45:06 -0000	1.2747
+++ version.lisp-expr	26 Mar 2006 23:59:14 -0000	1.2748
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.10.48"
+"0.9.11"

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6625

Modified Files:
      Tag: lutex-branch
	version.lisp-expr 
Log Message:
0.9.10.46.lutex-branch.13
    * move {:mach,:carbon}-semaphores and :restore-tls-... into
      base-target-features.lisp-expr
    * conditional compilation fixes to avoid including things on
      -sb-thread builds that shouldn't be
    * whitespace fixes
    * added a fixme in thread.lisp


Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.2745.2.12
retrieving revision 1.2745.2.13
diff -u -d -r1.2745.2.12 -r1.2745.2.13
--- version.lisp-expr	25 Mar 2006 22:26:48 -0000	1.2745.2.12
+++ version.lisp-expr	26 Mar 2006 18:54:43 -0000	1.2745.2.13
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.10.46.lutex-branch.12"
+"0.9.10.46.lutex-branch.13"

Update of /cvsroot/sbcl/sbcl/src/runtime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5259

Modified Files:
      Tag: lutex-branch
	darwin-os.h 
Log Message:
0.9.10.46.lutex-branch.13
    * move {:mach,:carbon}-semaphores and :restore-tls-... into
      base-target-features.lisp-expr
    * conditional compilation fixes to avoid including things on
      -sb-thread builds that shouldn't be
    * whitespace fixes
    * added a fixme in thread.lisp


Index: darwin-os.h
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/Attic/darwin-os.h,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- darwin-os.h	25 Mar 2006 21:20:17 -0000	1.1.2.4
+++ darwin-os.h	26 Mar 2006 18:51:43 -0000	1.1.2.5
@@ -27,6 +27,7 @@
 #include <sys/_types.h>
 typedef struct ucontext os_context_t;
 
+#if defined(LISP_FEATURE_SB_THREAD)
 #if defined(LISP_FEATURE_MACH_SEMAPHORES)
 typedef semaphore_t os_sem_t;
 #elif defined(LISP_FEATURE_CARBON_SEMAPHORES)
@@ -34,6 +35,7 @@
 #else
 typedef sem_t os_sem_t;
 #endif
+#endif
 
 #else
 #include <ucontext.h>

Update of /cvsroot/sbcl/sbcl/src/runtime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5276

Modified Files:
      Tag: lutex-branch
	thread.h 
Log Message:
0.9.10.46.lutex-branch.13
    * move {:mach,:carbon}-semaphores and :restore-tls-... into
      base-target-features.lisp-expr
    * conditional compilation fixes to avoid including things on
      -sb-thread builds that shouldn't be
    * whitespace fixes
    * added a fixme in thread.lisp


Index: thread.h
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/thread.h,v
retrieving revision 1.24
retrieving revision 1.24.4.1
diff -u -d -r1.24 -r1.24.4.1
--- thread.h	15 Oct 2005 08:40:36 -0000	1.24
+++ thread.h	26 Mar 2006 18:51:47 -0000	1.24.4.1
@@ -141,4 +141,8 @@
 
 extern void create_initial_thread(lispobj);
 
+#if defined(LISP_FEATURE_SB_THREAD)
+extern int futex_init(os_sem_t *semaphore);
+#endif
+
 #endif /* _INCLUDE_THREAD_H_ */

Update of /cvsroot/sbcl/sbcl/src/runtime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5240

Modified Files:
      Tag: lutex-branch
	coreparse.c 
Log Message:
0.9.10.46.lutex-branch.13
    * move {:mach,:carbon}-semaphores and :restore-tls-... into
      base-target-features.lisp-expr
    * conditional compilation fixes to avoid including things on
      -sb-thread builds that shouldn't be
    * whitespace fixes
    * added a fixme in thread.lisp


Index: coreparse.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/coreparse.c,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -u -d -r1.32.2.1 -r1.32.2.2
--- coreparse.c	21 Mar 2006 19:28:02 -0000	1.32.2.1
+++ coreparse.c	26 Mar 2006 18:51:40 -0000	1.32.2.2
@@ -36,7 +36,10 @@
 #include "gc-internal.h"
 
 /* lutex stuff */
+#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
 #include "genesis/sap.h"
+#endif
+
 
 unsigned char build_id[] =
 #include "../../output/build-id.tmp"

Update of /cvsroot/sbcl/sbcl/src/runtime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5224

Modified Files:
      Tag: lutex-branch
	bsd-os.c 
Log Message:
0.9.10.46.lutex-branch.13
    * move {:mach,:carbon}-semaphores and :restore-tls-... into
      base-target-features.lisp-expr
    * conditional compilation fixes to avoid including things on
      -sb-thread builds that shouldn't be
    * whitespace fixes
    * added a fixme in thread.lisp


Index: bsd-os.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/bsd-os.c,v
retrieving revision 1.38.2.4
retrieving revision 1.38.2.5
diff -u -d -r1.38.2.4 -r1.38.2.5
--- bsd-os.c	25 Mar 2006 19:56:46 -0000	1.38.2.4
+++ bsd-os.c	26 Mar 2006 18:51:36 -0000	1.38.2.5
@@ -397,12 +397,12 @@
 
 #if defined(LISP_FEATURE_X86) && defined(LISP_FEATURE_DARWIN) && defined(LISP_FEATURE_SB_THREAD)
     int n = thread->tls_cookie;
-    
+
     /* Set the %%fs register back to 0 and free the the ldt
      * by setting it to NULL.
      */
     __asm__ __volatile__ ("mov %0, %%fs" : : "r"(0));
-    i386_set_ldt(n, NULL, 1); 
+    i386_set_ldt(n, NULL, 1);
 #endif
 
     return 1;                  /* success */

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5167

Modified Files:
      Tag: lutex-branch
	target-thread.lisp 
Log Message:
0.9.10.46.lutex-branch.13
    * move {:mach,:carbon}-semaphores and :restore-tls-... into
      base-target-features.lisp-expr
    * conditional compilation fixes to avoid including things on
      -sb-thread builds that shouldn't be
    * whitespace fixes
    * added a fixme in thread.lisp


Index: target-thread.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/target-thread.lisp,v
retrieving revision 1.55.4.3
retrieving revision 1.55.4.4
diff -u -d -r1.55.4.3 -r1.55.4.4
--- target-thread.lisp	25 Mar 2006 22:27:10 -0000	1.55.4.3
+++ target-thread.lisp	26 Mar 2006 18:51:32 -0000	1.55.4.4
@@ -344,6 +344,9 @@
   #!+sb-thread
   (let ((me *current-thread*))
     #!+sb-lutex (declare (ignorable me))
+    ;; FIXME We can probably do away with the ignore by moving the let
+    ;; inside the #!-sb-lutex block!
+    ;;
     ;; no problem if >1 thread notifies during the comment in
     ;; condition-wait: as long as the value in queue-data isn't the
     ;; waiting thread's id, it matters not what it is

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5125

Modified Files:
      Tag: lutex-branch
	make-config.sh 
Log Message:
0.9.10.46.lutex-branch.13
    * move {:mach,:carbon}-semaphores and :restore-tls-... into
      base-target-features.lisp-expr
    * conditional compilation fixes to avoid including things on
      -sb-thread builds that shouldn't be
    * whitespace fixes
    * added a fixme in thread.lisp


Index: make-config.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/make-config.sh,v
retrieving revision 1.61.2.2
retrieving revision 1.61.2.3
diff -u -d -r1.61.2.2 -r1.61.2.3
--- make-config.sh	25 Mar 2006 16:17:58 -0000	1.61.2.2
+++ make-config.sh	26 Mar 2006 18:51:28 -0000	1.61.2.3
@@ -263,12 +263,6 @@
         # roughly-equivalent magic nevertheless.
         printf ' :os-provides-dlopen' >> $ltf
     fi
-    # For Darwin builds choose one of :mach-semaphores or :carbon-semaphores.
-    # By not selecting either of these we end up with posix semaphores
-    # which currently do not work as there is no sem_init on Darwin.
-    if [ "$sbcl_os" = "darwin" ]; then
-        printf ' :mach-semaphores :restore-tls-segment-register-from-context' >> $ltf
-    fi
 elif [ "$sbcl_arch" = "x86-64" ]; then
     printf ' :gencgc :stack-grows-downward-not-upward :c-stack-is-control-stack :linkage-table' >> $ltf
     printf ' :stack-allocatable-closures :alien-callbacks' >> $ltf

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5078

Modified Files:
      Tag: lutex-branch
	base-target-features.lisp-expr 
Log Message:
0.9.10.46.lutex-branch.13
    * move {:mach,:carbon}-semaphores and :restore-tls-... into
      base-target-features.lisp-expr
    * conditional compilation fixes to avoid including things on
      -sb-thread builds that shouldn't be
    * whitespace fixes
    * added a fixme in thread.lisp


Index: base-target-features.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/base-target-features.lisp-expr,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -u -d -r1.38.2.1 -r1.38.2.2
--- base-target-features.lisp-expr	21 Mar 2006 19:27:57 -0000	1.38.2.1
+++ base-target-features.lisp-expr	26 Mar 2006 18:51:25 -0000	1.38.2.2
@@ -173,6 +173,17 @@
  ;;
  ; :sb-lutex
 
+ ;; IMPORTANT!!!!! When building on darwin with lutexes we need to
+ ;; enable one (and only one!) of these features!!!! FIXME!
+ ;
+ ; :mach-semaphores
+ ; :carbon-semaphores
+
+ ;; IMPORTANT!!!!! When building on darwin with lutexes we MUST turn
+ ;; this on!!! FIXME!
+ ;
+ ; :restore-tls-segment-register-from-context
+
  ;; Support for detection of unportable code (when applied to the
  ;; COMMON-LISP package, or SBCL-internal pacakges) or bad-neighbourly
  ;; code (when applied to user-level packages), relating to material

Update of /cvsroot/sbcl/sbcl/src/runtime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26153

Modified Files:
      Tag: lutex-branch
	darwin-os.c 
Log Message:
0.9.10.46.lutex-branch.12
    * set initial semaphore value to 0 
    * MP -> MPCreateSemaphore in FSHOW message
    * pin (thread-interruptions-lock thread) when calling futex-destroy
    * added internals-notes document x86-darwin-threads


Index: darwin-os.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/darwin-os.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- darwin-os.c	25 Mar 2006 19:56:53 -0000	1.1.2.3
+++ darwin-os.c	25 Mar 2006 22:27:22 -0000	1.1.2.4
@@ -63,7 +63,7 @@
 {
     kern_return_t ret;
     FSHOW_SIGNAL((stderr, "/initializing semaphore @ %p\n", semaphore));
-    ret = semaphore_create(current_task(), semaphore, SYNC_POLICY_FIFO, 1);
+    ret = semaphore_create(current_task(), semaphore, SYNC_POLICY_FIFO, 0);
     FSHOW_SIGNAL((stderr, "/semaphore_create said %d\n", ret));
     return ret;
 }
@@ -101,8 +101,8 @@
 {
     OSStatus ret;
     FSHOW_SIGNAL((stderr, "/initializing semaphore @ %p\n", semaphore));
-    ret = MPCreateSemaphore(255, 1, semaphore);
-    FSHOW_SIGNAL((stderr, "/MP said %d\n", ret));
+    ret = MPCreateSemaphore(0xffff, 0, semaphore);
+    FSHOW_SIGNAL((stderr, "/MPCreateSemaphore said %d\n", ret));
     return ret;
 }

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25847

Modified Files:
      Tag: lutex-branch
	target-thread.lisp 
Log Message:
0.9.10.46.lutex-branch.12
    * set initial semaphore value to 0 
    * MP -> MPCreateSemaphore in FSHOW message
    * pin (thread-interruptions-lock thread) when calling futex-destroy
    * added internals-notes document x86-darwin-threads


Index: target-thread.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/target-thread.lisp,v
retrieving revision 1.55.4.2
retrieving revision 1.55.4.3
diff -u -d -r1.55.4.2 -r1.55.4.3
--- target-thread.lisp	25 Mar 2006 15:39:37 -0000	1.55.4.2
+++ target-thread.lisp	25 Mar 2006 22:27:10 -0000	1.55.4.3
@@ -458,8 +458,9 @@
       #!+sb-lutex
     (when (thread-interruptions-lock thread)
       (/show0 "FREEING MUTEX LUTEX")
-      (futex-destroy (sb!vm::%lutex-semaphore
-                      (mutex-lutex (thread-interruptions-lock thread)))))
+      (with-pinned-objects ((thread-interruptions-lock thread))
+        (futex-destroy (sb!vm::%lutex-semaphore
+                        (mutex-lutex (thread-interruptions-lock thread))))))
     (setq *all-threads* (delete thread *all-threads*)))
   (when *session*
     (%delete-thread-from-session thread *session*)))

Update of /cvsroot/sbcl/sbcl/doc/internals-notes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25791

Added Files:
      Tag: lutex-branch
	x86-darwin-threads 
Log Message:
0.9.10.46.lutex-branch.12
    * set initial semaphore value to 0 
    * MP -> MPCreateSemaphore in FSHOW message
    * pin (thread-interruptions-lock thread) when calling futex-destroy
    * added internals-notes document x86-darwin-threads


--- NEW FILE: x86-darwin-threads ---

This document describes the state of threads on Darwin (MacOS X) on
Intel. Currently things build and run, but there are some underlying
problems that cause the build to be unstable.

====================================
OPEN BUGS
====================================

1. Threaded builds cannont run slam.sh on themselves. A build with a
   threaded host will build from sources, but slam.sh does not work. A
   non-threaded host can run slam.sh fine.

2. Occasional Illegal Instruction Errors

3. threads.impure.lisp and timer.impure.lisp fail. The odd thing is
   that semaphore_signal, and friends, occasionally fail with an error
   KERN_INVALID_NAME or KERN_INVALID_RIGHT. This is bad. It's possible
   the OS is doing something very wrong here, it's also possible we're
   trashing the semaphore before we hand it off to the OS.

4. Leaking semaphores? (Perhaps same as 3) I think we leak semaphores
   at the moment.

====================================
FIXED BUGS
====================================

(note that this section is, almost by definition, rather incomplete,
but rather should serve as a reminder to anyone looking at this what
some of the issues we had to deal with where)

* Need to pin the mutex and the lutex before calling futex-wake,
  futex-wait, etc... Orignally we either weren't pinning anything or
  were just pinning the mutex. We need to make sure the lutex doesn't
  move out from under us as well.

* Set %fs to 0 when freeing the LDT

====================================
Lutexes
====================================

[NJF to describe lutexes, with a pointer to the lutex API in the SBCL
internals documentation]

====================================
Semaphores
====================================

We have a number of options for semaphores: POSIX/BSD semaphores
(sem_wait and friends), Mach semaphores, and Carbon semaphores. The
problem with POSIX semaphores on Darwin is that sem_init is not
supported. The only way to create a semaphore is with sem_open, which
means named semaphores. This might not be horrible, but sounds
somewhat expensive. Mach semaphores have an API similar to the POSIX
semaphores and a semaphore_create routine that seems similar in spirit
to sem_init. These sound good, except that user programs aren't
supposed to call semaphore_create and semaphore_destroy for some
reason. Finally, this leaves Carbon semaphores, which appear to be a
thin veneer on top of the mach semaphores. The choice of which
semaphore type to use is a build-time option, with posix being the
default (WHICH DOESN'T WORK ON OS X!), and :mach-semaphores and
:carbon-semaphores specifying Mach or Carbon semaphores,
respectively. If we ever expect any support on semaphore problems from
Apple, we should use Carbon semaphores. If we want to maximize speed,
at the expense of violating Apple's do-not-use edict, we should use
Mach semaphores.

Currently, both Mach and Carbon semaphores exhibit similar problems at
the same place in the code in excuting threads.impure.lisp and
timer.impure.lisp.


====================================
Signalling
====================================

We added a new signal, SIG_RESUME_FROM_GC in hopes of getting better
behavior from Darwin's not-RT signalling mechanism. The non-darwin way
of doing things uses the same signal, STOP_STOP_FOR_GC to signal to
threads both that the should suspend and resume. First, a
SIG_STOP_FOR_GC is sent to the thread to tell it to suspend itself and
then a second SIG_STOP_FOR_GC is sent to telll the tread to begin
running again. The problem for Darwin is that, in the absence of POSIX
Real-Time (RT) threads, if we were handling the first SIG_STOP_FOR_GC
and the second signal was issued, the signal was being dropped on the
floor. We have now way of knowing when the signal handler finishes
running, so we can't know when it is safe to send the second
signal. Using another signal, SIG_RESUME_FROM_GC, causes the signal to
be queued and dispatched appropriately after the first handler
finishes.

====================================
Thread Local Storage
====================================

We use the %fs register for setting up segments for TLS, this allows
for much more efficient access of thread local variables than having
to use pthread_special everywhere.

Darwin supports %fs with the i386_set_ldt. We set this up in
arch_os_thread_cleanup, which is wrongly in bsd-os.c. This should get
moved to x86-bsd-os.c, but we'll save this for an arch-os cleanup at
some point.

The ldt gets freed in arch_os_thread_cleanup by setting the %fs to 0
and then setting the ldt to NULL. Make sure to set %fs to 0 here or
bad things happen on the way to destroying the thread!

====================================
Build Features
====================================

:mach-semaphores
:carbon-semaphores

Choose one on of :mach-semaphores or :carbon-semaphores. Choosing
neither gives you posix Semaphores which fail as Darwin doesn't have
sem_init. Note: we should be able to make this work with sem_open, but
haven't done so yet.

:restore-tls-segment-register-from-context

The :restore-tls-segment-register-from-context feature indicates that
we need to restore %fs from the signal handler context. On Linux, the
%fs register comes preloaded with the threads appropriate %fs value,
on Darwin we need to load it from the context. It's a reasonable
approach that Apple has taken here and other OSes may require this as
well, therefore it's a feature rather than an arch/os specific ifdef.

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25747

Modified Files:
      Tag: lutex-branch
	version.lisp-expr 
Log Message:
0.9.10.46.lutex-branch.12
    * set initial semaphore value to 0 
    * MP -> MPCreateSemaphore in FSHOW message
    * pin (thread-interruptions-lock thread) when calling futex-destroy
    * added internals-notes document x86-darwin-threads


Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.2745.2.11
retrieving revision 1.2745.2.12
diff -u -d -r1.2745.2.11 -r1.2745.2.12
--- version.lisp-expr	25 Mar 2006 21:20:00 -0000	1.2745.2.11
+++ version.lisp-expr	25 Mar 2006 22:26:48 -0000	1.2745.2.12
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.10.46.lutex-branch.11"
+"0.9.10.46.lutex-branch.12"