Changeset 11516 for trunk/source/level-1/linux-files.lisp

Timestamp:

Dec 14, 2008, 7:48:45 AM (11 years ago)

Author:

gb

Message:

Try to fix the bug addressed by r11513 in a different way, and fix it
on Windows, too. (Whether or not the bug occurred likely had something
to do with whether the process terminated before we noticed EOF on an
fd that was associated with a stream that another monitored fd was
also associated with.) Build the alist once, invalidate an entry
when the associated fd gets EOF/error (by setting the CAR of the pair
to NIL), delete invalid entries if any were invalidated on the previous
iteration.

File:

• trunk/source/level-1/linux-files.lisp (modified) (5 diffs)

trunk/source/level-1/linux-files.lisp

@@ -1155 +1155 @@
           (loop
             (when changed
-              (setq pairs (pairlis in-fds out-streams)
+              (setq pairs (delete nil pairs :key #'car)
                     changed nil))
             (when (and terminated (null pairs))
@@ -1183 +1183 @@
                               (decf (car token))
                               (fd-close in-fd)
-                              ;; Delete, watching out for the same out-stream being used
-                              ;; for different fds
-                              (loop for fds on in-fds as streams on out-streams
-                                    do (when (eq (car fds) in-fd)
-                                         (setf (car fds) :delete (car streams) :delete)))
-                              (setq in-fds (delete :delete in-fds)
-                                    out-streams (delete :delete out-streams)
-                                    changed t))
+                              (setf (car p) nil changed t))
                             (let* ((string (make-string 1024)))
                               (declare (dynamic-extent string))
@@ -1741 +1734 @@
   ;;; So, this tries to loop until the process handle is signaled and
   ;;; all data has been read.
-  (defun monitor-external-process (p)
+ (defun monitor-external-process (p)
     (let* ((in-fds (external-process-watched-fds p))
            (out-streams (external-process-watched-streams p))
@@ -1751 +1744 @@
       (loop
         (when changed
-          (setq pairs (pairlis in-fds out-streams)
+          (setq pairs (delete nil pairs :key #'car)
                 changed nil))
         (when (and terminated (null pairs))
@@ -1783 +1776 @@
                          (decf (car token))
                          (fd-close in-fd)
-                         (setq in-fds (delete in-fd in-fds)
-                               out-streams (delete out-stream out-streams)
-                               changed t)))
+                         (setf (car p) nil changed t)))
 
                       (let* ((string (make-string 1024)))