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

[nio-cvs] r61 - branches/home/psmith/restructure/src/nio-logger
by psmith＠common-lisp.net 30 Jan '07

30 Jan '07

Author: psmith Date: Tue Jan 30 01:27:51 2007 New Revision: 61 Modified: branches/home/psmith/restructure/src/nio-logger/nio-logger.asd branches/home/psmith/restructure/src/nio-logger/nio-logger.lisp branches/home/psmith/restructure/src/nio-logger/run-logging-client.lisp branches/home/psmith/restructure/src/nio-logger/run-logging-server.lisp Log: first working logger Modified: branches/home/psmith/restructure/src/nio-logger/nio-logger.asd ============================================================================== --- branches/home/psmith/restructure/src/nio-logger/nio-logger.asd (original) +++ branches/home/psmith/restructure/src/nio-logger/nio-logger.asd Tue Jan 30 01:27:51 2007 @@ -8,5 +8,5 @@ (:file "nio-logger" :depends-on ("nio-logger-package")) ) - :depends-on (:nio-yarpc)) + :depends-on (:nio-yarpc :nio-utils)) Modified: branches/home/psmith/restructure/src/nio-logger/nio-logger.lisp ============================================================================== --- branches/home/psmith/restructure/src/nio-logger/nio-logger.lisp (original) +++ branches/home/psmith/restructure/src/nio-logger/nio-logger.lisp Tue Jan 30 01:27:51 2007 @@ -39,12 +39,14 @@ (nio-utils:format-log t "toplevel adding conn ~A to ~A~%" sm ip-address) (with-open-file (in filename :direction :input) (loop for text = (read-line in nil nil) do - (let ((rpc (format nil "(nio-logger:log +log-file-name+ ~A" text))) + (let ((rpc (format nil "(nio-logger:remote-log \"~A\")" text))) (nio-utils:format-log t "Toplevel Submitting job~A~%" rpc) (nio-utils:format-log t "Result of remote-log ~A~%" (nio-yarpc:remote-execute sm rpc))))))) ;Runs a multithreaded system with an IO thread dealing with IO only and a 'job' thread taking and executing jobs +(defparameter +log-file-name+ "/tmp/out") + (defun run-logging-server() (setf nio-yarpc:+process-jobs-inline+ nil) (nio:load-ips "ips.txt") @@ -53,5 +55,6 @@ ;;block waiting for jobs (nio-yarpc:run-job))) -(nio-yarpc:defremote remote-log(destination control-string &rest format-arguments) - (format-log destination control-string format-arguments)) +(nio-yarpc:defremote remote-log(str) + (with-open-file (out +log-file-name+ :direction :output :if-exists :append) + (nio-utils:format-log out "~A~%" str))) Modified: branches/home/psmith/restructure/src/nio-logger/run-logging-client.lisp ============================================================================== --- branches/home/psmith/restructure/src/nio-logger/run-logging-client.lisp (original) +++ branches/home/psmith/restructure/src/nio-logger/run-logging-client.lisp Tue Jan 30 01:27:51 2007 @@ -27,5 +27,5 @@ (push :nio-debug *features*) (require :asdf) -(require :nio-yarpc) -(nio-logger:tail-log) +(require :nio-logger) +(nio-logger:tail-log "/tmp/test" "127.0.0.1") Modified: branches/home/psmith/restructure/src/nio-logger/run-logging-server.lisp ============================================================================== --- branches/home/psmith/restructure/src/nio-logger/run-logging-server.lisp (original) +++ branches/home/psmith/restructure/src/nio-logger/run-logging-server.lisp Tue Jan 30 01:27:51 2007 @@ -27,5 +27,5 @@ (push :nio-debug *features*) (require :asdf) -(require :nio-yarpc) +(require :nio-logger) (nio-logger:run-logging-server)

1 0

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

30 Jan '07

