Skip to content
Snippets Groups Projects
Commit 5aa45ba4 authored by wlott's avatar wlott
Browse files

Removed #+serve-event conditionalation.

parent 437fcddf
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.20 1992/02/21 21:59:52 wlott Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.21 1992/03/09 20:17:39 wlott Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -445,7 +445,6 @@ ...@@ -445,7 +445,6 @@
(setf (fd-stream-ibuf-head stream) 0) (setf (fd-stream-ibuf-head stream) 0)
(setf (fd-stream-ibuf-tail stream) tail)))) (setf (fd-stream-ibuf-tail stream) tail))))
(setf (fd-stream-listen stream) nil) (setf (fd-stream-listen stream) nil)
#+serve-event
(multiple-value-bind (multiple-value-bind
(count errno) (count errno)
(unix:unix-select (1+ fd) (ash 1 fd) 0 0 0) (unix:unix-select (1+ fd) (ash 1 fd) 0 0 0)
...@@ -465,16 +464,15 @@ ...@@ -465,16 +464,15 @@
(system:int-sap (+ (system:sap-int ibuf-sap) tail)) (system:int-sap (+ (system:sap-int ibuf-sap) tail))
(- buflen tail)) (- buflen tail))
(cond ((null count) (cond ((null count)
(if #+serve-event (eql errno unix:ewouldblock) (if (eql errno unix:ewouldblock)
#-serve-event nil (progn
(progn (unless (system:wait-until-fd-usable
(unless (system:wait-until-fd-usable fd :input (fd-stream-timeout stream))
fd :input (fd-stream-timeout stream)) (error 'io-timeout :stream stream :direction :read))
(error 'io-timeout :stream stream :direction :read)) (do-input stream))
(do-input stream)) (error "Error reading ~S: ~A"
(error "Error reading ~S: ~A" stream
stream (unix:get-unix-error-msg errno))))
(unix:get-unix-error-msg errno))))
((zerop count) ((zerop count)
(setf (fd-stream-listen stream) :eof) (setf (fd-stream-listen stream) :eof)
(throw 'eof-input-catcher nil)) (throw 'eof-input-catcher nil))
...@@ -1008,7 +1006,6 @@ non-server method is also significantly more efficient for large reads. ...@@ -1008,7 +1006,6 @@ non-server method is also significantly more efficient for large reads.
(flush-output-buffer stream)) (flush-output-buffer stream))
(:finish-output (:finish-output
(flush-output-buffer stream) (flush-output-buffer stream)
#+serve-event
(do () (do ()
((null (fd-stream-output-later stream))) ((null (fd-stream-output-later stream)))
(system:serve-all-events))) (system:serve-all-events)))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment