Changeset 89 for branches/home/psmith

Timestamp:

02/17/07 23:42:28 (18 years ago)

Author:

psmith

Message:

Hopefully fixes epollhup not handled properly on close

Location:

branches/home/psmith/restructure/src

Files:

• event/epoll-cffi.lisp (modified) (1 diff)
• event/epoll.lisp (modified) (1 diff)
• event/event-notification.lisp (modified) (1 diff)
• io/async-fd.lisp (modified) (1 diff)
• io/nio-server.lisp (modified) (1 diff)
• nio-logger/run-logging-client.lisp (modified) (2 diffs)
• nio-logger/run-logging-server.lisp (modified) (2 diffs)

branches/home/psmith/restructure/src/event/epoll-cffi.lisp ¶

@@ -58 +58 @@
     (pad :uint32))
 
+;;See man epoll_ctl
+;;See /usr/include/sys/epoll.h
+
   (defconstant +epoll-event-size+ #.(+ 4 4 4))
 
   (defconstant +epoll-in+ #x001)
   (defconstant +epoll-out+ #x004)
+  (defconstant +epoll-error+ #x008)
+  (defconstant +epoll-hup+ #x010)
   (defconstant +epoll-et+ #.(ash 1 31)) 
 

branches/home/psmith/restructure/src/event/epoll.lisp ¶

@@ -41 +41 @@
     (not (eql (logand event +epoll-out+) 0)))
 
+  (defun error-event-p (event)
+    (not (eql (logand event +epoll-error+) 0)))
 
+  (defun hup-event-p (event)
+    (not (eql (logand event +epoll-hup+) 0)))
 
   (defun add-fd (event-queue fd mode &key (trigger :edge))

branches/home/psmith/restructure/src/event/event-notification.lisp ¶

@@ -27 +27 @@
 (defpackage :event-notification (:use :cl :cffi :nio-compat)
             (:export
-             make-event-queue add-fd remove-fd poll-events poll-error read-event-p write-event-p))
+             make-event-queue add-fd remove-fd poll-events poll-error read-event-p write-event-p error-event-p hup-event-p))

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

@@ -99 +99 @@
                  (setf (read-ready state-machine) nil))
                 (t
-                 (close-fd (read-fd async-fd))
+                 (close-fd (read-fd state-machine))
                  (error 'read-error :errno errno)))))
        ((= new-bytes 0)

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

@@ -148 +148 @@
                                                           (throw 'error-exit nil))))
 
-                             (when (read-event-p event) (setf (read-ready async-fd) t))
-                             (when (write-event-p event) (setf (write-ready async-fd) t)))))))))
+                             (if (error-event-p event) 
+                                 (close-sm async-fd)
+                                 (progn
+                                   (when (read-event-p event) (setf (read-ready async-fd) t))
+                                   (when (write-event-p event) (setf (write-ready async-fd) t)))))))))))
 
 ;add outgoing sockets to event queue

branches/home/psmith/restructure/src/nio-logger/run-logging-client.lisp ¶

@@ -26 +26 @@
 |#
 
-;(push :nio-debug *features*)
+(push :nio-debug *features*)
 (require :asdf)
 (require :nio-logger)
@@ -40 +40 @@
         (lambda (condition hook)
           (declare (ignore hook))
-          (with-open-file (out (format nil "error-from-pid~A-thread-~A" (sb-posix:getpid) (sb-thread:thread-name sb-thread:*current-thread*))
+          (with-open-file (out (format nil "client-error-from-pid~A-thread-~A" (sb-posix:getpid) (sb-thread:thread-name sb-thread:*current-thread*))
                                :direction :output :external-format :utf-8 :if-exists :append :if-does-not-exist :create)
             (format out "Toplevel catch (~A):~%" (nio-utils:get-readable-time))

branches/home/psmith/restructure/src/nio-logger/run-logging-server.lisp ¶

@@ -26 +26 @@
 |#
 
-;(push :nio-debug *features*)
+(push :nio-debug *features*)
 (require :asdf)
 (require :nio-logger)
@@ -34 +34 @@
       (allowed-ips-filename (fourth sb-ext:*posix-argv*)))
   (format t "Starting logging Server with ~A ~A ~A~%" listen-ip out-file allowed-ips-filename)
+
+  (setf sb-ext:*invoke-debugger-hook*
+        (lambda (condition hook)
+          (declare (ignore hook))
+          (with-open-file (out (format nil "server-error-from-pid~A-thread-~A" (sb-posix:getpid) (sb-thread:thread-name sb-thread:*current-thread*))
+                               :direction :output :external-format :utf-8 :if-exists :append :if-does-not-exist :create)
+            (format out "Toplevel catch (~A):~%" (nio-utils:get-readable-time))
+            (format out "~A - ~A~%" (type-of condition) condition)
+            (sb-debug:backtrace 20 out))
+          (quit)))
+
+
+
   (nio-logger:run-logging-server listen-ip out-file allowed-ips-filename))