X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fserve-event.lisp;h=1183d6ccf5990177d0c6d1a3c116a8fa5362c022;hb=c47519c9e63fd32a635943a84ec13d8a60d95f08;hp=55482c4ed481406f16b3751c0754cd8f2feaa724;hpb=cb7837b769ce190baec60a2159c33099816ea6e3;p=sbcl.git diff --git a/src/code/serve-event.lisp b/src/code/serve-event.lisp index 55482c4..1183d6c 100644 --- a/src/code/serve-event.lisp +++ b/src/code/serve-event.lisp @@ -70,7 +70,7 @@ (def!method print-object ((handler handler) stream) (print-unreadable-object (handler stream :type t) (format stream - "~A on ~:[~;BOGUS ~]descriptor ~D: ~S" + "~A on ~:[~;BOGUS ~]descriptor ~W: ~S" (handler-direction handler) (handler-bogus handler) (handler-descriptor handler) @@ -185,9 +185,9 @@ (values sec usec)))) (values 0 0)) (declare (type (unsigned-byte 31) stop-sec stop-usec)) - (with-fd-handler (fd direction #'(lambda (fd) - (declare (ignore fd)) - (setf usable t))) + (with-fd-handler (fd direction (lambda (fd) + (declare (ignore fd)) + (setf usable t))) (loop (sub-serve-event to-sec to-usec) @@ -279,11 +279,9 @@ ;;; When a *periodic-polling-function* is defined the server will not ;;; block for more than the maximum event timeout and will call the -;;; polling function if it does time out. One important use of this -;;; is to periodically call process-yield. +;;; polling function if it does time out. (declaim (type (or null function) *periodic-polling-function*)) -(defvar *periodic-polling-function* - #!-mp nil #!+mp #'sb!mp:process-yield) +(defvar *periodic-polling-function* nil) (declaim (type (unsigned-byte 29) *max-event-to-sec* *max-event-to-usec*)) (defvar *max-event-to-sec* 1) (defvar *max-event-to-usec* 0) @@ -307,10 +305,11 @@ (sb!alien:with-alien ((read-fds (sb!alien:struct sb!unix:fd-set)) (write-fds (sb!alien:struct sb!unix:fd-set))) (let ((count (calc-masks))) - (multiple-value-bind (value err) (sb!unix:unix-fast-select - count - (sb!alien:addr read-fds) (sb!alien:addr write-fds) - nil to-sec to-usec) + (multiple-value-bind (value err) + (sb!unix:unix-fast-select count + (sb!alien:addr read-fds) + (sb!alien:addr write-fds) + nil to-sec to-usec) ;; Now see what it was (if anything) (cond (value