- nio-cvs@common-lisp.net - mailman3.common-lisp.net

[nio-cvs] r105 - branches/home/psmith/restructure/src/io
by psmith＠common-lisp.net 17 Mar '07

17 Mar '07

Author: psmith Date: Sat Mar 17 13:30:59 2007 New Revision: 105 Modified: branches/home/psmith/restructure/src/io/nio-server.lisp Log: Fix leaking sockets Modified: branches/home/psmith/restructure/src/io/nio-server.lisp ============================================================================== --- branches/home/psmith/restructure/src/io/nio-server.lisp (original) +++ branches/home/psmith/restructure/src/io/nio-server.lisp Sat Mar 17 13:30:59 2007 @@ -190,7 +190,9 @@ (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))))) + (progn + (format t "Connect failed!!~A ~%" (get-errno)) + (close-fd sock))))) (defun add-connection(node) (nio-utils:add +connected-sockets-queue+ node)) \ No newline at end of file

1 0

[nio-cvs] r104 - branches/home/psmith/restructure/src/io
by psmith＠common-lisp.net 02 Mar '07

02 Mar '07

Author: psmith Date: Thu Mar 1 19:50:07 2007 New Revision: 104 Modified: branches/home/psmith/restructure/src/io/async-socket.lisp Log: Improved error-handling on %socket Modified: branches/home/psmith/restructure/src/io/async-socket.lisp ============================================================================== --- branches/home/psmith/restructure/src/io/async-socket.lisp (original) +++ branches/home/psmith/restructure/src/io/async-socket.lisp Thu Mar 1 19:50:07 2007 @@ -96,6 +96,11 @@ (socklent :int)) +(define-condition fd-error (error) + ((error-number :initarg :error))) + + + ;;TODO put backlog on config (defun start-listen (socket-fd &optional (backlog 1000)) (%listen socket-fd backlog)) @@ -104,7 +109,12 @@ ;;;; IPv4 (defun make-inet-socket (&optional (type :tcp)) - (%socket +af-inet+ (ecase type (:tcp +sock-stream+) (:udp +sock-dgram+)) 0)) + (let ((fd (%socket +af-inet+ (ecase type (:tcp +sock-stream+) (:udp +sock-dgram+)) 0))) + (when (eql fd -1) + (perror) +#+nio-debug (format-log t "async-socket::make-inet-socket - %socket failed (errno ~A)~%" ) + (error (make-instance 'fd-error :error (get-errno)))) + fd)) (defun init-inet-socket(sa port addr) @@ -133,7 +143,7 @@ nil))) (defun connect-inet-socket (socket-fd node) - (format-log t "async-socket:connect-inet-socket ccalled with ~A, and ~A~%" socket-fd node) + (format-log t "async-socket:connect-inet-socket called with ~A, and ~A~%" socket-fd node) (with-foreign-object (sa 'sockaddr-in) (init-inet-socket sa (remote-port node) (remote-host node)) (let ((res (%connect socket-fd sa +sockaddr-in-len+))) @@ -221,3 +231,13 @@ (foreign-free len) (if (>= res 0) async-fd nil) ))))))) + + + +(defun test-socket-connect(close) + (format t "Got fd's :") + (loop for i from 1 to 1025 do + (let ((fd (make-inet-socket))) + (format t "~A " fd) + (when (and close fd) + (close-fd fd))))) \ No newline at end of file

1 0

[nio-cvs] r103 - branches/home/psmith/restructure/src/utils
by psmith＠common-lisp.net 02 Mar '07

02 Mar '07

Author: psmith Date: Thu Mar 1 19:41:30 2007 New Revision: 103 Modified: branches/home/psmith/restructure/src/utils/concurrent-queue.lisp Log: Improved debug output from queue Modified: branches/home/psmith/restructure/src/utils/concurrent-queue.lisp ============================================================================== --- branches/home/psmith/restructure/src/utils/concurrent-queue.lisp (original) +++ branches/home/psmith/restructure/src/utils/concurrent-queue.lisp Thu Mar 1 19:41:30 2007 @@ -65,7 +65,7 @@ ;Append the element to the tail of this queue (defmethod add ((queue concurrent-queue) elt) -#+nio-debug (format-log t "concurent-queue:add - (~A) adding ~A~%" sb-thread:*current-thread* elt) +#+nio-debug (format-log t "concurent-queue:add - (~A) adding ~A to ~A~%" sb-thread:*current-thread* elt queue) (sb-thread:with-mutex ((buffer-lock queue)) (setf (buffer queue) (append (buffer queue) (list elt)) ) (sb-thread:condition-notify (buffer-queue queue))))

1 0

[nio-cvs] r102 - branches/home/psmith/restructure/src/io
by psmith＠common-lisp.net 28 Feb '07

28 Feb '07

Author: psmith Date: Wed Feb 28 18:24:31 2007 New Revision: 102 Modified: branches/home/psmith/restructure/src/io/nio-server.lisp Log: Set outgoing connections to be non-blocking Modified: branches/home/psmith/restructure/src/io/nio-server.lisp ============================================================================== --- branches/home/psmith/restructure/src/io/nio-server.lisp (original) +++ branches/home/psmith/restructure/src/io/nio-server.lisp Wed Feb 28 18:24:31 2007 @@ -166,6 +166,7 @@ (update-last-connect-attempt a-node) (when new-fd #+nio-debug (format-log t "nio-server:start-server - adding connection to nio thread ~A~%" new-fd) + (set-fd-nonblocking (async-fd-read-fd new-fd)) (setf (gethash (async-fd-read-fd new-fd) client-hash) new-fd) (setf (active-conn a-node) new-fd) (add-async-fd event-queue new-fd :read-write))))

1 0

[nio-cvs] r101 - branches/home/psmith/restructure/src/protocol/yarpc
by psmith＠common-lisp.net 28 Feb '07

28 Feb '07

Author: psmith Date: Tue Feb 27 22:42:29 2007 New Revision: 101 Modified: branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-client-state-machine.lisp Log: Allow simulated remote calls for testing Modified: branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp (original) +++ branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp Tue Feb 27 22:42:29 2007 @@ -37,5 +37,5 @@ test-rpc test-rpc-list test-rpc-string execute-call defremote ;;yarpc-client-state-machine - yarpc-client-state-machine remote-execute + yarpc-client-state-machine remote-execute simulate-connection )) Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-client-state-machine.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/yarpc/yarpc-client-state-machine.lisp (original) +++ branches/home/psmith/restructure/src/protocol/yarpc/yarpc-client-state-machine.lisp Tue Feb 27 22:42:29 2007 @@ -91,7 +91,19 @@ (let ((remote-job (gethash request-id (request-map sm)))) (funcall (callback remote-job) result)))) +(defparameter *simulate-calls* nil) + ;Execute the call-string on the remote node and call callback with the result (defmethod remote-execute ((sm yarpc-client-state-machine) call-string callback) #+nio-debug (format-log t "yarpc-client-state-machine:remote-execute called :sm ~A :call-string ~A :callback ~A~%" sm call-string callback) - (nio-utils:add (job-queue sm) (list (remote-job callback) call-string))) + (if *simulate-calls* + (funcall callback (execute-call call-string)) + (nio-utils:add (job-queue sm) (list (remote-job callback) call-string)))) + + +(defun simulate-connection() + (setf *simulate-calls* t) + (let* ((node (nio:node "127.0.0.1" 9999))) + (setf (nio:active-conn node) (nio::create-state-machine 'yarpc-client-state-machine 1 1 6)) + (push node nio::*nodes-list*))) +

1 0

[nio-cvs] r100 - in branches/home/psmith/restructure/src: buffer io protocol/yarpc statemachine
by psmith＠common-lisp.net 27 Feb '07

27 Feb '07

Author: psmith Date: Mon Feb 26 22:00:16 2007 New Revision: 100 Modified: branches/home/psmith/restructure/src/buffer/buffer.lisp branches/home/psmith/restructure/src/buffer/nio-buffer-package.lisp branches/home/psmith/restructure/src/io/async-fd.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp branches/home/psmith/restructure/src/statemachine/state-machine.lisp Log: Fixed large packet problems: calculated header size correctly; use buffer-pointer to take into account buffer-position on write and moved external format to UTF-8 Modified: branches/home/psmith/restructure/src/buffer/buffer.lisp ============================================================================== --- branches/home/psmith/restructure/src/buffer/buffer.lisp (original) +++ branches/home/psmith/restructure/src/buffer/buffer.lisp Mon Feb 26 22:00:16 2007 @@ -197,7 +197,7 @@ ; Read bytes from bytebuffer abd return a string using the supplied decoding ;TODO move octets-to-string into nio-compat -(defmethod bytebuffer-read-string((bb byte-buffer) &optional (num-bytes-to-read (remaining bb)) (external-format :ascii)) +(defmethod bytebuffer-read-string((bb byte-buffer) &optional (num-bytes-to-read (remaining bb)) (external-format :utf-8)) (sb-ext:octets-to-string (bytebuffer-read-vector bb num-bytes-to-read) :external-format external-format)) ; Read a byte from bytebuffer and return it incrementing the byte-buffers position @@ -246,7 +246,7 @@ ;; Writes data from string str to bytebuffer using specified encoding ;TODO move string-to-octets into nio-compat -(defmethod bytebuffer-write-string((bb byte-buffer) str &optional (external-format :ascii)) +(defmethod bytebuffer-write-string((bb byte-buffer) str &optional (external-format :utf-8)) :documentation "Returns number of bytes written to bytebuffer" (bytebuffer-write-vector bb (sb-ext:string-to-octets str :external-format external-format))) Modified: branches/home/psmith/restructure/src/buffer/nio-buffer-package.lisp ============================================================================== --- branches/home/psmith/restructure/src/buffer/nio-buffer-package.lisp (original) +++ branches/home/psmith/restructure/src/buffer/nio-buffer-package.lisp Mon Feb 26 22:00:16 2007 @@ -31,6 +31,6 @@ bytebuffer-write-vector bytebuffer-write-string bytebuffer-read-vector bytebuffer-read-string bytebuffer-read-8 bytebuffer-read-32 bytebuffer-write-8 bytebuffer-write-32 bytebuffer-insert-8 bytebuffer-insert-32 - flip unflip clear buffer-position copy-buffer buffer-capacity compact mark reset + flip unflip clear buffer-position buffer-limit copy-buffer buffer-capacity compact mark reset buffer-too-small-error recommended-size buffer-pointer )) Modified: branches/home/psmith/restructure/src/io/async-fd.lisp ============================================================================== --- branches/home/psmith/restructure/src/io/async-fd.lisp (original) +++ branches/home/psmith/restructure/src/io/async-fd.lisp Mon Feb 26 22:00:16 2007 @@ -106,6 +106,7 @@ (t ;;Update buffer position (inc-position foreign-read-buffer new-bytes) +#+nio-debug (format t "read-more : Updated buffer ~A~%" foreign-read-buffer) (when (> (remaining foreign-read-buffer) 0) (setf (read-ready state-machine) nil))))))) @@ -138,7 +139,7 @@ (do ((total-written 0)) ((or (eql now-written -1) (eql (remaining foreign-write-buffer) 0)) total-written) (progn - (setf now-written (%write write-fd (buffer-buf foreign-write-buffer) (remaining foreign-write-buffer))) + (setf now-written (%write write-fd (buffer-pointer foreign-write-buffer) (remaining foreign-write-buffer))) (when (not (eql now-written -1)) (inc-position foreign-write-buffer now-written) (incf total-written now-written))) @@ -166,7 +167,7 @@ (defmacro realloc-buffer(async-fd accessor size) `(let ((buffer (,accessor ,async-fd))) - (if (>= (buffer-capacity buffer) size) + (if (>= (buffer-capacity buffer) ,size) t (let ((new-buffer (byte-buffer ,size))) (copy-buffer buffer new-buffer) @@ -181,7 +182,6 @@ (ecase mode (:read (realloc-buffer async-fd foreign-read-buffer size)) (:write (realloc-buffer async-fd foreign-write-buffer size))))) - (defun force-close-async-fd (async-fd) @@ -208,3 +208,12 @@ (defun async-fd-write-fd (async-fd) (slot-value async-fd 'write-fd)) + +(defun test-realloc() + (let* ((sm (create-state-machine 'async-fd 1 1 6)) + (pos-b4-resize (bytebuffer-write-string (foreign-read-buffer sm) "this string is OK"))) + (recommend-buffer-size sm :read 4096) + (assert (eql 4096 (buffer-capacity (foreign-read-buffer sm)))) + (assert (eql 4096 (nio-buffer:buffer-limit (foreign-read-buffer sm)))) + (assert (eql pos-b4-resize (nio-buffer:buffer-position (foreign-read-buffer sm)))))) + Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp (original) +++ branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp Mon Feb 26 22:00:16 2007 @@ -45,6 +45,8 @@ (defconstant +yarpc-packet-header-size+ (+ +PACKET-ID-SIZE+ +PACKET-LENGTH-SIZE+)) +(defconstant +yarpc-rpc-packet-header-size+ (+ +yarpc-packet-header-size+ +PACKET-REQUEST-ID-SIZE+)) + (defmethod get-packet ((pf yarpc-packet-factory) buf) (flip buf) (if (>= (remaining buf) +yarpc-packet-header-size+) ;; First byte denotes packet ID ;;bytes 2,3,4,5 denote packet size ;; 6,7,8,9 request-id @@ -92,7 +94,7 @@ (nio-buffer:bytebuffer-write-8 buf +CALL-METHOD-PACKET-ID+) (nio-buffer:bytebuffer-write-32 buf 0) ; come back and write length later (nio-buffer:bytebuffer-write-32 buf (request-id packet)) - (nio-buffer:bytebuffer-write-string buf (call-string packet)) + (nio-buffer:bytebuffer-write-string buf (call-string packet) :utf-8) (nio-buffer:bytebuffer-insert-32 buf (buffer-position buf) 1) #+nio-debug (format-log t "yarpc-packet-factory:write-bytes(call-method-packet) - written ~%~A ~%" buf) ) @@ -102,8 +104,8 @@ (defmethod get-packet-size ((packet call-method-packet)) - (+ +yarpc-packet-header-size+ - (length (sb-ext:string-to-octets (write-to-string (call-string packet)))))) + (+ +yarpc-rpc-packet-header-size+ + (length (sb-ext:string-to-octets (call-string packet) :external-format :utf-8)))) (defclass method-response-packet (yarpc-packet) ((response :initarg :response @@ -131,8 +133,9 @@ ) (buffer-too-small-error (err) (nio-buffer:reset buf) +#+nio-debug (format-log t "yarpc-packet-factory:write-bytes - buffer too small caught, reset to ~A~%" buf) (error err)))) (defmethod get-packet-size ((packet method-response-packet)) - (+ +yarpc-packet-header-size+ + (+ +yarpc-rpc-packet-header-size+ (length (sb-ext:string-to-octets (funcall +serialise-packet-fn+ (response packet)) :external-format :utf-8)))) Modified: branches/home/psmith/restructure/src/statemachine/state-machine.lisp ============================================================================== --- branches/home/psmith/restructure/src/statemachine/state-machine.lisp (original) +++ branches/home/psmith/restructure/src/statemachine/state-machine.lisp Mon Feb 26 22:00:16 2007 @@ -79,11 +79,13 @@ (handler-case (write-bytes outgoing-packet foreign-write-buffer) (buffer-too-small-error (write-error1) - (if (recommend-buffer-size sm :write (get-packet-size outgoing-packet)) + (let ((new-size (get-packet-size outgoing-packet))) + (format-log t "state-machine::process-write - write-error1 trying resize to ~A" new-size) + (if (recommend-buffer-size sm :write new-size) (handler-case (write-bytes outgoing-packet foreign-write-buffer) - (buffer-too-small-error (write-error1) (format t "Failed to write packet after resize (something already in write buffer?, dropping packet ~A~% out buffer:~%~A~%" outgoing-packet foreign-write-buffer))) - (format t "Failed to resize io buffer, dropping packet: ~A~%" outgoing-packet)))))))) + (buffer-too-small-error (write-error2) (format t "Failed to write packet after resize (something already in write buffer?, dropping packet ~A~% out buffer:~%~A~%" outgoing-packet foreign-write-buffer))) + (format t "Failed to resize io buffer, dropping packet: ~A~%" outgoing-packet)))))))))

1 0

[nio-cvs] r99 - branches/home/psmith/restructure/src/protocol/yarpc
by psmith＠common-lisp.net 26 Feb '07

26 Feb '07

Author: psmith Date: Mon Feb 26 18:13:58 2007 New Revision: 99 Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp Log: Changed method-response-packet to write utf-8 Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp (original) +++ branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp Mon Feb 26 18:13:58 2007 @@ -125,7 +125,7 @@ (nio-buffer:bytebuffer-write-8 buf +METHOD-RESPONSE-PACKET-ID+) (nio-buffer:bytebuffer-write-32 buf 0) ; come back and write length later (nio-buffer:bytebuffer-write-32 buf (request-id packet)) - (nio-buffer:bytebuffer-write-string buf (funcall +serialise-packet-fn+ (response packet))) + (nio-buffer:bytebuffer-write-string buf (funcall +serialise-packet-fn+ (response packet)) :utf-8) (nio-buffer:bytebuffer-insert-32 buf (buffer-position buf) 1) #+nio-debug (format-log t "yarpc-packet-factory:write-bytes - written ~A~%" buf) ) @@ -135,4 +135,4 @@ (defmethod get-packet-size ((packet method-response-packet)) (+ +yarpc-packet-header-size+ - (length (funcall +serialise-packet-fn+ (response packet))))) + (length (sb-ext:string-to-octets (funcall +serialise-packet-fn+ (response packet)) :external-format :utf-8))))

1 0

[nio-cvs] r98 - branches/home/psmith/restructure/src/protocol/yarpc
by psmith＠common-lisp.net 26 Feb '07

26 Feb '07

Author: psmith Date: Mon Feb 26 17:57:14 2007 New Revision: 98 Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp Log: Use +serialise-packaet-fn+ to calculate size of packet when resizing Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp (original) +++ branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp Mon Feb 26 17:57:14 2007 @@ -135,4 +135,4 @@ (defmethod get-packet-size ((packet method-response-packet)) (+ +yarpc-packet-header-size+ - (length (sb-ext:string-to-octets (write-to-string (response packet)))))) + (length (funcall +serialise-packet-fn+ (response packet)))))

