Changeset 70 for branches/home

Timestamp:

02/05/07 04:51:51 (18 years ago)

Author:

psmith

Message:

Large packet support working

Location:

branches/home/psmith/restructure/src/io

Files:

• async-fd.lisp (modified) (3 diffs)
• nio-server.lisp (modified) (1 diff)

branches/home/psmith/restructure/src/io/async-fd.lisp ¶

@@ -78 +78 @@
       (setf close-pending t)))
 
-(define-condition read-error (error) ())
+(define-condition read-error (error) 
+  ((errno :initform :errno
+             :accessor read-error-errno)))
 
 ;;  "Read more data from STATE-MACHINE."
@@ -89 +91 @@
       (cond
        ((< new-bytes 0)
-        (progn
-;;TODO if ret is -1 and errno is EAGAIN save state and wait for notification
-          (format t "read-error - Errno: ~A~%" (get-errno))
-          (error 'read-error)))
+        (let ((errno (get-errno)))
+          (format t "read-error - Errno: ~A~%" errno)
+          (cond ((eql errno +ERRNO_EAGAIN+)
+                 (setf (read-ready state-machine) nil))
+                (t
+                 (error 'read-error :errno errno)))))
        ((= new-bytes 0)
         nil);;(throw 'end-of-file nil)
@@ -98 +102 @@
           ;;Update buffer position
           (inc-position foreign-read-buffer new-bytes)
-          (setf (read-ready state-machine) nil))))))
+          (when (> (remaining foreign-read-buffer) 0)
+            (setf (read-ready state-machine) nil)))))))
 
 (defun close-async-fd (async-fd)

branches/home/psmith/restructure/src/io/nio-server.lisp ¶

@@ -110 +110 @@
                          ;; accept connection ?
                          ((funcall accept-connection async-fd)
-                          (set-fd-nonblocking (async-fd-read-fd async-fd))
+                          (sleep 0.1)
+                          (let ((nb-ret (set-fd-nonblocking (async-fd-read-fd async-fd))))
+                            (format t "set bb ret: ~A :flags ~A~%" nb-ret (get-fd-flags (async-fd-read-fd async-fd)))
+                            (when (< nb-ret 0) 
+                              (format t "Error setting socket non-blocking: ")
+                              (perror)))
                           (setf (gethash (async-fd-read-fd async-fd) client-hash) async-fd)
                           (add-async-fd event-queue async-fd :read-write)