Author: psmith Date: Tue Jan 30 00:45:18 2007 New Revision: 60 Added: branches/home/psmith/restructure/src/nio-logger/nio-logger-package.lisp - copied, changed from r49, branches/home/psmith/restructure/src/utils/nio-utils-package.lisp branches/home/psmith/restructure/src/nio-logger/nio-logger.asd - copied, changed from r49, branches/home/psmith/restructure/src/utils/nio-utils.asd branches/home/psmith/restructure/src/nio-logger/nio-logger.lisp branches/home/psmith/restructure/src/nio-logger/run.sh (contents, props changed) Modified: branches/home/psmith/restructure/src/nio-logger/run-logging-client.lisp branches/home/psmith/restructure/src/nio-logger/run-logging-server.lisp branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp Log: logging nearly there... Copied: branches/home/psmith/restructure/src/nio-logger/nio-logger-package.lisp (from r49, branches/home/psmith/restructure/src/utils/nio-utils-package.lisp) ============================================================================== --- branches/home/psmith/restructure/src/utils/nio-utils-package.lisp (original) +++ branches/home/psmith/restructure/src/nio-logger/nio-logger-package.lisp Tue Jan 30 00:45:18 2007 @@ -24,10 +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-utils (:use :cl) +(defpackage :nio-logger (:use :cl) (:export - ;;utils - format-log + ;;nio-logger + remote-log run-logging-server tail-log )) Copied: branches/home/psmith/restructure/src/nio-logger/nio-logger.asd (from r49, branches/home/psmith/restructure/src/utils/nio-utils.asd) ============================================================================== --- branches/home/psmith/restructure/src/utils/nio-utils.asd (original) +++ branches/home/psmith/restructure/src/nio-logger/nio-logger.asd Tue Jan 30 00:45:18 2007 @@ -2,11 +2,11 @@ (in-package :asdf) -(defsystem :nio-utils +(defsystem :nio-logger - :components ((:file "nio-utils-package") - (:file "utils" :depends-on ("nio-utils-package")) + :components ((:file "nio-logger-package") + (:file "nio-logger" :depends-on ("nio-logger-package")) ) - :depends-on ()) + :depends-on (:nio-yarpc)) Added: branches/home/psmith/restructure/src/nio-logger/nio-logger.lisp ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/src/nio-logger/nio-logger.lisp Tue Jan 30 00:45:18 2007 @@ -0,0 +1,57 @@ +#| +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-logger) + +(declaim (optimize (debug 3) (speed 3) (space 0))) + +;;Tail the given log and write to remote logger +;;e.g. (tail-log "/var/log/httpd/access_log" "192.168.1.1") +(defun tail-log(filename ip-address) + ;;shouldn't be listenting on the client hence nil for accept SM to start-server + (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 ip-address 16323 'nio-yarpc:yarpc-client-state-machine))) + (nio-utils:format-log t "toplevel adding conn ~A to ~A~%" sm ip-address) + (with-open-file (in filename :direction :input) + (loop for text = (read-line in nil nil) do + (let ((rpc (format nil "(nio-logger:log +log-file-name+ ~A" text))) + (nio-utils:format-log t "Toplevel Submitting job~A~%" rpc) + (nio-utils:format-log t "Result of remote-log ~A~%" (nio-yarpc:remote-execute sm rpc))))))) + +;Runs a multithreaded system with an IO thread dealing with IO only and a 'job' thread taking and executing jobs + +(defun run-logging-server() + (setf nio-yarpc:+process-jobs-inline+ nil) + (nio:load-ips "ips.txt") + (sb-thread:make-thread #'(lambda()(nio:start-server 'identity 'identity 'nio-yarpc:yarpc-state-machine :host "127.0.0.1" :accept-connection 'nio:check-ip)) :name "nio-server") + (loop + ;;block waiting for jobs + (nio-yarpc:run-job))) + +(nio-yarpc:defremote remote-log(destination control-string &rest format-arguments) + (format-log destination control-string format-arguments)) Modified: branches/home/psmith/restructure/src/nio-logger/run-logging-client.lisp ============================================================================== --- branches/home/psmith/restructure/src/nio-logger/run-logging-client.lisp (original) +++ branches/home/psmith/restructure/src/nio-logger/run-logging-client.lisp Tue Jan 30 00:45:18 2007 @@ -25,20 +25,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |# -(in-package :nio-logger) - -(declaim (optimize (debug 3) (speed 3) (space 0))) - -;;Tail the given log and write to remote logger -;;e.g. (tail-log "/var/log/httpd/access_log" "192.168.1.1") -(defun tail-log(filename ip-address) - ;;shouldn't be listenting on the client hence nil for accept SM to start-server - (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 ip-address 16323 'nio-yarpc:yarpc-client-state-machine))) - (nio-utils:format-log t "toplevel adding conn ~A to ~A~%" sm ip-address) - (with-open-file (in filename :direction :input) - (loop for text = (read-line in nil nil) - (let ((rpc (format nil "(nio-logger:log +log-file-name+ ~A" text))) - (nio-utils:format-log t "Toplevel Submitting job~A~%" rpc) - (nio-utils:format-log t "Result of remote-log ~A~%" (nio-yarpc:remote-execute sm rpc))))))) +(push :nio-debug *features*) +(require :asdf) +(require :nio-yarpc) +(nio-logger:tail-log) Modified: branches/home/psmith/restructure/src/nio-logger/run-logging-server.lisp ============================================================================== --- branches/home/psmith/restructure/src/nio-logger/run-logging-server.lisp (original) +++ branches/home/psmith/restructure/src/nio-logger/run-logging-server.lisp Tue Jan 30 00:45:18 2007 @@ -25,20 +25,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |# -(in-package :nio-logger) - -(declaim (optimize (debug 3) (speed 3) (space 0))) - - -;Runs a multithreaded system with an IO thread dealing with IO only and a 'job' thread taking and executing jobs - -(defun run-logging-server() - (setf nio-yarpc:+process-jobs-inline+ nil) - (nio:load-ips "ips.txt") - (sb-thread:make-thread #'(lambda()(nio:start-server 'identity 'identity 'nio-yarpc:yarpc-state-machine :host "127.0.0.1" :accept-connection 'nio:check-ip)) :name "nio-server") - (loop - ;;block waiting for jobs - (nio-yarpc:run-job))) - -(defremote log(destination control-string &rest format-arguments) - (format-log destination control-string format-arguments)) +(push :nio-debug *features*) +(require :asdf) +(require :nio-yarpc) +(nio-logger:run-logging-server) Added: branches/home/psmith/restructure/src/nio-logger/run.sh ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/src/nio-logger/run.sh Tue Jan 30 00:45:18 2007 @@ -0,0 +1,7 @@ +#!/bin/bash +# +# run.sh <http|yarpc> +# + +export LANG=en_US.UTF-8 +sbcl --load run-$1.lisp 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 Jan 30 00:45:18 2007 @@ -34,7 +34,7 @@ ;; yarpc-state-machine yarpc-state-machine job-queue run-job +process-jobs-inline+ ;to be moved - test-rpc test-rpc-list test-rpc-string execute-call + test-rpc test-rpc-list test-rpc-string execute-call defremote ;;yarpc-client-state-machine yarpc-client-state-machine remote-execute

1 0

[nio-cvs] r59 - in branches/home/psmith/restructure: . src/nio-logger
by psmith＠common-lisp.net 30 Jan '07

30 Jan '07

Author: psmith Date: Mon Jan 29 23:43:00 2007 New Revision: 59 Added: branches/home/psmith/restructure/src/nio-logger/ branches/home/psmith/restructure/src/nio-logger/ips.txt - copied unchanged from r58, branches/home/psmith/restructure/ips.txt branches/home/psmith/restructure/src/nio-logger/run-logging-client.lisp - copied, changed from r55, branches/home/psmith/restructure/run-yarpc-client.lisp branches/home/psmith/restructure/src/nio-logger/run-logging-server.lisp - copied, changed from r58, branches/home/psmith/restructure/run-yarpc.lisp Removed: branches/home/psmith/restructure/ips.txt branches/home/psmith/restructure/run-yarpc-client.lisp branches/home/psmith/restructure/run-yarpc.lisp Modified: branches/home/psmith/restructure/TODO Log: nio-logger first stab Modified: branches/home/psmith/restructure/TODO ============================================================================== --- branches/home/psmith/restructure/TODO (original) +++ branches/home/psmith/restructure/TODO Mon Jan 29 23:43:00 2007 @@ -11,8 +11,4 @@ Create UDP server -Create RPC server / client - Non blocking connects - -Allow large packets Copied: branches/home/psmith/restructure/src/nio-logger/run-logging-client.lisp (from r55, branches/home/psmith/restructure/run-yarpc-client.lisp) ============================================================================== --- branches/home/psmith/restructure/run-yarpc-client.lisp (original) +++ branches/home/psmith/restructure/src/nio-logger/run-logging-client.lisp Mon Jan 29 23:43:00 2007 @@ -1,12 +1,44 @@ -(push :nio-debug *features*) -(require :asdf) -(require :nio-yarpc) +#| +Copyright (c) 2007 +All rights reserved. -;;shouldn't be listenting on the client hence nil for accept SM to start-server -(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))) - (nio-utils:format-log t "toplevel adding conn ~A~%" sm) - (loop - (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)")))) +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-logger) + +(declaim (optimize (debug 3) (speed 3) (space 0))) + +;;Tail the given log and write to remote logger +;;e.g. (tail-log "/var/log/httpd/access_log" "192.168.1.1") +(defun tail-log(filename ip-address) + ;;shouldn't be listenting on the client hence nil for accept SM to start-server + (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 ip-address 16323 'nio-yarpc:yarpc-client-state-machine))) + (nio-utils:format-log t "toplevel adding conn ~A to ~A~%" sm ip-address) + (with-open-file (in filename :direction :input) + (loop for text = (read-line in nil nil) + (let ((rpc (format nil "(nio-logger:log +log-file-name+ ~A" text))) + (nio-utils:format-log t "Toplevel Submitting job~A~%" rpc) + (nio-utils:format-log t "Result of remote-log ~A~%" (nio-yarpc:remote-execute sm rpc))))))) Copied: branches/home/psmith/restructure/src/nio-logger/run-logging-server.lisp (from r58, branches/home/psmith/restructure/run-yarpc.lisp) ============================================================================== --- branches/home/psmith/restructure/run-yarpc.lisp (original) +++ branches/home/psmith/restructure/src/nio-logger/run-logging-server.lisp Mon Jan 29 23:43:00 2007 @@ -1,12 +1,44 @@ +#| +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-logger) + +(declaim (optimize (debug 3) (speed 3) (space 0))) + + ;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) -(nio:load-ips "ips.txt") -(sb-thread:make-thread #'(lambda()(nio:start-server 'identity 'identity 'nio-yarpc:yarpc-state-machine :host "127.0.0.1" :accept-connection 'nio:check-ip)) :name "nio-server") -(loop +(defun run-logging-server() + (setf nio-yarpc:+process-jobs-inline+ nil) + (nio:load-ips "ips.txt") + (sb-thread:make-thread #'(lambda()(nio:start-server 'identity 'identity 'nio-yarpc:yarpc-state-machine :host "127.0.0.1" :accept-connection 'nio:check-ip)) :name "nio-server") + (loop ;;block waiting for jobs - (nio-yarpc:run-job)) + (nio-yarpc:run-job))) + +(defremote log(destination control-string &rest format-arguments) + (format-log destination control-string format-arguments))

1 0

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

29 Jan '07

Author: psmith Date: Mon Jan 29 00:55:46 2007 New Revision: 58 Added: branches/home/psmith/restructure/ips.txt branches/home/psmith/restructure/src/io/ip-authorisation.lisp Modified: branches/home/psmith/restructure/run-yarpc.lisp branches/home/psmith/restructure/src/io/async-fd.lisp branches/home/psmith/restructure/src/io/nio-package.lisp branches/home/psmith/restructure/src/io/nio-server.lisp branches/home/psmith/restructure/src/io/nio.asd Log: Added ip authorisation Added: branches/home/psmith/restructure/ips.txt ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/ips.txt Mon Jan 29 00:55:46 2007 @@ -0,0 +1 @@ +("192.168.1.1" "127.0.0.1") Modified: branches/home/psmith/restructure/run-yarpc.lisp ============================================================================== --- branches/home/psmith/restructure/run-yarpc.lisp (original) +++ branches/home/psmith/restructure/run-yarpc.lisp Mon Jan 29 00:55:46 2007 @@ -5,7 +5,8 @@ (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") +(nio:load-ips "ips.txt") +(sb-thread:make-thread #'(lambda()(nio:start-server 'identity 'identity 'nio-yarpc:yarpc-state-machine :host "127.0.0.1" :accept-connection 'nio:check-ip)) :name "nio-server") (loop ;;block waiting for jobs (nio-yarpc:run-job)) 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 29 00:55:46 2007 @@ -101,9 +101,11 @@ (defun close-async-fd (async-fd) "Close ASYNC-FD's fd after everything has been written from write-queue." +#+nio-debug (format t "close-async-fd called with :async-fd ~A~%" async-fd) (with-slots (read-fd write-fd foreign-read-buffer foreign-write-buffer) async-fd + (nio-buffer:flip foreign-write-buffer) +#+nio-debug (format t "close-async-fd foreign-write-buffer ~A~%" foreign-write-buffer) (assert (eql (remaining foreign-write-buffer) 0)) -#+nio-debug (format t "close-async-fd called with :read-fd ~A :write-fd ~A~%" read-fd write-fd) ;; if write-queue is emtpy, close now (close-fd read-fd) (free-buffer foreign-read-buffer) Added: branches/home/psmith/restructure/src/io/ip-authorisation.lisp ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/src/io/ip-authorisation.lisp Mon Jan 29 00:55:46 2007 @@ -0,0 +1,41 @@ +#| +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) + +(declaim (optimize (debug 3) (speed 3) (space 0))) + +(defparameter +ip-list+ nil) + +(defun load-ips (filename) + (with-open-file (stream filename) + (setf +ip-list+ (read stream)))) + +(defun check-ip (async-fd) + (with-slots (remote-host) (socket async-fd) + (let ((str-rep (format nil "~{~a~^.~}" (reverse remote-host)))) + (format t "ip-authorisation:check-ip ~A ~A~%" str-rep +ip-list+) + (member str-rep +ip-list+ :test 'string-equal)))) \ No newline at end of file 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 Mon Jan 29 00:55:46 2007 @@ -39,4 +39,7 @@ ;;packet packet write-bytes + + ;;ip-authorisation + check-ip load-ips )) 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 29 00:55:46 2007 @@ -106,8 +106,8 @@ (format t "Accept failed.~%")) ;; accept connection ? - ((set-fd-nonblocking (async-fd-read-fd async-fd)) - (funcall accept-connection async-fd) + ((funcall accept-connection async-fd) + (set-fd-nonblocking (async-fd-read-fd async-fd)) (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) 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 Mon Jan 29 00:55:46 2007 @@ -10,6 +10,7 @@ (:file "async-fd" :depends-on ("fd-helper")) (:file "async-socket" :depends-on ("async-fd")) (:file "nio-server" :depends-on ("async-socket")) + (:file "ip-authorisation" :depends-on ("nio-package")) ) :depends-on (:cffi :event-notification :nio-buffer :nio-compat :nio-utils))

