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

[nio-cvs] r51 - in branches/home/psmith/restructure/src: buffer io
by psmith＠common-lisp.net 23 Jan '07

23 Jan '07

Author: psmith Date: Tue Jan 23 00:52:09 2007 New Revision: 51 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 Log: Added copy-buffer and recommend-buffer-size 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 Tue Jan 23 00:52:09 2007 @@ -177,6 +177,18 @@ (bytebuffer-write-vector bb (sb-ext:string-to-octets str :external-format external-format))) + +(defmethod copy-buffer ((old byte-buffer) (new byte-buffer)) + (assert (<= (buffer-capacity old) (buffer-capacity new))) + (%memcpy (buffer-buf new) (buffer-buf old) (buffer-capacity old))) + +;void *memcpy(void *dest, const void *src, size_t n); +(cffi:defcfun ("memcpy" %memcpy) :pointer + (dest :pointer) + (src :pointer) + (len :int)) + +;void *memset(void *s, int c, size_t n); (cffi:defcfun ("memset" %memset) :pointer (buffer :pointer) (byte :int) @@ -203,6 +215,10 @@ (format t "Mybuf (after get-string): ~A~%" mybuf) + (let ((test-copy (byte-buffer 1024))) + (copy-buffer mybuf test-copy) + (format t "new copy: ~A~%" test-copy)) + (format t "Mybuf (after clear): ~A~%" (clear mybuf)) (free-buffer mybuf) 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 Tue Jan 23 00:52:09 2007 @@ -27,5 +27,5 @@ (defpackage :nio-buffer (:use :cl) (:export - byte-buffer free-buffer remaining inc-position get-string buffer-buf bytebuffer-write-vector bytebuffer-write-string bytebuffer-read-vector bytebuffer-read-string flip clear buffer-position + byte-buffer free-buffer remaining inc-position get-string buffer-buf bytebuffer-write-vector bytebuffer-write-string bytebuffer-read-vector bytebuffer-read-string flip clear buffer-position copy-buffer )) 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 Tue Jan 23 00:52:09 2007 @@ -28,49 +28,24 @@ (declaim (optimize (debug 3) (speed 3) (space 0))) -;;; FFI - - - -;;; CLASSES - - - - - - (defclass async-fd () ((write-fd :initarg :write-fd :accessor write-fd) -;; (write-queue :initform nil) - (read-fd :initarg :read-fd :accessor read-fd) - (foreign-read-buffer :initform (byte-buffer 1024) :accessor foreign-read-buffer) (foreign-write-buffer :initform (byte-buffer 1024) :accessor foreign-write-buffer) - -;; (lisp-read-buffer :initform (make-uint8-seq 1024)) -;; (lisp-read-buffer-write-ptr :initform 0) - (read-ready :initform nil :accessor read-ready :documentation "Have we been notified as read ready and not received EAGAIN from %read?") (write-ready :initform nil :accessor write-ready :documentation "Have we been notified as write ready and not received EAGAIN from %write?") - (close-pending :initform nil) - -;; (accept-filter :initform nil) -;; (read-callback :initform nil) - (socket :initarg :socket - :accessor socket) - - )) + :accessor socket))) (defmethod print-object ((async-fd async-fd) stream) @@ -93,7 +68,6 @@ sm)) ;;override this in concrete SM for close -;(defmethod process-close((async-fd async-fd)reason)()) (defmethod process-close((async-fd async-fd)reason)()) @@ -103,30 +77,23 @@ (with-slots (close-pending) async-fd (setf close-pending t))) -;;; FUNCTIONS - (define-condition read-error (error) ()) ;; "Read more data from STATE-MACHINE." (defun read-more (state-machine) (with-slots (foreign-read-buffer read-fd) state-machine #+nio-debug (format t "read-more called with ~A~%" state-machine) - #+nio-debug (format t "read-more - calling read() into ~A~%" foreign-read-buffer) (let ((new-bytes (%read read-fd (buffer-buf foreign-read-buffer) (remaining foreign-read-buffer)))) #+nio-debug (format t "read-more : Read ~A bytes into ~A~%" new-bytes foreign-read-buffer) (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))) - ((= new-bytes 0) nil);;(throw 'end-of-file nil) - (t ;;Update buffer position (inc-position foreign-read-buffer new-bytes) @@ -146,7 +113,6 @@ (define-condition read-error (error) ()) - (defun write-more (async-fd) "Write data from ASYNC-FD's write bytebuffer" (format-log t "async-fd:write-more - called with ~A~%" async-fd) @@ -154,23 +120,17 @@ #+nio-debug (format t "async-fd:write-more - foreign-write-buffer b4 flip ~A~%" foreign-write-buffer) (nio-buffer:flip foreign-write-buffer) #+nio-debug (format t "async-fd:write-more -foreign-write-buffer after flip ~A~%" foreign-write-buffer) - (let ((now-written 0)) (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))) - - (when (not (eql now-written -1)) (inc-position foreign-write-buffer now-written) (incf total-written now-written))) -#+nio-debug (format t "async-fd:write-more - after write :foreign-write-buffer ~A :now-written ~A :total-written ~A ~%" foreign-write-buffer now-written total-written) - ) - - +#+nio-debug (format t "async-fd:write-more - after write :foreign-write-buffer ~A :now-written ~A :total-written ~A ~%" foreign-write-buffer now-written total-written)) (if (eql now-written -1) - ;;Deal with failure + ;;Deal with failure (let ((err (get-errno))) (format t "write-more - write returned -1 :errno ~A~%" err) (unless (eql err 11) ;; eagain - failed to write whole buffer need to wait for next notify @@ -181,15 +141,33 @@ (if (eql (remaining foreign-write-buffer) 0) (clear foreign-write-buffer) (error 'not-implemented-yet)))) - + #+nio-debug (format t "write buffer after write :~A~%" foreign-write-buffer) (when (eql (remaining foreign-write-buffer) 0) (when close-pending (close-async-fd async-fd))))) - +(defconstant +MAX-BUFFER-SIZE-BYTES+ (* 1024 1024)) +(defmacro check-buffer-size (buffer size) + `(>= (length ,buffer) ,size)) +(defun realloc-buffer (async-fd buffer size) + (if (check-buffer-size 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)))) + + +;(recom +(defmethod recommend-buffer-size((async-fd async-fd) mode size) + (if (> size +MAX-BUFFER-SIZE-BYTES+) nil + (ecase mode + (:read (realloc-buffer (foreign-read-buffer async-fd) size)) + (:write (realloc-buffer (foreign-write-buffer async-fd) size))))) + (defun force-close-async-fd (async-fd) @@ -200,10 +178,7 @@ (defun add-async-fd (event-queue async-fd mode) (ecase mode -;; (:read (add-fd event-queue (slot-value async-fd 'read-fd) :read :trigger :level)) -;; (:write (add-fd event-queue (slot-value async-fd 'write-fd) :write :trigger :level)) - (:read-write (add-fd event-queue (slot-value async-fd 'write-fd) :read-write)) -)) + (:read-write (add-fd event-queue (slot-value async-fd 'write-fd) :read-write)))) (defun remove-async-fd (event-queue async-fd mode)

1 0

[nio-cvs] r50 - in branches/home/psmith/restructure/src: io protocol/yarpc
by psmith＠common-lisp.net 22 Jan '07

22 Jan '07

Author: psmith Date: Mon Jan 22 00:54:43 2007 New Revision: 50 Modified: branches/home/psmith/restructure/src/io/async-fd.lisp branches/home/psmith/restructure/src/io/async-socket.lisp branches/home/psmith/restructure/src/io/nio-server.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-client-state-machine.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp Log: logging tidyup 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 Jan 22 00:54:43 2007 @@ -87,7 +87,7 @@ ;;SM factory (defun create-state-machine(sm-type read-fd write-fd socket) (let ((sm (make-instance sm-type :read-fd read-fd :write-fd write-fd :socket socket))) - (format t "create-state-machine - Created ~S~%" sm) + (format-log t "async-fd:create-state-machine - Created ~S~%" sm) (nio-buffer:clear (foreign-read-buffer sm)) (nio-buffer:clear (foreign-write-buffer sm)) sm)) 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 Mon Jan 22 00:54:43 2007 @@ -137,7 +137,7 @@ (init-inet-socket sa port addr) (let ((res (%connect socket-fd sa +sockaddr-in-len+))) - (format t "connect ~A ~A~%" res (get-errno)) + (format-log t "async-socket:connect-inet-socket library connect call returned ~A, and errno ~A~%" res (get-errno)) (if (= res -1) nil t)))) 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 Mon Jan 22 00:54:43 2007 @@ -40,8 +40,8 @@ ;loop over hashtable (defun process-async-fds (client-hash) (maphash #'(lambda (k async-fd) - (format t "Dealing with ~a => ~a~%" k async-fd) - + (format-log t "Dealing with ~a => ~a~%" k async-fd) + ;process reads (when (read-ready async-fd) (read-more async-fd)) (when (> (buffer-position (foreign-read-buffer async-fd)) 0) @@ -115,7 +115,7 @@ ;; no accept, close (t - (format t "start-server - accept-connection closed~%") + (format-log t "start-server - accept-connection closed~%") (close-async-fd async-fd))))) @@ -136,12 +136,11 @@ (when (read-event-p event) (setf (read-ready async-fd) t)) (when (write-event-p event) (setf (write-ready async-fd) t))))))))) - (format t "Process client adds~%") ;add outgoing sockets to event queue - (format t "start-server::sockets enqueued ~A~%" +connected-sockets+) + (format-log t "nio-server:start-server - Processing client add ~A~%" +connected-sockets+) (loop for new-fd in +connected-sockets+ do - (format t "Dealing with ~A~%" new-fd) + (format-log t "nio-server:start-server - Dealing with ~A~%" new-fd) (setf (gethash (async-fd-read-fd new-fd) client-hash) new-fd) (add-async-fd event-queue new-fd :read-write)) @@ -168,7 +167,7 @@ (if (connect-inet-socket sock host port) (let ((sm (create-state-machine connection-type sock sock sock))) (push sm +connected-sockets+) - (format t "add-connection::sockets enqueued ~A~%" +connected-sockets+) + (format-log t "nio-server:add-connection - Socket enqueued: ~A~%" +connected-sockets+) (return-from add-connection sm)) (format t "Connect failed!!~A ~%" (get-errno))))) \ No newline at end of file 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 Mon Jan 22 00:54:43 2007 @@ -56,16 +56,16 @@ (defconstant STATE-SENT-REQUEST 1) (defmethod process-outgoing-packet((sm yarpc-client-state-machine)) - (format t "process-outgoing-packet called, polling the job-queue ~%") + (format-log t "yarpc-client-state-machine:process-outgoing-packet called, polling the job-queue ~%") (let ((packet (nio-compat:take (job-queue sm) :blocking-call nil))) (when packet - (format t "process-outgoing-packet got job ~A ~%" packet) + (format-log t "yarpc-client-state-machine:process-outgoing-packet got job ~A ~%" packet) (setf (state sm) STATE-SENT-REQUEST)) packet)) (defmethod process-incoming-packet ((sm yarpc-client-state-machine) (response method-response-packet)) (assert (eql (state sm) STATE-SENT-REQUEST)) - (format t "yarpc-client-state-machine:process-incoming-packet called :sm ~A :packet ~A~%" sm response) + (format-log t "yarpc-client-state-machine:process-incoming-packet called :sm ~A :packet ~A~%" sm response) (let* ((*package* (find-package :nio-yarpc)) (result (read-from-string (response response)))) (setf (state sm) STATE-INITIALISED) 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 Jan 22 00:54:43 2007 @@ -42,8 +42,8 @@ (flip buf) (let ((ret (if (> (remaining buf) 0) ;; First byte denotes packet ID (ecase (elt (bytebuffer-read-vector buf 1) 0) - (0 (progn (format t "got CALL-METHOD-PACKET-ID~%") (call-method-packet (bytebuffer-read-string buf (remaining buf))))) - (1 (progn (format t "got METHOD-RESPONSE-PACKET-ID~%") (method-response-packet (bytebuffer-read-string buf (remaining buf))))))))) + (0 (progn (format-log t "yarpc-packet-factory:get-packet - got CALL-METHOD-PACKET-ID~%") (call-method-packet (bytebuffer-read-string buf (remaining buf))))) + (1 (progn (format-log t "yarpc-packet-factory:get-packet - got METHOD-RESPONSE-PACKET-ID~%") (method-response-packet (bytebuffer-read-string buf (remaining buf))))))))) (if (> (remaining buf) 0) (error 'not-implemented-yet) (clear buf)) @@ -59,10 +59,10 @@ (format stream "#<CALL-METHOD-PACKET ~A >" (call-string packet))) (defmethod write-bytes((packet call-method-packet) buf) -#+nio-debug (format t "yarpc-packet-factory:write-bytes - writing ~A to ~A~%" packet buf) +#+nio-debug (format-log t "yarpc-packet-factory:write-bytes - writing ~A to ~A~%" packet buf) (nio-buffer:bytebuffer-write-vector buf #(#x0)) (nio-buffer:bytebuffer-write-string buf (call-string packet)) -#+nio-debug (format t "yarpc-packet-factory:write-bytes - written ~A~%" buf) +#+nio-debug (format-log t "yarpc-packet-factory:write-bytes - written ~A~%" buf) ) @@ -77,8 +77,8 @@ (format stream "#<METHID-RESPONSE-PACKET ~A >" (response packet))) (defmethod write-bytes((packet method-response-packet) buf) -#+nio-debug (format t "yarpc-packet-factory:write-bytes - writing ~A to ~A~%" packet buf) +#+nio-debug (format-log t "yarpc-packet-factory:write-bytes - writing ~A to ~A~%" packet buf) (nio-buffer:bytebuffer-write-vector buf #(#x1)) (nio-buffer:bytebuffer-write-string buf (write-to-string (response packet))) -#+nio-debug (format t "yarpc-packet-factory:write-bytes - written ~A~%" buf) +#+nio-debug (format-log t "yarpc-packet-factory:write-bytes - written ~A~%" buf) ) Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp (original) +++ branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp Mon Jan 22 00:54:43 2007 @@ -59,23 +59,23 @@ (defun run-job(&key (wait-on-job-pdw t)) - (format-log t "Server toplevel waiting for job~%") + (format-log t "yarpc-state-machine:run-job - Server toplevel waiting for job~%") (destructuring-bind (job result-queue) (nio-compat:take nio-yarpc:job-queue :blocking-call wait-on-job-pdw) - (format-log t "Server received job ~A~%" job) + (format-log t "yarpc-state-machine:run-job - Server received job ~A~%" job) (nio-compat:add result-queue (nio-yarpc:execute-call job)))) (defmethod process-outgoing-packet((sm yarpc-state-machine)) - (format-log t "yarpc-state-machine: process-outgoing-packet called, polling the results-queue ~%" ) + (format-log t "yarpc-state-machine:process-outgoing-packet - called, polling the results-queue ~%" ) (let ((result (nio-compat:take (result-queue sm) :blocking-call nil))) - (format t "yarpc-state-machine: process-outgoing-packet got result ~A ~%" result) + (format-log t "yarpc-state-machine:process-outgoing-packet - got result ~A ~%" result) (when result (method-response-packet result)))) ;Process a call method packet by placing it in the job-queue (defmethod process-incoming-packet ((sm yarpc-state-machine) (call call-method-packet)) (assert (eql (state sm) STATE-INITIALISED)) - (format-log t "yarpc-state-machine:process-incoming-packet called :sm ~A :packet ~A~%" sm call) + (format-log t "yarpc-state-machine:process-incoming-packet - called :sm ~A :packet ~A~%" sm call) (nio-compat:add job-queue (list (call-string call) (result-queue sm))) (when +process-jobs-inline+ (run-job :wait-on-job-pdw nil))) @@ -104,7 +104,7 @@ (defun execute-call (call-string) (let* ((rpc-call-list (read-from-string call-string )) (fn (member (symbol-function (first rpc-call-list)) *remote-fns* ))) - (format t "fn - ~A authorised? : ~A~%" (symbol-function (first rpc-call-list)) fn) + (format-log t "yarpc-state-machine:execute-call - fn ~A authorised? : ~A~%" (symbol-function (first rpc-call-list)) fn) (if fn (apply (first rpc-call-list) (rest rpc-call-list)) (error 'authorization-error))))

1 0

[nio-cvs] r49 - in branches/home/psmith/restructure: . src/compat src/io src/protocol/yarpc src/statemachine src/utils
by psmith＠common-lisp.net 22 Jan '07

22 Jan '07

Author: psmith Date: Sun Jan 21 23:12:43 2007 New Revision: 49 Added: branches/home/psmith/restructure/src/utils/nio-utils-package.lisp - copied, changed from r48, branches/home/psmith/restructure/src/compat/nio-compat-package.lisp branches/home/psmith/restructure/src/utils/nio-utils.asd - copied, changed from r44, branches/home/psmith/restructure/src/compat/nio-compat.asd branches/home/psmith/restructure/src/utils/utils.lisp - copied, changed from r48, branches/home/psmith/restructure/src/compat/utils.lisp Removed: branches/home/psmith/restructure/src/compat/utils.lisp Modified: branches/home/psmith/restructure/run-yarpc-client.lisp branches/home/psmith/restructure/src/compat/nio-compat-package.lisp branches/home/psmith/restructure/src/compat/nio-compat.asd branches/home/psmith/restructure/src/io/nio-package.lisp branches/home/psmith/restructure/src/io/nio.asd branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp branches/home/psmith/restructure/src/statemachine/nio-sm-package.lisp branches/home/psmith/restructure/src/statemachine/nio-sm.asd Log: Moved utils to own package Modified: branches/home/psmith/restructure/run-yarpc-client.lisp ============================================================================== --- branches/home/psmith/restructure/run-yarpc-client.lisp (original) +++ branches/home/psmith/restructure/run-yarpc-client.lisp Sun Jan 21 23:12:43 2007 @@ -6,7 +6,7 @@ (sb-thread:make-thread #'(lambda()(nio:start-server 'identity 'identity nil :host "127.0.0.1" :port 9897)) :name "nio-server") (sleep 4) (let ((sm (nio:add-connection "127.0.0.1" 16323 'nio-yarpc:yarpc-client-state-machine))) - (format-log t "toplevel adding conn ~A~%" sm) + (nio-utils:format-log t "toplevel adding conn ~A~%" sm) (loop - (format-log t "Toplevel Submitting job~%" ) - (format-log t "Result of remote-execute ~A~%" (nio-yarpc:remote-execute sm "(nio-yarpc:test-rpc-list)")))) + (nio-utils:format-log t "Toplevel Submitting job~%" ) + (nio-utils:format-log t "Result of remote-execute ~A~%" (nio-yarpc:remote-execute sm "(nio-yarpc:test-rpc-list)")))) Modified: branches/home/psmith/restructure/src/compat/nio-compat-package.lisp ============================================================================== --- branches/home/psmith/restructure/src/compat/nio-compat-package.lisp (original) +++ branches/home/psmith/restructure/src/compat/nio-compat-package.lisp Sun Jan 21 23:12:43 2007 @@ -33,7 +33,4 @@ ;;concurrent-queue concurrent-queue add take - - ;;utils - format-log )) Modified: branches/home/psmith/restructure/src/compat/nio-compat.asd ============================================================================== --- branches/home/psmith/restructure/src/compat/nio-compat.asd (original) +++ branches/home/psmith/restructure/src/compat/nio-compat.asd Sun Jan 21 23:12:43 2007 @@ -7,7 +7,6 @@ :components ((:file "nio-compat-package") (:file "errno" :depends-on ("nio-compat-package")) (:file "concurrent-queue" :depends-on ("nio-compat-package")) - (:file "utils" :depends-on ("nio-compat-package")) ) :depends-on ()) 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 Jan 21 23:12:43 2007 @@ -24,7 +24,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |# -(defpackage :nio (:use :cl :cffi :event-notification :nio-buffer :nio-compat) +(defpackage :nio (:use :cl :cffi :nio-utils :event-notification :nio-buffer :nio-compat) (:export Modified: branches/home/psmith/restructure/src/io/nio.asd ============================================================================== --- branches/home/psmith/restructure/src/io/nio.asd (original) +++ branches/home/psmith/restructure/src/io/nio.asd Sun Jan 21 23:12:43 2007 @@ -12,5 +12,5 @@ (:file "nio-server" :depends-on ("async-socket")) ) - :depends-on (:cffi :event-notification :nio-buffer :nio-compat)) + :depends-on (:cffi :event-notification :nio-buffer :nio-compat :nio-utils)) 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 Sun Jan 21 23:12:43 2007 @@ -24,7 +24,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |# -(defpackage :nio-yarpc (:use :cl :nio :nio-sm :nio-buffer) +(defpackage :nio-yarpc (:use :cl :nio :nio-sm :nio-buffer :nio-utils) (:export Modified: branches/home/psmith/restructure/src/statemachine/nio-sm-package.lisp ============================================================================== --- branches/home/psmith/restructure/src/statemachine/nio-sm-package.lisp (original) +++ branches/home/psmith/restructure/src/statemachine/nio-sm-package.lisp Sun Jan 21 23:12:43 2007 @@ -24,7 +24,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |# -(defpackage :nio-sm (:use :cl :nio :nio-buffer) +(defpackage :nio-sm (:use :cl :nio :nio-buffer :nio-utils) (:export Modified: branches/home/psmith/restructure/src/statemachine/nio-sm.asd ============================================================================== --- branches/home/psmith/restructure/src/statemachine/nio-sm.asd (original) +++ branches/home/psmith/restructure/src/statemachine/nio-sm.asd Sun Jan 21 23:12:43 2007 @@ -8,4 +8,4 @@ (:file "state-machine" :depends-on ("nio-sm-package")) ) - :depends-on (:nio)) \ No newline at end of file + :depends-on (:nio :nio-utils)) \ No newline at end of file Copied: branches/home/psmith/restructure/src/utils/nio-utils-package.lisp (from r48, branches/home/psmith/restructure/src/compat/nio-compat-package.lisp) ============================================================================== --- branches/home/psmith/restructure/src/compat/nio-compat-package.lisp (original) +++ branches/home/psmith/restructure/src/utils/nio-utils-package.lisp Sun Jan 21 23:12:43 2007 @@ -1,5 +1,5 @@ #| -Copyright (c) 2006 Risto Laakso +Copyright (c) 2007 All rights reserved. Redistribution and use in source and binary forms, with or without @@ -24,16 +24,10 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |# -(defpackage :nio-compat (:use :cl) +(defpackage :nio-utils (:use :cl) (:export - ;; errno.lisp - get-errno +ERRNO_EAGAIN+ - - ;;concurrent-queue - concurrent-queue add take - ;;utils format-log )) Copied: branches/home/psmith/restructure/src/utils/nio-utils.asd (from r44, branches/home/psmith/restructure/src/compat/nio-compat.asd) ============================================================================== --- branches/home/psmith/restructure/src/compat/nio-compat.asd (original) +++ branches/home/psmith/restructure/src/utils/nio-utils.asd Sun Jan 21 23:12:43 2007 @@ -2,12 +2,10 @@ (in-package :asdf) -(defsystem :nio-compat +(defsystem :nio-utils - :components ((:file "nio-compat-package") - (:file "errno" :depends-on ("nio-compat-package")) - (:file "concurrent-queue" :depends-on ("nio-compat-package")) - (:file "utils" :depends-on ("nio-compat-package")) + :components ((:file "nio-utils-package") + (:file "utils" :depends-on ("nio-utils-package")) ) :depends-on ()) Copied: branches/home/psmith/restructure/src/utils/utils.lisp (from r48, branches/home/psmith/restructure/src/compat/utils.lisp) ============================================================================== --- branches/home/psmith/restructure/src/compat/utils.lisp (original) +++ branches/home/psmith/restructure/src/utils/utils.lisp Sun Jan 21 23:12:43 2007 @@ -25,7 +25,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |# -(in-package :nio-compat) +(in-package :nio-utils) (declaim (optimize (debug 3) (speed 3) (space 0)))

1 0

[nio-cvs] r48 - in branches/home/psmith/restructure: . src/compat src/io src/protocol/yarpc src/statemachine src/utils
by psmith＠common-lisp.net 22 Jan '07

22 Jan '07

Author: psmith Date: Sun Jan 21 22:43:03 2007 New Revision: 48 Added: branches/home/psmith/restructure/src/utils/ Modified: branches/home/psmith/restructure/run-yarpc-client.lisp branches/home/psmith/restructure/src/compat/nio-compat-package.lisp branches/home/psmith/restructure/src/compat/utils.lisp branches/home/psmith/restructure/src/io/async-fd.lisp branches/home/psmith/restructure/src/io/nio-server.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp branches/home/psmith/restructure/src/statemachine/state-machine.lisp Log: Tidied up logging Modified: branches/home/psmith/restructure/run-yarpc-client.lisp ============================================================================== --- branches/home/psmith/restructure/run-yarpc-client.lisp (original) +++ branches/home/psmith/restructure/run-yarpc-client.lisp Sun Jan 21 22:43:03 2007 @@ -6,7 +6,7 @@ (sb-thread:make-thread #'(lambda()(nio:start-server 'identity 'identity nil :host "127.0.0.1" :port 9897)) :name "nio-server") (sleep 4) (let ((sm (nio:add-connection "127.0.0.1" 16323 'nio-yarpc:yarpc-client-state-machine))) - (format t "~A toplevel adding conn ~A~%" (nio-compat:get-readable-time) sm) + (format-log t "toplevel adding conn ~A~%" sm) (loop - (format t "~A toplevel Submitting job~%" (nio-compat:get-readable-time) ) - (format t "~A Result of remote-execute ~A~%" (nio-compat:get-readable-time) (nio-yarpc:remote-execute sm "(nio-yarpc:test-rpc-list)")))) + (format-log t "Toplevel Submitting job~%" ) + (format-log t "Result of remote-execute ~A~%" (nio-yarpc:remote-execute sm "(nio-yarpc:test-rpc-list)")))) Modified: branches/home/psmith/restructure/src/compat/nio-compat-package.lisp ============================================================================== --- branches/home/psmith/restructure/src/compat/nio-compat-package.lisp (original) +++ branches/home/psmith/restructure/src/compat/nio-compat-package.lisp Sun Jan 21 22:43:03 2007 @@ -35,5 +35,5 @@ concurrent-queue add take ;;utils - get-readable-time + format-log )) Modified: branches/home/psmith/restructure/src/compat/utils.lisp ============================================================================== --- branches/home/psmith/restructure/src/compat/utils.lisp (original) +++ branches/home/psmith/restructure/src/compat/utils.lisp Sun Jan 21 22:43:03 2007 @@ -52,9 +52,13 @@ (let ((current-internal (get-internal-real-time))) (+ universal-base (/ (- current-internal internal-base) internal-time-units-per-second) ))) - (defun get-readable-high-res() + (defun get-readable-high-res-time() (let ((estimated-universal-float (get-universal-high-res))) (multiple-value-bind (estimated-universal estimated-universal-rem) (floor estimated-universal-float) (format nil "~A.~3,'0d"(get-readable-time estimated-universal) (* 1000 estimated-universal-rem))))) - ) \ No newline at end of file + ) + +;Format the message to destination but prepend a high res time to the message, useful for logging +(defmacro format-log (destination control-string &rest format-arguments) + `(format ,destination (concatenate 'string "~A - " ,control-string) (get-readable-high-res-time) ,@format-arguments)) 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 Sun Jan 21 22:43:03 2007 @@ -149,7 +149,7 @@ (defun write-more (async-fd) "Write data from ASYNC-FD's write bytebuffer" -#+nio-debug (format t "async-fd:write-more - called with ~A~%" async-fd) + (format-log t "async-fd:write-more - called with ~A~%" async-fd) (with-slots (write-fd foreign-write-buffer close-pending) async-fd #+nio-debug (format t "async-fd:write-more - foreign-write-buffer b4 flip ~A~%" foreign-write-buffer) (nio-buffer:flip foreign-write-buffer) 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 Sun Jan 21 22:43:03 2007 @@ -122,7 +122,7 @@ ;; socket i/o available (t (let ((async-fd (gethash fd client-hash))) -#+nio-debug (format t "IO event ~A on ~A~%" event async-fd) + (format-log t "IO event ~A on ~A~%" event async-fd) (unless (null async-fd) (catch 'error-exit (handler-bind ((read-error #'(lambda (x) Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp (original) +++ branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp Sun Jan 21 22:43:03 2007 @@ -59,14 +59,14 @@ (defun run-job(&key (wait-on-job-pdw t)) - (format t "~A Server toplevel waiting for job~%" (nio-compat:get-readable-time)) + (format-log t "Server toplevel waiting for job~%") (destructuring-bind (job result-queue) (nio-compat:take nio-yarpc:job-queue :blocking-call wait-on-job-pdw) - (format t "~A Server received job ~A~%" (nio-compat:get-readable-time) job) + (format-log t "Server received job ~A~%" job) (nio-compat:add result-queue (nio-yarpc:execute-call job)))) (defmethod process-outgoing-packet((sm yarpc-state-machine)) - (format t "yarpc-state-machine: process-outgoing-packet called, polling the results-queue ~%") + (format-log t "yarpc-state-machine: process-outgoing-packet called, polling the results-queue ~%" ) (let ((result (nio-compat:take (result-queue sm) :blocking-call nil))) (format t "yarpc-state-machine: process-outgoing-packet got result ~A ~%" result) (when result @@ -75,7 +75,7 @@ ;Process a call method packet by placing it in the job-queue (defmethod process-incoming-packet ((sm yarpc-state-machine) (call call-method-packet)) (assert (eql (state sm) STATE-INITIALISED)) - (format t "yarpc-state-machine:process-incoming-packet called :sm ~A :packet ~A~%" sm call) + (format-log t "yarpc-state-machine:process-incoming-packet called :sm ~A :packet ~A~%" sm call) (nio-compat:add job-queue (list (call-string call) (result-queue sm))) (when +process-jobs-inline+ (run-job :wait-on-job-pdw nil))) 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 Sun Jan 21 22:43:03 2007 @@ -57,7 +57,7 @@ (defmethod process-read((sm state-machine)) (with-slots (foreign-read-buffer) sm (let ((incoming-packet (get-packet (get-packet-factory sm) foreign-read-buffer))) - (format t "~A state-machine::process-read - incoming packet: ~A~%" (nio-compat:get-readable-time) incoming-packet) + (format-log t "state-machine::process-read - incoming packet: ~A~%" incoming-packet) (when incoming-packet (when (not (process-incoming-packet sm incoming-packet)) (close-sm sm)))))) @@ -67,7 +67,7 @@ (defmethod process-write((sm state-machine)) (with-slots (foreign-write-buffer) sm (let ((outgoing-packet (process-outgoing-packet sm))) - (format t "~A state-machine::process-write - outgoing packet: ~A~%" (nio-compat:get-readable-time) outgoing-packet) + (format-log t "state-machine::process-write - outgoing packet: ~A~%" outgoing-packet) (when outgoing-packet (write-bytes outgoing-packet foreign-write-buffer)))))

1 0

[nio-cvs] r47 - branches/home/psmith/restructure/src/compat
by psmith＠common-lisp.net 20 Jan '07

20 Jan '07

Author: psmith Date: Sat Jan 20 16:18:31 2007 New Revision: 47 Modified: branches/home/psmith/restructure/src/compat/utils.lisp Log: Added high res timer Modified: branches/home/psmith/restructure/src/compat/utils.lisp ============================================================================== --- branches/home/psmith/restructure/src/compat/utils.lisp (original) +++ branches/home/psmith/restructure/src/compat/utils.lisp Sat Jan 20 16:18:31 2007 @@ -36,3 +36,25 @@ (defun get-readable-time ( &optional (time (get-universal-time))) (get-readable "~A/~2,'0d/~2,'0d ~2,'0d:~2,'0d:~2,'0d" time)) + + +;;High res timer + +(let ((internal-base (get-internal-real-time)) + (universal-base (get-universal-time))) +; +; Gets the time including milliseconds by using a base time from universal time and +; tracking high res passing of time using the get-internal-real-time +; Probably not that accurate in absolute terms i.e. may drift from the base, +; but good enough for performance timings +; + (defun get-universal-high-res() + (let ((current-internal (get-internal-real-time))) + (+ universal-base (/ (- current-internal internal-base) internal-time-units-per-second) ))) + + (defun get-readable-high-res() + (let ((estimated-universal-float (get-universal-high-res))) + (multiple-value-bind (estimated-universal estimated-universal-rem) (floor estimated-universal-float) + (format nil "~A.~3,'0d"(get-readable-time estimated-universal) (* 1000 estimated-universal-rem))))) + + ) \ No newline at end of file

1 0

[nio-cvs] r46 - branches/home/psmith/restructure/src/protocol/yarpc
by psmith＠common-lisp.net 19 Jan '07

19 Jan '07

Author: psmith Date: Fri Jan 19 01:10:52 2007 New Revision: 46 Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp Log: Corrected typo Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp (original) +++ branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp Fri Jan 19 01:10:52 2007 @@ -1,4 +1,4 @@ -\#| +#| Copyright (c) 2007 All rights reserved.

1 0

[nio-cvs] r45 - in branches/home/psmith/restructure: . src/protocol/yarpc
by psmith＠common-lisp.net 19 Jan '07

19 Jan '07

Author: psmith Date: Thu Jan 18 21:07:22 2007 New Revision: 45 Modified: branches/home/psmith/restructure/TODO branches/home/psmith/restructure/run-yarpc.lisp branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp Log: Allowed yarpc server to do RPC calls inline if configured so Modified: branches/home/psmith/restructure/TODO ============================================================================== --- branches/home/psmith/restructure/TODO (original) +++ branches/home/psmith/restructure/TODO Thu Jan 18 21:07:22 2007 @@ -12,3 +12,7 @@ Create UDP server Create RPC server / client + +Non blocking connects + +Allow large packets Modified: branches/home/psmith/restructure/run-yarpc.lisp ============================================================================== --- branches/home/psmith/restructure/run-yarpc.lisp (original) +++ branches/home/psmith/restructure/run-yarpc.lisp Thu Jan 18 21:07:22 2007 @@ -1,11 +1,11 @@ +;Runs a multithreaded system with an IO thread dealing with IO only and a 'job' thread taking and executing jobs + ;(push :nio-debug *features*) (require :asdf) (require :nio-yarpc) +(setf nio-yarpc:+process-jobs-inline+ nil) (sb-thread:make-thread #'(lambda()(nio:start-server 'identity 'identity 'nio-yarpc:yarpc-state-machine :host "127.0.0.1")) :name "nio-server") (loop ;;block waiting for jobs - (format t "~A Server toplevel waiting for job~%" (nio-compat:get-readable-time)) - (destructuring-bind (job result-queue) (nio-compat:take nio-yarpc:job-queue) - (format t "~A Server received job ~A~%" (nio-compat:get-readable-time) job) - (nio-compat:add result-queue (nio-yarpc:execute-call job)))) + (nio-yarpc:run-job)) 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 Thu Jan 18 21:07:22 2007 @@ -32,7 +32,7 @@ yarpc-state-machine-factory get-packet-factory ;; yarpc-state-machine - yarpc-state-machine job-queue + yarpc-state-machine job-queue run-job +process-jobs-inline+ ;to be moved test-rpc test-rpc-list test-rpc-string execute-call Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp (original) +++ branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp Thu Jan 18 21:07:22 2007 @@ -1,4 +1,4 @@ -#| +\#| Copyright (c) 2007 All rights reserved. @@ -52,6 +52,19 @@ (defconstant STATE-INITIALISED 0) (defconstant STATE-SEND-RESPONSE 1) + +(defparameter +process-jobs-inline+ t + "Set this to make the NIO thread process the RPC calls - warning the procedure should not block!") + + + +(defun run-job(&key (wait-on-job-pdw t)) + (format t "~A Server toplevel waiting for job~%" (nio-compat:get-readable-time)) + (destructuring-bind (job result-queue) (nio-compat:take nio-yarpc:job-queue :blocking-call wait-on-job-pdw) + (format t "~A Server received job ~A~%" (nio-compat:get-readable-time) job) + (nio-compat:add result-queue (nio-yarpc:execute-call job)))) + + (defmethod process-outgoing-packet((sm yarpc-state-machine)) (format t "yarpc-state-machine: process-outgoing-packet called, polling the results-queue ~%") (let ((result (nio-compat:take (result-queue sm) :blocking-call nil))) @@ -63,7 +76,8 @@ (defmethod process-incoming-packet ((sm yarpc-state-machine) (call call-method-packet)) (assert (eql (state sm) STATE-INITIALISED)) (format t "yarpc-state-machine:process-incoming-packet called :sm ~A :packet ~A~%" sm call) - (nio-compat:add job-queue (list (call-string call) (result-queue sm)))) + (nio-compat:add job-queue (list (call-string call) (result-queue sm))) + (when +process-jobs-inline+ (run-job :wait-on-job-pdw nil)))

1 0

[nio-cvs] r44 - in branches/home/psmith/restructure: . src/buffer src/compat src/io src/protocol/yarpc src/statemachine
by psmith＠common-lisp.net 19 Jan '07

19 Jan '07

Author: psmith Date: Thu Jan 18 19:11:08 2007 New Revision: 44 Added: branches/home/psmith/restructure/src/compat/utils.lisp Modified: branches/home/psmith/restructure/run-yarpc-client.lisp branches/home/psmith/restructure/run-yarpc.lisp branches/home/psmith/restructure/src/buffer/buffer.lisp branches/home/psmith/restructure/src/compat/nio-compat-package.lisp branches/home/psmith/restructure/src/compat/nio-compat.asd branches/home/psmith/restructure/src/io/async-fd.lisp branches/home/psmith/restructure/src/io/nio-server.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp branches/home/psmith/restructure/src/statemachine/state-machine.lisp Log: Moved verbose messages to nio-debug Modified: branches/home/psmith/restructure/run-yarpc-client.lisp ============================================================================== --- branches/home/psmith/restructure/run-yarpc-client.lisp (original) +++ branches/home/psmith/restructure/run-yarpc-client.lisp Thu Jan 18 19:11:08 2007 @@ -1,4 +1,4 @@ -(push :nio-debug *features*) +;(push :nio-debug *features*) (require :asdf) (require :nio-yarpc) @@ -6,7 +6,7 @@ (sb-thread:make-thread #'(lambda()(nio:start-server 'identity 'identity nil :host "127.0.0.1" :port 9897)) :name "nio-server") (sleep 4) (let ((sm (nio:add-connection "127.0.0.1" 16323 'nio-yarpc:yarpc-client-state-machine))) - -(loop - (format t "toplevel adding conn ~A~%" sm) - (format t "Result of remote-execute ~A~%" (nio-yarpc:remote-execute sm "(nio-yarpc:test-rpc-list)")))) + (format t "~A toplevel adding conn ~A~%" (nio-compat:get-readable-time) sm) + (loop + (format t "~A toplevel Submitting job~%" (nio-compat:get-readable-time) ) + (format t "~A Result of remote-execute ~A~%" (nio-compat:get-readable-time) (nio-yarpc:remote-execute sm "(nio-yarpc:test-rpc-list)")))) Modified: branches/home/psmith/restructure/run-yarpc.lisp ============================================================================== --- branches/home/psmith/restructure/run-yarpc.lisp (original) +++ branches/home/psmith/restructure/run-yarpc.lisp Thu Jan 18 19:11:08 2007 @@ -1,11 +1,11 @@ -(push :nio-debug *features*) +;(push :nio-debug *features*) (require :asdf) (require :nio-yarpc) (sb-thread:make-thread #'(lambda()(nio:start-server 'identity 'identity 'nio-yarpc:yarpc-state-machine :host "127.0.0.1")) :name "nio-server") (loop ;;block waiting for jobs - (format t "Server toplevel waiting for job~%" ) + (format t "~A Server toplevel waiting for job~%" (nio-compat:get-readable-time)) (destructuring-bind (job result-queue) (nio-compat:take nio-yarpc:job-queue) - (format t "Server received job ~A~%" job) + (format t "~A Server received job ~A~%" (nio-compat:get-readable-time) job) (nio-compat:add result-queue (nio-yarpc:execute-call job)))) 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 Thu Jan 18 19:11:08 2007 @@ -159,13 +159,13 @@ ;; Write bytes from vector vec to bytebuffer (defmethod bytebuffer-write-vector((bb byte-buffer) vec) :documentation "Returns number of bytes written to bytebuffer" - (format t "bytebuffer-write-vector - called with ~A ~A"bb vec) +#+nio-debug (format t "bytebuffer-write-vector - called with ~A ~A"bb vec) ; (if (> (remaining bb) 0) ; 0 (progn ; (clear bb) (let ((bytes-written (cffi:mem-write-vector vec (buffer-buf bb) :unsigned-char (length vec) (buffer-position bb)))) - (format t "bytebuffer-write-vector - byteswritten: ~A~%" bytes-written) +#+nio-debug (format t "bytebuffer-write-vector - byteswritten: ~A~%" bytes-written) (inc-position bb bytes-written) bytes-written))) ;) Modified: branches/home/psmith/restructure/src/compat/nio-compat-package.lisp ============================================================================== --- branches/home/psmith/restructure/src/compat/nio-compat-package.lisp (original) +++ branches/home/psmith/restructure/src/compat/nio-compat-package.lisp Thu Jan 18 19:11:08 2007 @@ -33,4 +33,7 @@ ;;concurrent-queue concurrent-queue add take + + ;;utils + get-readable-time )) Modified: branches/home/psmith/restructure/src/compat/nio-compat.asd ============================================================================== --- branches/home/psmith/restructure/src/compat/nio-compat.asd (original) +++ branches/home/psmith/restructure/src/compat/nio-compat.asd Thu Jan 18 19:11:08 2007 @@ -7,6 +7,7 @@ :components ((:file "nio-compat-package") (:file "errno" :depends-on ("nio-compat-package")) (:file "concurrent-queue" :depends-on ("nio-compat-package")) + (:file "utils" :depends-on ("nio-compat-package")) ) :depends-on ()) Added: branches/home/psmith/restructure/src/compat/utils.lisp ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/src/compat/utils.lisp Thu Jan 18 19:11:08 2007 @@ -0,0 +1,38 @@ +#| +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) + +(declaim (optimize (debug 3) (speed 3) (space 0))) + +(defun get-readable (format-string &optional (time (get-universal-time))) + (multiple-value-bind (second minute hour date month year) (decode-universal-time time) + (with-output-to-string (out) + (format out format-string year month date hour minute second)))) + +(defun get-readable-time ( &optional (time (get-universal-time))) + (get-readable "~A/~2,'0d/~2,'0d ~2,'0d:~2,'0d:~2,'0d" time)) 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 Thu Jan 18 19:11:08 2007 @@ -110,7 +110,7 @@ ;; "Read more data from STATE-MACHINE." (defun read-more (state-machine) (with-slots (foreign-read-buffer read-fd) state-machine - (format t "read-more called with ~A~%" state-machine) +#+nio-debug (format t "read-more called with ~A~%" state-machine) #+nio-debug (format t "read-more - calling read() into ~A~%" foreign-read-buffer) (let ((new-bytes (%read read-fd (buffer-buf foreign-read-buffer) (remaining foreign-read-buffer)))) 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 Thu Jan 18 19:11:08 2007 @@ -90,7 +90,7 @@ (catch 'poll-error-exit (handler-bind ((poll-error #'(lambda (cond) (declare (ignore cond)) - (format t "Poll-error, exiting..~%") + (format t "Poll-error (errno ~A), exiting..~%" (get-errno)) (throw 'poll-error-exit nil)))) (loop 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 Thu Jan 18 19:11:08 2007 @@ -59,11 +59,11 @@ (format stream "#<CALL-METHOD-PACKET ~A >" (call-string packet))) (defmethod write-bytes((packet call-method-packet) buf) - (format t "yarpc-packet-factory:write-bytes - writing ~A to ~A~%" packet buf) -; (nio-buffer:flip buf) +#+nio-debug (format t "yarpc-packet-factory:write-bytes - writing ~A to ~A~%" packet buf) (nio-buffer:bytebuffer-write-vector buf #(#x0)) (nio-buffer:bytebuffer-write-string buf (call-string packet)) - (format t "yarpc-packet-factory:write-bytes - written ~A~%" buf) ) +#+nio-debug (format t "yarpc-packet-factory:write-bytes - written ~A~%" buf) +) (defclass method-response-packet (packet) @@ -77,7 +77,8 @@ (format stream "#<METHID-RESPONSE-PACKET ~A >" (response packet))) (defmethod write-bytes((packet method-response-packet) buf) - (format t "yarpc-packet-factory:write-bytes - writing ~A to ~A~%" packet buf) +#+nio-debug (format t "yarpc-packet-factory:write-bytes - writing ~A to ~A~%" packet buf) (nio-buffer:bytebuffer-write-vector buf #(#x1)) (nio-buffer:bytebuffer-write-string buf (write-to-string (response packet))) - (format t "yarpc-packet-factory:write-bytes - written ~A~%" buf) ) +#+nio-debug (format t "yarpc-packet-factory:write-bytes - written ~A~%" buf) +) 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 Thu Jan 18 19:11:08 2007 @@ -57,7 +57,7 @@ (defmethod process-read((sm state-machine)) (with-slots (foreign-read-buffer) sm (let ((incoming-packet (get-packet (get-packet-factory sm) foreign-read-buffer))) - (format t "state-machine::process-read - incoming packet: ~A~%" incoming-packet) + (format t "~A state-machine::process-read - incoming packet: ~A~%" (nio-compat:get-readable-time) incoming-packet) (when incoming-packet (when (not (process-incoming-packet sm incoming-packet)) (close-sm sm)))))) @@ -67,7 +67,7 @@ (defmethod process-write((sm state-machine)) (with-slots (foreign-write-buffer) sm (let ((outgoing-packet (process-outgoing-packet sm))) - (format t "state-machine::process-write - outgoing packet: ~A~%" outgoing-packet) + (format t "~A state-machine::process-write - outgoing packet: ~A~%" (nio-compat:get-readable-time) outgoing-packet) (when outgoing-packet (write-bytes outgoing-packet foreign-write-buffer)))))

1 0

[nio-cvs] r43 - branches/home/psmith/restructure/src/event
by psmith＠common-lisp.net 19 Jan '07

19 Jan '07

Author: psmith Date: Thu Jan 18 19:09:15 2007 New Revision: 43 Modified: branches/home/psmith/restructure/src/event/epoll.lisp Log: Reduced wait time and ignored EINTR on epoll_wait return Modified: branches/home/psmith/restructure/src/event/epoll.lisp ============================================================================== --- branches/home/psmith/restructure/src/event/epoll.lisp (original) +++ branches/home/psmith/restructure/src/event/epoll.lisp Thu Jan 18 19:09:15 2007 @@ -76,13 +76,18 @@ #+nio-debug (format t "poll-events called with :event-queue ~A~%" event-queue) (with-foreign-object (events 'epoll-event +epoll-size+) (memzero events (* +epoll-event-size+ +epoll-size+)) - (loop for res = (%epoll-wait event-queue events +epoll-size+ 1000) + (loop for res = (%epoll-wait event-queue events +epoll-size+ 100) do (progn #+nio-debug (format t "poll-events - dealing with ~A~%" res) (case res - (-1 (error 'poll-error)) + (-1 + (let ((errno (get-errno))) + (format t "-1 returned from epoll-wait, errno ~A~%" errno) + (if (eql errno 4) ;EINTR - interrupted by a system call + (return nil) + (error 'poll-error)))) (return nil) (t (let ((idents nil))

1 0

[nio-cvs] r42 - in branches/home/psmith/restructure: . src/protocol/yarpc
by psmith＠common-lisp.net 18 Jan '07

18 Jan '07

Author: psmith Date: Wed Jan 17 23:26:42 2007 New Revision: 42 Modified: branches/home/psmith/restructure/run-yarpc-client.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-client-state-machine.lisp Log: loop sending rpc's and minor correction Modified: branches/home/psmith/restructure/run-yarpc-client.lisp ============================================================================== --- branches/home/psmith/restructure/run-yarpc-client.lisp (original) +++ branches/home/psmith/restructure/run-yarpc-client.lisp Wed Jan 17 23:26:42 2007 @@ -6,5 +6,7 @@ (sb-thread:make-thread #'(lambda()(nio:start-server 'identity 'identity nil :host "127.0.0.1" :port 9897)) :name "nio-server") (sleep 4) (let ((sm (nio:add-connection "127.0.0.1" 16323 'nio-yarpc:yarpc-client-state-machine))) -(format t "toplevel adding conn ~A~%" sm) -(format t "Result of remote-execute ~A~%" (nio-yarpc:remote-execute sm "(nio-yarpc:test-rpc-list)"))) + +(loop + (format t "toplevel adding conn ~A~%" sm) + (format t "Result of remote-execute ~A~%" (nio-yarpc:remote-execute sm "(nio-yarpc:test-rpc-list)")))) 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 Wed Jan 17 23:26:42 2007 @@ -68,13 +68,12 @@ (format t "yarpc-client-state-machine:process-incoming-packet called :sm ~A :packet ~A~%" sm response) (let* ((*package* (find-package :nio-yarpc)) (result (read-from-string (response response)))) - (nio-compat:add (result-queue sm) result) - (setf (state sm) STATE-INITIALISED))) + (setf (state sm) STATE-INITIALISED) + (nio-compat:add (result-queue sm) result))) ;Called from an external thread i.e. *not* the nio thread ;Blocks calling thread on the remote m/c's response (defmethod remote-execute ((sm yarpc-client-state-machine) call-string) -; (queue-outgoing-packet (assert (eql (state sm) STATE-INITIALISED)) (nio-compat:add (job-queue sm) (make-instance 'call-method-packet :call-string call-string)) (nio-compat:take (result-queue sm))) \ No newline at end of file

1 0