Changeset 5607

Timestamp:

Dec 14, 2006, 2:12:37 PM (18 years ago)

Author:

Gary Byers

Message:

THREAD-ENABLE: second arg is TERMINATION-SEMAPHORE.

KILL-LISP-THREAD: don't use #_pthread_cancel, which may force the target
thread to transition from running lisp code to running foreign code
without advertising that fact. Send a SIGQUIT instead, and trust the
SIGQUIT handler to manage that transition. Don't try to kill the
initial thread.

File:

• trunk/ccl/level-1/l1-lisp-threads.lisp (modified) (3 diffs)

trunk/ccl/level-1/l1-lisp-threads.lisp

@@ -402 +402 @@
         (cons function args)))
 
-(defun thread-enable (thread activation-semaphore allocation-quantum &optional (timeout most-positive-fixnum))
+(defun thread-enable (thread termination-semaphore allocation-quantum &optional (timeout most-positive-fixnum))
   (let* ((tcr (or (lisp-thread.tcr thread) (new-tcr-for-thread thread))))
     (with-macptrs (s)
@@ -410 +410 @@
          tcr
          (lisp-thread.startup-function thread))
-        (%activate-tcr tcr activation-semaphore allocation-quantum)
+        (%activate-tcr tcr termination-semaphore allocation-quantum)
         thread))))
                               
@@ -424 +424 @@
 
 (defun kill-lisp-thread (thread)
-  (let* ((pthread (lisp-thread-os-thread thread)))
-    (when pthread
-      (setf (lisp-thread.tcr thread) nil
-            (lisp-thread.state thread) :exit)
-      (#_pthread_cancel pthread))))
+  (unless (eq thread initial-thread)
+    (let* ((pthread (lisp-thread-os-thread thread)))
+      (when pthread
+        (setf (lisp-thread.tcr thread) nil
+              (lisp-thread.state thread) :exit)
+        (#_pthread_kill pthread #$SIGQUIT)))))
 
 ;;; This returns the underlying pthread, whatever that is.