Changeset 85 for branches/home/psmith/restructure/src/io

Timestamp:

02/11/07 23:53:09 (18 years ago)

Author:

psmith

Message:

Reconnect working

Location:

branches/home/psmith/restructure/src/io

Files:

• async-fd.lisp (modified) (4 diffs)
• async-socket.lisp (modified) (5 diffs)
• nio-server.lisp (modified) (6 diffs)
• nio.asd (modified) (1 diff)
• nodes.lisp (modified) (3 diffs)

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

@@ -46 +46 @@
    (close-pending :initform nil
                   :accessor close-pending)
+;TODO this is either an inet-socket if we are client side or a node is we are server side...
    (socket :initarg :socket
-           :accessor socket)))
+           :accessor socket
+           :documentation "The remote node we are talking to")))
 
 
 (defmethod print-object ((async-fd async-fd) stream)
-  (with-slots (socket read-fd write-fd) async-fd
-    (format stream "#<ASYNC-FD :socket ~D :read-fd ~D :write-fd ~D.>"
-            socket read-fd write-fd)))
+  (with-slots (read-fd write-fd) async-fd
+    (format stream "#<ASYNC-FD :read-fd ~D :write-fd ~D.>"
+            read-fd write-fd)))
 
 ;;Implement this in concrete SM for read
@@ -121 +123 @@
 
 (define-condition read-error (error) ())
+(define-condition write-error (error) 
+  ((error-number :initarg :error)))
 
 (defun write-more (async-fd)
@@ -145 +149 @@
             (perror)
             (let ((err-cond (make-instance 'write-error :error err)))
-              (close err-cond)
+              (close-fd (write-fd async-fd))
               (error err-cond))))
         ;;update buffers
@@ -158 +162 @@
 
 (defconstant +MAX-BUFFER-SIZE-BYTES+ (* 1024 1024))
-
-
-
-;(let ((buffer (foreign-read-buffer async-fd)))
-;          (if (>= (length buffer) size)
-;              t
-;              (let ((new-buffer (byte-buffer size)))
-;                (copy-buffer buffer new-buffer)
-;                (free-buffer buffer)
-;                (setf (foreign-read-buffer async-fd) new-buffer)))))
-
 
 (defmacro realloc-buffer(async-fd accessor size)

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

@@ -133 +133 @@
         nil)))
 
-(defun connect-inet-socket (socket-fd addr port)
+(defun connect-inet-socket (socket-fd node)
+      (format-log t "async-socket:connect-inet-socket ccalled with ~A, and ~A~%" socket-fd node)
   (with-foreign-object (sa 'sockaddr-in)
-    (init-inet-socket sa port addr)
-
+    (init-inet-socket sa (remote-port node) (remote-host node))
     (let ((res (%connect socket-fd sa +sockaddr-in-len+)))
       (format-log t "async-socket:connect-inet-socket library connect call returned ~A, and errno ~A~%" res (get-errno))
@@ -171 +171 @@
 
 ;;;; SOCKET I/O
-
-(defclass async-socket-fd ()
-  ((family :initform :unknown :initarg :family)
-   (remote-host :initform nil :initarg :remote-host)
-   (remote-port :initform nil :initarg :remote-port)))
-
-
 
 (defun socket-accept (socket-fd connection-type)
@@ -201 +194 @@
 
         ;; accept connection
+#+nio-debug (format-log t "async-socket::socket-accept - calling %accept~%")
       (let* ((res (%accept socket-fd addr len)) 
-;;           (async-socket-fd (make-instance 'async-socket-fd :read-fd res :write-fd res)))
-             (async-socket-fd (create-state-machine connection-type res res (make-instance 'async-socket-fd))))
+             (async-fd (create-state-machine connection-type res res (node nil nil))))
+
+#+nio-debug (format-log t "async-socket::socket-accept - create async-fd ~A~%" async-fd)
 
         (unless (< res 0)
@@ -210 +205 @@
             ;; parse sockaddr struct for remote client info
 
-            (with-slots (family remote-host remote-port) (socket async-socket-fd)
+            (with-slots (family remote-host remote-port) (socket async-fd)
               
               (cond
@@ -225 +220 @@
 
             (foreign-free len)
-            (if (>= res 0) async-socket-fd nil)
+            (if (>= res 0) async-fd nil)
             )))))))
-
-
-(defun remote-info (async-socket-fd)
-  "Return FAMILY, REMOTE-HOST and REMOTE-PORT in list."
-  (with-slots (family remote-host remote-port) async-socket-fd
-    (list family remote-host remote-port)))
-

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

@@ -42 +42 @@
   (let ((removals nil))
     (maphash #'(lambda (k async-fd) 
-#+nio-debug2    (format-log t "Dealing with ~a => ~a~%" k async-fd)
+#+nio-debug     (format-log t "Dealing with ~a => ~a~%" k async-fd)
                
                ;process reads
@@ -50 +50 @@
 
                ;process-writes
-               (process-write async-fd)
-               (when (and (write-ready async-fd) 
-                              (> (buffer-position (foreign-write-buffer async-fd)) 0))
-                 (write-more async-fd))
-
-               (when (close-pending async-fd)
-                 (write-more async-fd)
-                 (push async-fd removals)))
+               (handler-case
+                   (progn
+                     (process-write async-fd)
+                     (when (and (write-ready async-fd) 
+                                (> (buffer-position (foreign-write-buffer async-fd)) 0))
+                       (write-more async-fd))
+                     
+                     (when (close-pending async-fd)
+                       (write-more async-fd)
+                       (push async-fd removals)))
+                 (write-error (we) (push async-fd removals))))
            client-hash)
     (dolist (async-fd removals)
+      (format-log t "nio-server:process-async-fds processing remove for ~a~%" async-fd)
+      (setf (active-conn (socket async-fd)) nil)
       (remhash (async-fd-read-fd async-fd) client-hash))))
-;    (format t "client-hash list ~A~%"client-hash )
-
-
                              
 
@@ -122 +124 @@
                               (perror)))
                           (setf (gethash (async-fd-read-fd async-fd) client-hash) async-fd)
-                          (add-async-fd event-queue async-fd :read-write)
-;                         (add-async-fd event-queue async-fd :write)
-                          )
+                          (add-async-fd event-queue async-fd :read-write))
 
                          ;; no accept, close
@@ -150 +150 @@
                              (when (write-event-p event) (setf (write-ready async-fd) t)))))))))
 
