From: Juho S. <js...@us...> - 2006-09-19 21:35:44
|
Update of /cvsroot/sbcl/sbcl/src/runtime In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32610/src/runtime Modified Files: breakpoint.c Log Message: 0.9.16.39: Oops, unblock interrupts while handling a single-stepper trap. Fixes GC deadlocks while using the stepper in Slime on a threaded SBCL. Index: breakpoint.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/breakpoint.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- breakpoint.c 18 Sep 2006 20:09:14 -0000 1.25 +++ breakpoint.c 19 Sep 2006 21:35:33 -0000 1.26 @@ -189,12 +189,22 @@ void handle_single_step_trap (os_context_t *context, int kind, int register_offset) { + lispobj context_sap; + + /* Allocate the SAP object while the interrupts are still + * disabled. */ + context_sap = alloc_sap(context); + fake_foreign_function_call(context); +#ifndef LISP_FEATURE_WIN32 + thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); +#endif + funcall3(SymbolFunction(HANDLE_SINGLE_STEP_TRAP), - alloc_sap(context), + context_sap, make_fixnum(kind), make_fixnum(register_offset)); - undo_fake_foreign_function_call(context); + undo_fake_foreign_function_call(context); /* blocks signals again */ } |