0.7.13.2

[sbcl.git] / src / code / serve-event.lisp

diff --git a/src/code/serve-event.lisp b/src/code/serve-event.lisp
index 9ad0e36..7b1b4e9 100644 (file)
--- 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)
@@ -155,7 +155,7 @@
     (real
      (multiple-value-bind (q r) (truncate (coerce timeout 'single-float))
        (declare (type index q) (single-float r))
-       (values q (the index (truncate (* r 1f6))))))
+       (values q (the (values index t) (truncate (* r 1f6))))))
     (t
      (error "Timeout is not a real number or NIL: ~S" timeout))))
 
@@ -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)
 
@@ -282,8 +282,7 @@
 ;;; polling function if it does time out. One important use of this
 ;;; is to periodically call process-yield.
 (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 +306,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