Changeset 463

Timestamp:

Feb 2, 2004, 8:11:09 AM (21 years ago)

Author:

Gary Byers

Message:

Handshaking during QUIT/PREPARE-TO-QUIT; this is intended to work around
a bug where #_pthread_kill seems to not deliver the signal to the target
thread if the signaling thread (a) exits and (b) runs certain Cocoa
tsd-cleanup routines. (I.e., it's a mystery.)

File:

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

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

@@ -155 +155 @@
         (if res (return-from find-restart-2 restart)(setq res restart))))))
 |#
+
+(defglobal *quit-acknowledge* nil)
+(defglobal *quit-acknowledge-lock* (make-lock))
+
 (defun quit (&optional (exit-status 0))
   (let* ((ip *initial-process*)
@@ -165 +169 @@
                                        (#_exit exit-status)))))
       (unless (eq cp ip)
+        (when (try-lock *quit-acknowledge-lock*)
+          (let-globally ((*quit-acknowledge* (make-semaphore)))
+                        (timed-wait-on-semaphore *quit-acknowledge* 1)))
         (process-kill cp)))))
 
@@ -176 +183 @@
 
 (defun prepare-to-quit (&optional part)
+  (when *quit-acknowledge* (signal-semaphore *quit-acknowledge*))
   (let-globally ((*quitting* t))
-                
     (when (or (null part) (eql 0 part))
       (dolist (f *lisp-cleanup-functions*)