-                                        ;add outgoing sockets to event queue
+;add outgoing sockets to event queue
 #+nio-debug2     (format-log t "nio-server:start-server - Processing new connections queue ~A~%" +connected-sockets-queue+)
              (loop for node = (nio-compat:take +connected-sockets-queue+ :blocking-call nil) until (null node) do
 #+nio-debug       (format-log t "nio-server:start-server - adding node to nodes-list ~A~%" node)
                   (push node *nodes-list*))
+
              (with-connect-ready-nodes (a-node)
 #+nio-debug       (format-log t "nio-server:start-server - attempting connection to node ~A~%" a-node)
-               (let ((new-fd (connect (host a-node) (port a-node) connection-type)))
+               (let ((new-fd (connect a-node connection-type)))
+#+nio-debug       (format-log t "nio-server:start-server - connect returned async-fd ~A~%" new-fd)
                  (update-last-connect-attempt a-node)
                  (when new-fd
@@ -172 +174 @@
 
 
-(defun connect(host port connection-type
+(defun connect(node connection-type
                &key 
                (protocol :inet))
-  (format-log t "nio-server:connect - Called with: ~A:~A:~A ~%" protocol host port)
+  (format-log t "nio-server:connect - Called with: ~A ~A~%" protocol node)
   (let ((sock nil))
     (setq sock (ecase protocol
@@ -181 +183 @@
                  (:inet6 (make-inet6-socket))))
     
-    (if (connect-inet-socket sock host port)
-        (let ((sm (create-state-machine connection-type sock sock sock)))
-;         (nio-compat:add +connected-sockets-queue+ sm)
-;         (format-log t "nio-server:connect - Socket enqueued: ~A~%" +connected-sockets-queue+)
+    (if (connect-inet-socket sock node)
+        (let ((sm (create-state-machine connection-type sock sock node)))
           (return-from connect sm))
         (format t "Connect failed!!~A ~%" (get-errno)))))

branches/home/psmith/restructure/src/io/nio.asd ¶

@@ -9 +9 @@
                  (:file "packet" :depends-on ("nio-package"))
                  (:file "async-fd" :depends-on ("fd-helper"))
-                 (:file "async-socket" :depends-on ("async-fd"))
                  (:file "nodes" :depends-on ("nio-package"))
+                 (:file "async-socket" :depends-on ("async-fd" "nodes"))
                  (:file "nio-server" :depends-on ("async-socket" "nodes"))
                  (:file "ip-authorisation" :depends-on ("nio-package"))

branches/home/psmith/restructure/src/io/nodes.lisp ¶

@@ -29 +29 @@
 (declaim (optimize (debug 3) (speed 3) (space 0)))
 
-;;concept of a remote socket
+
+;;concept of a remote socket with properties e.g. stats, connection attempts etc
 (defclass node()
-  ((host :initarg :host
-         :reader host)
-   (port :initarg :port
-         :reader port)
+  ((family :initform :unknown :initarg :family)
+   (remote-host :initarg :remote-host
+                :initform nil
+                :accessor remote-host)
+   (remote-port :initarg :remote-port
+                :initform nil
+                :accessor remote-port)
    (last-connect-attempt :initform nil
                          :accessor last-connect-attempt
                          :documentation "Time we last attempted a connection")
-   (retry-delay :initform 600
+   (retry-delay :initform 60
                 :accessor retry-delay
-                :documentation "The delay to wait after the last-connection-attempt before trying to connect again")
+                :documentation "The delay to wait (in secs) after the last-connection-attempt before trying to connect again (10 mins)")
    (active-conn :initform nil
                 :accessor active-conn
@@ -46 +50 @@
 
 (defun node(host port)
-  (make-instance 'node :host host :port port))
+  (make-instance 'node :remote-host host :remote-port port))
 
 ;(node-from-socket-repn "192.168.1.1:1234")
@@ -57 +61 @@
 
 (defmethod print-object ((a-node node) stream)
-  (with-slots (host port last-connect-attempt retry-delay active-conn) a-node
-    (format stream "#<NODE :HOST ~A :port ~A :last-connect-attempt ~A :retry-delay ~A :active-conn ~A>" host port last-connect-attempt retry-delay active-conn)))
+  (with-slots (remote-host remote-port last-connect-attempt retry-delay active-conn) a-node
+    (format stream "#<NODE :remote-host ~A :remote-port ~A :last-connect-attempt ~A :retry-delay ~A :active-conn ~A>" 
+            remote-host remote-port last-connect-attempt retry-delay active-conn)))