[slime-cvs] CVS update: slime/swank.lisp

[Luke Gorrie]

Update of /project/slime/cvsroot/slime
In directory common-lisp.net:/tmp/cvs-serv6560

Modified Files:
	swank.lisp 
Log Message:
Updated for new network interface.

Date: Mon Jan 12 23:21:33 2004
Author: lgorrie

Index: slime/swank.lisp
diff -u slime/swank.lisp:1.92 slime/swank.lisp:1.93
--- slime/swank.lisp:1.92	Mon Jan 12 00:14:13 2004
+++ slime/swank.lisp	Mon Jan 12 23:21:33 2004
@@ -115,15 +115,12 @@
 
 ;;;; TCP Server
 
-(defvar *start-swank-in-background* t)
 (defvar *close-swank-socket-after-setup* nil)
-(defvar *use-dedicated-output-stream* t)
+(defvar *use-dedicated-output-stream* #+lispworks nil #-lispworks t) ; FIXME
 
 (defun start-server (port-file)
-  (create-socket-server #'init-connection
-                        :announce-fn (announce-server-port-fn port-file)
-                        :port 0
-                        :loop nil))
+  (accept-socket/run :announce-fn (announce-server-port-fn port-file)
+                     :init-fn #'init-connection))
 
 (defun announce-server-port-fn (file)
   (lambda (port)
@@ -171,13 +168,7 @@
                #'handle)
              (handle ()
                (error "Protocol error: received input on dedicated output socket.")))
-      (create-socket-server #'init
-                            :announce-fn #'announce
-                            :loop nil
-                            :accept-background nil
-                            :handle-background t)
-      (assert (streamp stream))
-      stream)))
+      (accept-socket/stream :announce-fn #'announce))))
 
 (defun handle-request (connection)
   "Read and respond to one request from CONNECTION."