1 0

[nio-cvs] r97 - branches/home/psmith/restructure/src/io
by psmith＠common-lisp.net 25 Feb '07

25 Feb '07

Author: psmith Date: Sun Feb 25 12:59:02 2007 New Revision: 97 Modified: branches/home/psmith/restructure/src/io/nio-package.lisp branches/home/psmith/restructure/src/io/nodes.lisp Log: Added nio util for parsing sockets into nodes Modified: branches/home/psmith/restructure/src/io/nio-package.lisp ============================================================================== --- branches/home/psmith/restructure/src/io/nio-package.lisp (original) +++ branches/home/psmith/restructure/src/io/nio-package.lisp Sun Feb 25 12:59:02 2007 @@ -44,5 +44,5 @@ check-ip load-ips ;;nodes - node with-connected-nodes active-conn + node with-connected-nodes active-conn node-from-socket-repn )) Modified: branches/home/psmith/restructure/src/io/nodes.lisp ============================================================================== --- branches/home/psmith/restructure/src/io/nodes.lisp (original) +++ branches/home/psmith/restructure/src/io/nodes.lisp Sun Feb 25 12:59:02 2007 @@ -55,7 +55,7 @@ (defun node-from-socket-repn(socket) (let ((colon-idx (search ":" socket))) (if colon-idx - (node (subseq socket 0 colon-idx) (subseq socket (+ colon-idx 1))) + (node (subseq socket 0 colon-idx) (parse-integer (subseq socket (+ colon-idx 1)))) (error 'parse-error))))

1 0

[nio-cvs] r96 - branches/home/psmith/restructure/src/compat
by psmith＠common-lisp.net 23 Feb '07

23 Feb '07

Author: psmith Date: Fri Feb 23 11:58:29 2007 New Revision: 96 Added: branches/home/psmith/restructure/src/compat/threading.lisp Log: Added missing file Added: branches/home/psmith/restructure/src/compat/threading.lisp ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/src/compat/threading.lisp Fri Feb 23 11:58:29 2007 @@ -0,0 +1,40 @@ +#| +Copyright (c) 2007 +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +|# + +(in-package :nio-compat) + + +(defun make-mutex (name) + (sb-thread:make-mutex :name name)) + +(defmacro with-mutex ((mutex) &body body) + `(sb-thread:with-mutex (,mutex) + ,@body)) + + + +

1 0