Changeset 67 for trunk

Timestamp:

08/21/04 21:48:10 (21 years ago)

Author:

Erik Huelsmann

Message:

Fix invalidating the socket descriptor on non-threaded SBCL.
Also remove the connection classes' server-socket slot (again).

Location:

trunk

Files:

• command.lisp (modified) (3 diffs)
• protocol.lisp (modified) (6 diffs)

trunk/command.lisp ¶

@@ -140 +140 @@
   (send-irc-message connection :quit message)
   #+(and sbcl (not sb-thread))
-  (sb-sys:invalidate-descriptor (sb-bsd-sockets:socket-file-descriptor
-                               (server-socket connection)))
+  (sb-sys:invalidate-descriptor (sb-sys:fd-stream-fd
+                                        (server-stream connection)))
   (close (server-stream connection)))
 
@@ -250 +250 @@
 (defun socket-stream (socket)
   #+sbcl
-  (values
-   (sb-bsd-sockets:socket-make-stream socket
-                                      :element-type 'character
-                                      :input t
-                                      :output t
-                                      :buffering :none)
-   socket)
+  (sb-bsd-sockets:socket-make-stream socket
+                                     :element-type 'character
+                                     :input t
+                                     :output t
+                                     :buffering :none)
   #+openmcl
   socket)
@@ -280 +278 @@
                      (logging-stream t))
   "Connect to server and return a connection object."
-  (multiple-value-bind (stream socket)
-      (socket-connect server port)
-    (let* ((user (make-user :nickname nickname
-                            :username username
-                            :realname realname))
-           (connection (make-connection :server-stream stream
-                                        :server-socket socket
-                                        :client-stream logging-stream
-                                        :user user
-                                        :server-name server)))
+  (let* ((stream (socket-connect server port))
+         (user (make-user :nickname nickname
+                          :username username
+                          :realname realname))
+         (connection (make-connection :server-stream stream
+                                      :client-stream logging-stream
+                                      :user user
+                                      :server-name server)))
     (nick connection nickname)
     (user- connection (or username nickname) mode (or realname nickname))
     (add-default-hooks connection)
-    connection)))
+    connection))
 
 (defmethod trace- ((connection connection) &optional (target ""))

trunk/protocol.lisp ¶

@@ -34 +34 @@
     :accessor server-stream
     :documentation "Stream used to talk to the IRC server.")
-   (server-socket
-    :initarg :server-socket
-    :accessor server-socket
-    :initform nil)
    (client-stream
     :initarg :client-stream
@@ -81 +77 @@
                              (server-name "")
                              (server-stream nil)
-                        (server-socket nil)
                              (client-stream t)
                              (hooks nil))
@@ -88 +83 @@
                                    :server-name server-name
                                    :server-stream server-stream
-                                   :server-socket server-socket
                                    :client-stream client-stream)))
     (dolist (hook hooks)
@@ -126 +120 @@
 
 (define-condition invalidate-me (condition)
-  ((socket :initarg :socket
-           :reader invalidate-me-socket)
+  ((stream :initarg :stream
+           :reader invalidate-me-stream)
    (condition :initarg :condition
               :reader invalidate-me-condition)))
@@ -141 +135 @@
               (irc-message-event message)
               message))) ; needed because of the "loop while" in read-message-loop
-      (stream-error (c) (setf read-more-p nil)
-                    (signal 'invalidate-me :socket
-                            (server-socket connection)
+        (stream-error (c) (setf read-more-p nil)
+                    (signal 'invalidate-me :stream
+                            (server-stream connection)
                             :condition c)))))
 
@@ -171 +165 @@
                                           (read-message connection)
                                         (invalidate-me (c)
-                                          (sb-sys:invalidate-descriptor
-                                           (invalidate-me-socket c))
+                                          (sb-sys:invalidate-descriptor fd)
                                           (format t "Socket closed: ~A~%"
                                                   (invalidate-me-condition c)))))))))