Changeset 8485

Timestamp:

Feb 14, 2008, 1:06:16 AM (17 years ago)

Author:

Gary Byers

Message:

Lose the :SEND-TIMEOUT/:RECEIVE-TIMEOUT args; handling of timeous on
I/O operations should now be more general.

File:

• trunk/source/level-1/l1-sockets.lisp (modified) (6 diffs)

trunk/source/level-1/l1-sockets.lisp

@@ -533 +533 @@
                            connect
                            out-of-band-inline
-                           receive-timeout
-                           send-timeout
                            &allow-other-keys)
   ;; see man socket(7) tcp(7) ip(7)
@@ -562 +560 @@
                         #+(or freebsd-target darwin-target) #$IPPROTO_TCP
                         #$TCP_NODELAY 1))
-      (when (and receive-timeout (> receive-timeout 0))
-        (timeval-setsockopt fd
-                            #$SOL_SOCKET
-                            #$SO_RCVTIMEO
-                            receive-timeout))
-      (when (and send-timeout (> send-timeout 0))
-        (timeval-setsockopt fd
-                            #$SOL_SOCKET
-                            #$SO_SNDTIMEO
-                            send-timeout))
       (when (or local-port local-host)
         (let* ((proto (if (eq type :stream) "tcp" "udp"))
@@ -617 +605 @@
                     local-filename remote-filename sharing basic
                     external-format (auto-close t)
-                    receive-timeout send-timeout connect-timeout)
+                    connect-timeout)
   "Create and return a new socket."
   (declare (dynamic-extent keys))
@@ -624 +612 @@
                    local-port local-host backlog class out-of-band-inline
                    local-filename remote-filename sharing basic external-format
-                   auto-close receive-timeout send-timeout connect-timeout))
+                   auto-close  connect-timeout))
   (ecase address-family
     ((:file) (apply #'make-file-socket keys))
@@ -710 +698 @@
 
 
-(defun make-tcp-stream (fd &key (format :bivalent) external-format (class 'tcp-stream) sharing (basic t) (auto-close t) (receive-timeout 0) &allow-other-keys)
+(defun make-tcp-stream (fd &key (format :bivalent) external-format (class 'tcp-stream) sharing (basic t) (auto-close t)  &allow-other-keys)
   (let* ((external-format (normalize-external-format :socket external-format)))
     (let ((element-type (ecase format
@@ -726 +714 @@
                       :line-termination (external-format-line-termination external-format)
                       :basic basic
-                      :auto-close auto-close
-                      :interactive (zerop receive-timeout)))))
+                      :auto-close auto-close))))
 
 (defun make-file-socket-stream (fd &key (format :bivalent) external-format (class 'file-socket-stream)  sharing basic (auto-close t) &allow-other-keys)