Merged a few more changes from the trunk.

svn: r17964
This commit is contained in:
Carl Eastlund 2010-02-04 03:26:31 +00:00
commit 3eb1e46eeb
2 changed files with 3 additions and 2 deletions

View File

@ -210,7 +210,7 @@
iworld3) iworld3)
;; --- the server representation of a world --- ;; --- the server representation of a world ---
(define-struct iworld (in out name info) #:transparent) (define-struct iworld (in out name info) #; #:transparent)
;; World = (make-iworld IPort OPort Symbol [Listof Sexp]) ;; World = (make-iworld IPort OPort Symbol [Listof Sexp])
(define (iw* n) (make-iworld (current-input-port) (current-output-port) n '())) (define (iw* n) (make-iworld (current-input-port) (current-output-port) n '()))

View File

@ -69,7 +69,8 @@
(define ach (make-async-channel)) (define ach (make-async-channel))
;; wrap the dispatcher so we can post on the waiting semaphore ;; wrap the dispatcher so we can post on the waiting semaphore
(define (wrap-sequence . ds) (define (wrap-sequence . ds)
(let ([d (apply sequencer:make ds)]) (let* ([ds (filter values ds)] ;; drop #f when log-file is #f
[d (apply sequencer:make ds)])
(lambda (conn req) (lambda (conn req)
(d conn req) (d conn req)
;; (cond [(hash-ref port->sema (connection-o-port conn) #f) ;; (cond [(hash-ref port->sema (connection-o-port conn) #f)