Changeset 11513

Timestamp:

Dec 12, 2008, 6:14:08 PM (12 years ago)

Author:

gz

Message:

fix monitor-external-process to not get confused when an fd is closed
with an output stream that is also used by another, unclosed, fd.

This made rebuild-ccl fail for me, every time, I don't understand why
it doesn't fail for others, but I think this change is correct in
any case.

File:

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

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

@@ -1180 +1180 @@
                           (declare (fixnum n))
                           (if (<= n 0)
-                            (progn
-                              (without-interrupts
-                               (decf (car token))
-                               (fd-close in-fd)
-                               (setq in-fds (delete in-fd in-fds)
-                                     out-streams (delete out-stream out-streams)
-                                     changed t)))
+                            (without-interrupts
+                              (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))
                             (let* ((string (make-string 1024)))
                               (declare (dynamic-extent string))