Changeset 12105 in project

Timestamp:

10/02/08 20:23:37 (12 years ago)

Author:

felix winkelmann

Message:

timeout-list removal fixes (thanks to Joerg Wittenberger)

Location:

chicken/trunk

Files:

• TODO (modified) (1 diff)
• scheduler.scm (modified) (1 diff)
• srfi-18.scm (modified) (3 diffs)

chicken/trunk/TODO

@@ -10 +10 @@
 *** pre-optimization 
 **** changes call-sites and makes them invalid for later pre-optimization
-** scheduler
-*** apply srfi
 ** expander
 *** expansion of r5rs_pitfall 4.2 incorrect

chicken/trunk/scheduler.scm

@@ -36 +36 @@
         ##sys#remove-from-ready-queue ##sys#unblock-threads-for-i/o ##sys#force-primordial
         ##sys#fdset-input-set ##sys#fdset-output-set ##sys#fdset-clear
-        ##sys#fdset-select-timeout ##sys#fdset-restore ##sys#remove-from-timeout-list
+        ##sys#fdset-select-timeout ##sys#fdset-restore
         ##sys#clear-i/o-state-for-thread!) 
   (foreign-declare #<<EOF

chicken/trunk/srfi-18.scm

@@ -231 +231 @@
             (lambda ()
               (case (##sys#slot thread 3)
-                [(dead) (apply return (##sys#slot thread 2))]
+                [(dead)
+                 (unless (##sys#slot ct 13) ; not unblocked by timeout
+                   (##sys#remove-from-timeout-list ct))
+                 (apply return (##sys#slot thread 2))]
                 [(terminated)
                  (return 
@@ -352 +355 @@
                    (lambda ()
                      (##sys#setslot mutex 3 (##sys#delq ct (##sys#slot mutex 3)))
-                     (##sys#setslot ##sys#current-thread 8 (cons mutex (##sys#slot ##sys#current-thread 8)))
+                     (unless (##sys#slot ct 13)  ; not unblocked by timeout
+                       (##sys#remove-from-timeout-list ct))
+                     (##sys#setslot ct 8 (cons mutex (##sys#slot ct 8)))
                      (##sys#setslot mutex 2 thread)
-                     #f) )
+                     (return #f) ))
                   (##sys#thread-block-for-timeout! ct limit)
                   (switch) ]
@@ -386 +391 @@
                      (lambda () 
                        (##sys#setslot cvar 2 (##sys#delq ct (##sys#slot cvar 2)))
+                       (unless (##sys#slot ct 13)  ; not unblocked by timeout
+                         (##sys#remove-from-timeout-list ct))
                        (return #f) ) )
                     (##sys#thread-block-for-timeout! ct limit) ]