1 0

[nio-cvs] r57 - branches/home/psmith/restructure
by psmith＠common-lisp.net 29 Jan '07

29 Jan '07

Author: psmith Date: Mon Jan 29 00:40:10 2007 New Revision: 57 Added: branches/home/psmith/restructure/run-tests.lisp Log: Added tests main Added: branches/home/psmith/restructure/run-tests.lisp ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/run-tests.lisp Mon Jan 29 00:40:10 2007 @@ -0,0 +1,4 @@ +(require :asdf) +(require :nio-yarpc) +(in-package :nio-buffer) +(test-buffer) \ No newline at end of file

1 0

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

29 Jan '07

Author: psmith Date: Sun Jan 28 23:27:18 2007 New Revision: 56 Modified: branches/home/psmith/restructure/src/buffer/buffer.lisp branches/home/psmith/restructure/src/buffer/nio-buffer-package.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp Log: fixed no compact problem 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 Sun Jan 28 23:27:18 2007 @@ -151,6 +151,13 @@ (setf position 0) byte-buffer)) +(defmethod compact((byte-buffer byte-buffer)) + :documentation "copy remaining bytes to the beginning of this buffer and set position to number of bytes copied (ready for a new put" + (with-slots (buf position limit) byte-buffer + (let ((remaining (remaining byte-buffer))) + (%memcpy buf (cffi:make-pointer (+ (cffi:pointer-address buf) position)) remaining) + (setf position remaining)))) + ;reads bytes from byte-buffer and returns a vector (unsigned-byte 8) (defmethod bytebuffer-read-vector((bb byte-buffer) &optional (num-bytes-to-read (remaining bb))) (let ((vec (make-uint8-seq num-bytes-to-read))) @@ -281,7 +288,14 @@ (assert (eql (bytebuffer-read-32 mybuf) 2147483649)) (format t "Mybuf (after r/w 32bit): ~A~%" mybuf) + (setf (buffer-position mybuf) 11) + (compact mybuf) + (format t "Mybuf (after compact): ~A~%" mybuf) + (assert (eql (buffer-position mybuf) (- 32 11))) + (flip mybuf) + (format t "Mybuf (flip): ~A~%" mybuf) + (assert (eql (bytebuffer-read-32 mybuf) 2147483649)) (free-buffer mybuf) (format t "Mybuf after free: ~A~%" 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 Sun Jan 28 23:27:18 2007 @@ -31,5 +31,5 @@ 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 + flip unflip clear buffer-position copy-buffer buffer-capacity compact )) 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 Sun Jan 28 23:27:18 2007 @@ -50,11 +50,15 @@ (let ((packet-id (bytebuffer-read-8 buf)) (packet-length (bytebuffer-read-32 buf))) (if (<= (- packet-length +yarpc-packet-header-size+) (remaining buf)) ;is the whole packet available in the buffer? - (ecase packet-id - (0 (progn (format-log t "yarpc-packet-factory:get-packet - got CALL-METHOD-PACKET-ID~%") (call-method-packet (bytebuffer-read-string buf (- packet-length +yarpc-packet-header-size+))))) - (1 (progn (format-log t "yarpc-packet-factory:get-packet - got METHOD-RESPONSE-PACKET-ID~%") (method-response-packet (bytebuffer-read-string buf (- packet-length +yarpc-packet-header-size+)))))) - (let ((buffer-capacity (buffer-capacity buf))) + (let ((ret-packet (ecase packet-id + (0 (progn (format-log t "yarpc-packet-factory:get-packet - got CALL-METHOD-PACKET-ID~%") (call-method-packet (bytebuffer-read-string buf (- packet-length +yarpc-packet-header-size+))))) + (1 (progn (format-log t "yarpc-packet-factory:get-packet - got METHOD-RESPONSE-PACKET-ID~%") (method-response-packet (bytebuffer-read-string buf (- packet-length +yarpc-packet-header-size+)))))))) + (compact buf) + #+nio-debug (format-log t "yarpc-packet-factory:get-packet - after compact ~%~A~%" buf) + #+nio-debug (format-log t "yarpc-packet-factory:get-packet - retuirning packet ~A~%" ret-packet) + ret-packet) ;Failed to read a whole packet unflip and check size + (let ((buffer-capacity (buffer-capacity buf))) (unflip buf) (if (> packet-length buffer-capacity) (error 'buffer-too-small-error :recommended-size packet-length)))))))

1 0

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

29 Jan '07

Author: psmith Date: Sun Jan 28 21:35:58 2007 New Revision: 55 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/buffer/nio-buffer-package.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp Log: large packet support first working version 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 28 21:35:58 2007 @@ -1,4 +1,4 @@ -;(push :nio-debug *features*) +(push :nio-debug *features*) (require :asdf) (require :nio-yarpc) Modified: branches/home/psmith/restructure/run-yarpc.lisp ============================================================================== --- branches/home/psmith/restructure/run-yarpc.lisp (original) +++ branches/home/psmith/restructure/run-yarpc.lisp Sun Jan 28 21:35:58 2007 @@ -1,6 +1,6 @@ ;Runs a multithreaded system with an IO thread dealing with IO only and a 'job' thread taking and executing jobs -;(push :nio-debug *features*) +(push :nio-debug *features*) (require :asdf) (require :nio-yarpc) 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 Sun Jan 28 21:35:58 2007 @@ -175,14 +175,25 @@ (inc-position bb 4) val)) +;write an 8 bit value and up date position in buffer (defmethod bytebuffer-write-8 ((bb byte-buffer) value) (setf (cffi:mem-ref (buffer-buf bb) :unsigned-char (buffer-position bb)) value) (inc-position bb 1)) +;write a 32 bit value and up date position in buffer (defmethod bytebuffer-write-32 ((bb byte-buffer) value) (setf (cffi:mem-ref (buffer-buf bb) :unsigned-int (buffer-position bb)) value) (inc-position bb 4)) +;insert an 8 bit value +(defmethod bytebuffer-insert-8 ((bb byte-buffer) value byte-position) + (setf (cffi:mem-ref (buffer-buf bb) :unsigned-char byte-position) value)) + +;insert a 32 bit value +(defmethod bytebuffer-insert-32 ((bb byte-buffer) value byte-position) + (setf (cffi:mem-ref (buffer-buf bb) :unsigned-int byte-position) value)) + + ;; Write bytes from vector vec to bytebuffer 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 Sun Jan 28 21:35:58 2007 @@ -29,6 +29,7 @@ (:export byte-buffer free-buffer remaining inc-position get-string buffer-buf bytebuffer-write-vector bytebuffer-write-string - bytebuffer-read-vector bytebuffer-read-string bytebuffer-read-8 bytebuffer-read-32 + 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 )) 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 Sun Jan 28 21:35:58 2007 @@ -35,8 +35,14 @@ (defun yarpc-packet-factory () (make-instance 'yarpc-packet-factory)) -(defconstant CALL-METHOD-PACKET-ID #x0) -(defconstant METHOD-RESPONSE-PACKET-ID #x1) +(defconstant +CALL-METHOD-PACKET-ID+ #x0) +(defconstant +METHOD-RESPONSE-PACKET-ID+ #x1) + +(defconstant +PACKET-ID-SIZE+ 1) +(defconstant +PACKET-LENGTH-SIZE+ 4) + +(defconstant +yarpc-packet-header-size+ + (+ +PACKET-ID-SIZE+ +PACKET-LENGTH-SIZE+)) (defmethod get-packet ((pf yarpc-packet-factory) buf) (flip buf) @@ -56,13 +62,6 @@ (defclass call-method-packet (packet)((call-string :initarg :call-string :accessor call-string))) - -(defconstant +PACKET-ID-SIZE+ 1) -(defconstant +PACKET-LENGTH-SIZE+ 4) - -(defconstant +yarpc-packet-header-size+ - (+ +PACKET-ID-SIZE+ +PACKET-LENGTH-SIZE+)) - (defun call-method-packet (call-string) (make-instance 'call-method-packet :call-string call-string)) @@ -70,11 +69,13 @@ (format stream "#<CALL-METHOD-PACKET ~A >" (call-string packet))) (defmethod write-bytes((packet call-method-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-debug (format-log t "yarpc-packet-factory:write-bytes(call-method-packet) - writing ~%~A to ~%~A~%" packet buf) + (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-string buf (call-string packet)) -#+nio-debug (format-log t "yarpc-packet-factory:write-bytes - written ~A~%" buf) -) + (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) + ) (defclass method-response-packet (packet) @@ -89,7 +90,9 @@ (defmethod write-bytes((packet method-response-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-8 buf +METHOD-RESPONSE-PACKET-ID+) + (nio-buffer:bytebuffer-write-32 buf 0) ; come back and write length later (nio-buffer:bytebuffer-write-string buf (write-to-string (response packet))) + (nio-buffer:bytebuffer-insert-32 buf (buffer-position buf) 1) #+nio-debug (format-log t "yarpc-packet-factory:write-bytes - written ~A~%" buf) )

1 0

[nio-cvs] r54 - branches/home/psmith/restructure/src/buffer
by psmith＠common-lisp.net 29 Jan '07

29 Jan '07

Author: psmith Date: Sun Jan 28 20:54:10 2007 New Revision: 54 Modified: branches/home/psmith/restructure/src/buffer/buffer.lisp Log: Added 8 & 32 accessors for the bytebuffer 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 Sun Jan 28 20:54:10 2007 @@ -68,6 +68,12 @@ ;;-- end utils +(defun get-readable-char (char-code) + (if (<= char-code 32) + (code-char 46) + (if (> char-code 127) + (code-char 46) + (code-char char-code)))) (defun pretty-hex-dump (start-address length) ; (format t "start: ~A length ~A~%" start-address length) @@ -86,7 +92,7 @@ (format readable "--")) (progn (format str (if (eql column-index 7) "~A " "~A ") (hex-dump-byte address)) - (format readable "~A" (code-char (byte-value address))))))))))))) + (format readable "~A" (get-readable-char (byte-value address))))))))))))) (defun make-uint8-seq (size) "Make uint8 sequence." @@ -100,7 +106,7 @@ (defmethod print-object ((byte-buffer byte-buffer) stream) (with-slots (capacity position limit buf) byte-buffer - (format stream "<byte-buffer :capacity ~A :position ~A :limit ~A :buf ~%~A>~%" capacity position limit (if buf (hex-dump-memory (cffi:pointer-address buf) limit) nil)))) + (format stream "<byte-buffer :capacity ~A :position ~A :limit ~A :buf ~%~A>~%" capacity position limit (if buf (pretty-hex-dump (cffi:pointer-address buf) limit) nil)))) (defmethod free-buffer((byte-buffer byte-buffer)) (with-slots (capacity position limit buf) byte-buffer @@ -171,9 +177,14 @@ (defmethod bytebuffer-write-8 ((bb byte-buffer) value) (setf (cffi:mem-ref (buffer-buf bb) :unsigned-char (buffer-position bb)) value) -; (cffi:mem-set value (buffer-buf bb) :unsigned-char position) (inc-position bb 1)) +(defmethod bytebuffer-write-32 ((bb byte-buffer) value) + (setf (cffi:mem-ref (buffer-buf bb) :unsigned-int (buffer-position bb)) value) + (inc-position bb 4)) + + + ;; Write bytes from vector vec to bytebuffer (defmethod bytebuffer-write-vector((bb byte-buffer) vec) :documentation "Returns number of bytes written to bytebuffer" @@ -244,6 +255,23 @@ (format t "Mybuf (after clear): ~A~%" (clear mybuf)) + ;test accessors + (setf (buffer-position mybuf) 11) + (bytebuffer-write-8 mybuf 243) + (assert (eql (buffer-position mybuf) 12)) + (setf (buffer-position mybuf) 11) + (assert (eql (bytebuffer-read-8 mybuf) 243)) + (format t "Mybuf (after r/w 8bit): ~A~%" mybuf) + + (setf (buffer-position mybuf) 11) + (bytebuffer-write-32 mybuf 2147483649) + (assert (eql (buffer-position mybuf) 15)) + (setf (buffer-position mybuf) 11) + (assert (eql (bytebuffer-read-32 mybuf) 2147483649)) + (format t "Mybuf (after r/w 32bit): ~A~%" mybuf) + + + (free-buffer mybuf) (format t "Mybuf after free: ~A~%" mybuf)))

1 0

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

28 Jan '07

Author: psmith Date: Sat Jan 27 20:43:47 2007 New Revision: 53 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/io/nio-package.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp branches/home/psmith/restructure/src/statemachine/state-machine.lisp Log: start of large packet support 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 Sat Jan 27 20:43:47 2007 @@ -35,7 +35,6 @@ (declaim (optimize (debug 3) (speed 3) (space 0))) - (defclass buffer () ((capacity :initarg :capacity :initform 0 @@ -93,14 +92,12 @@ "Make uint8 sequence." (make-sequence '(vector (unsigned-byte 8)) size :initial-element 0)) - ;;A buffer that deals with bytes (defclass byte-buffer (buffer)()) (defun byte-buffer (capacity) (make-instance 'byte-buffer :capacity capacity :limit capacity :position 0 :buf (cffi:foreign-alloc :uint8 :count capacity))) - (defmethod print-object ((byte-buffer byte-buffer) stream) (with-slots (capacity position limit buf) byte-buffer (format stream "<byte-buffer :capacity ~A :position ~A :limit ~A :buf ~%~A>~%" capacity position limit (if buf (hex-dump-memory (cffi:pointer-address buf) limit) nil)))) @@ -113,11 +110,15 @@ (setf limit 0) (setf position 0))) - +;bytes between the position and the limit (defmethod remaining((byte-buffer byte-buffer)) (with-slots (position limit) byte-buffer (- limit position))) +;bytes between the current position and capacity +(defmethod remaining-capacity((byte-buffer byte-buffer)) + (with-slots (position capacity) byte-buffer + (- capacity position))) (defmethod inc-position((byte-buffer byte-buffer) num-bytes) (with-slots (position limit) byte-buffer @@ -131,6 +132,12 @@ (setf limit position) (setf position 0))) +(defmethod unflip((byte-buffer byte-buffer)) + :documentation "make buffer ready for relative write operation. Used on partial read to reset the buffer for writing" + (with-slots (position limit capacity) byte-buffer + (setf position limit) + (setf limit capacity))) + (defmethod clear((byte-buffer byte-buffer)) :documentation "Reset the position to 0 and the limit to capacity" (with-slots (position limit capacity) byte-buffer @@ -150,11 +157,22 @@ (defmethod bytebuffer-read-string((bb byte-buffer) &optional (num-bytes-to-read (remaining bb)) (external-format :ascii)) (sb-ext:octets-to-string (bytebuffer-read-vector bb num-bytes-to-read) :external-format external-format)) - -;grrr... -;(defmethod bytebuffer-write-byte ((bb byte-buffer) value) -; (cffi:%mem-set value (buffer-buf bb) :unsigned-char position) -; (inc-position bb 1)) +; Read a byte from bytebuffer and return it incrementing the byte-buffers position +(defmethod bytebuffer-read-8((bb byte-buffer)) + (let ((val (cffi:mem-ref (cffi:make-pointer (+ (cffi:pointer-address (buffer-buf bb)) (buffer-position bb))) :unsigned-char ))) + (inc-position bb 1) + val)) + +; Read a 32 bit integer from bytebuffer and return it incrementing the byte-buffers position +(defmethod bytebuffer-read-32((bb byte-buffer)) + (let ((val (cffi:mem-ref (cffi:make-pointer (+ (cffi:pointer-address (buffer-buf bb)) (buffer-position bb))) :unsigned-int ))) + (inc-position bb 4) + val)) + +(defmethod bytebuffer-write-8 ((bb byte-buffer) value) + (setf (cffi:mem-ref (buffer-buf bb) :unsigned-char (buffer-position bb)) value) +; (cffi:mem-set value (buffer-buf bb) :unsigned-char position) + (inc-position bb 1)) ;; Write bytes from vector vec to bytebuffer (defmethod bytebuffer-write-vector((bb byte-buffer) vec) @@ -200,8 +218,8 @@ (let ((mybuf (byte-buffer 32))) (format t "Mybuf: ~A~%" mybuf) (assert (eql 32 (remaining mybuf))) - (inc-position mybuf 2) - (assert (eql 30 (remaining mybuf))) + (inc-position mybuf 4) + (assert (eql 28 (remaining mybuf))) (format t "Mybuf: ~A~%" mybuf) (%memset (buffer-buf mybuf) 78 4) @@ -221,6 +239,9 @@ (copy-buffer mybuf test-copy) (format t "new copy: ~A~%" test-copy)) + (setf (buffer-position mybuf) 0) + (format t "bytebuffer-read-32 ~X~%" (bytebuffer-read-32 mybuf)) + (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 Sat Jan 27 20:43:47 2007 @@ -27,5 +27,8 @@ (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 copy-buffer + byte-buffer free-buffer remaining inc-position get-string buffer-buf + bytebuffer-write-vector bytebuffer-write-string + bytebuffer-read-vector bytebuffer-read-string bytebuffer-read-8 bytebuffer-read-32 + flip unflip clear buffer-position copy-buffer buffer-capacity )) 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 Sat Jan 27 20:43:47 2007 @@ -161,7 +161,7 @@ (setf (foreign-read-buffer async-fd) new-buffer)))) -;(recom +;TODO actually deal with cuffer allocation failure (defmethod recommend-buffer-size((async-fd async-fd) mode size) (if (> size +MAX-BUFFER-SIZE-BYTES+) nil (ecase mode 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 Sat Jan 27 20:43:47 2007 @@ -30,6 +30,7 @@ ;; async-fd.lisp async-fd process-read process-write foreign-read-buffer foreign-write-buffer close-sm + recommend-buffer-size ;; async-socket.lisp 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 Sat Jan 27 20:43:47 2007 @@ -40,18 +40,29 @@ (defmethod get-packet ((pf yarpc-packet-factory) buf) (flip buf) - (let ((ret (if (> (remaining buf) 0) ;; First byte denotes packet ID - (ecase (elt (bytebuffer-read-vector buf 1) 0) - (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)) - ret)) + (if (>= (remaining buf) +yarpc-packet-header-size+) ;; First byte denotes packet ID ;;bytes 2,3,4,5 denote packet size + (let ((packet-id (bytebuffer-read-8 buf)) + (packet-length (bytebuffer-read-32 buf))) + (if (<= (- packet-length +yarpc-packet-header-size+) (remaining buf)) ;is the whole packet available in the buffer? + (ecase packet-id + (0 (progn (format-log t "yarpc-packet-factory:get-packet - got CALL-METHOD-PACKET-ID~%") (call-method-packet (bytebuffer-read-string buf (- packet-length +yarpc-packet-header-size+))))) + (1 (progn (format-log t "yarpc-packet-factory:get-packet - got METHOD-RESPONSE-PACKET-ID~%") (method-response-packet (bytebuffer-read-string buf (- packet-length +yarpc-packet-header-size+)))))) + (let ((buffer-capacity (buffer-capacity buf))) + ;Failed to read a whole packet unflip and check size + (unflip buf) + (if (> packet-length buffer-capacity) (error 'buffer-too-small-error :recommended-size packet-length))))))) + + (defclass call-method-packet (packet)((call-string :initarg :call-string :accessor call-string))) +(defconstant +PACKET-ID-SIZE+ 1) +(defconstant +PACKET-LENGTH-SIZE+ 4) + +(defconstant +yarpc-packet-header-size+ + (+ +PACKET-ID-SIZE+ +PACKET-LENGTH-SIZE+)) + (defun call-method-packet (call-string) (make-instance 'call-method-packet :call-string call-string)) 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 Sat Jan 27 20:43:47 2007 @@ -78,3 +78,12 @@ ; Get the packet in buf using the packet factory (defgeneric get-packet (packet-factory buf)) + +;Used to signal that the packet wants a larger buffer to complete this packet +(define-condition buffer-too-small-error (error) + ((recommended-size :initarg :recommended-size))) + +(defun buffer-too-small-error(recommended-size) + (make-instance 'buffer-too-small-error :recommended-size recommended-size)) + +

1 0

[nio-cvs] r52 - branches/home/psmith/restructure/src/buffer
by psmith＠common-lisp.net 25 Jan '07

25 Jan '07

Author: psmith Date: Wed Jan 24 22:38:10 2007 New Revision: 52 Modified: branches/home/psmith/restructure/src/buffer/buffer.lisp Log: added copy-buffer test 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 Wed Jan 24 22:38:10 2007 @@ -103,7 +103,7 @@ (defmethod print-object ((byte-buffer byte-buffer) stream) (with-slots (capacity position limit buf) byte-buffer - (format stream "<byte-buffer :capacity ~A :position ~A :limit ~A :buf ~%~A>~%" capacity position limit (if buf (pretty-hex-dump (cffi:pointer-address buf) limit) nil)))) + (format stream "<byte-buffer :capacity ~A :position ~A :limit ~A :buf ~%~A>~%" capacity position limit (if buf (hex-dump-memory (cffi:pointer-address buf) limit) nil)))) (defmethod free-buffer((byte-buffer byte-buffer)) (with-slots (capacity position limit buf) byte-buffer @@ -180,7 +180,9 @@ (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))) + (%memcpy (buffer-buf new) (buffer-buf old) (buffer-capacity old)) + (setf (buffer-position new) (buffer-position old)) + (setf (buffer-limit new) (buffer-limit old))) ;void *memcpy(void *dest, const void *src, size_t n); (cffi:defcfun ("memcpy" %memcpy) :pointer @@ -205,8 +207,8 @@ (%memset (buffer-buf mybuf) 78 4) (format t "Mybuf (after memset): ~A~%" mybuf) -; (flip mybuf) -; (format t "Mybuf (after flip): ~A~%" mybuf) + (flip mybuf) + (format t "Mybuf (after flip): ~A~%" mybuf) (format t "Remaining ~A~%" (remaining mybuf))

1 0