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

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

08 Jan '07

Author: psmith Date: Sun Jan 7 21:41:42 2007 New Revision: 31 Modified: branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp Log: rpc progress 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 7 21:41:42 2007 @@ -29,5 +29,5 @@ (:export ;; yarpc-state-machine - yarpc-state-machine test-rpc + yarpc-state-machine test-rpc test-rpc-list test-rpc-string )) 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 7 21:41:42 2007 @@ -42,26 +42,18 @@ ;; (defclass yarpc-state-machine (async-fd)()) -(defmethod print-object ((sm yarpc-state-machine) stream) - (format stream "#<YARPC-STATE-MACHINE ~A >" (call-next-method sm nil))) -(defmethod process-read((sm yarpc-state-machine)) - (with-slots (foreign-read-buffer foreign-write-buffer) sm - (let ((fn-result (execute-call (sb-ext:octets-to-string (get-string foreign-read-buffer) :external-format :ascii)))) - (format t "process-read - function result: ~A~%" fn-result) - (nio-buffer:bytebuffer-write-string foreign-write-buffer (write-to-string fn-result) 0 :utf-8) - (close-sm sm)))) +;;TODO move somewhere suitable +(defparameter *remote-fns* nil) -(defun execute-call (call-string) - (let* ((*package* (find-package :nio-yarpc)) - (rpc-call-list (read-from-string call-string ))) - (apply (first rpc-call-list) (rest rpc-call-list)))) - +(defun register-remote-fn(name) + (push name *remote-fns*)) (defmacro defremote (name args &rest body) - `(defun ,name (,@args) ,@body)) - + `(progn + (defun ,name (,@args) ,@body) + (register-remote-fn #',name))) (defremote test-rpc-list() (list 3 "as" 's (code-char #x2211))) @@ -69,6 +61,36 @@ (defremote test-rpc-string(a b c) (format nil "response - ~A ~A ~A ~A~%" a b c (code-char #x2211))) +;;end move TODO + + +;;;Utils + +(defun print-hashtable (table &optional (stream t)) + (maphash #'(lambda (k v) (format stream "~a -> ~a~%" k v)) table)) +;;; + + +(defmethod print-object ((sm yarpc-state-machine) stream) + (format stream "#<YARPC-STATE-MACHINE ~A >" (call-next-method sm nil))) + +(defmethod process-read((sm yarpc-state-machine)) + (with-slots (foreign-read-buffer foreign-write-buffer) sm + (let ((fn-result (execute-call (sb-ext:octets-to-string (get-string foreign-read-buffer) :external-format :ascii)))) + (format t "process-read - function result: ~A~%" fn-result) + (nio-buffer:bytebuffer-write-string foreign-write-buffer (write-to-string fn-result) 0 :utf-8) + (close-sm sm)))) + + +(define-condition authorization-error (error) ()) + +(defun execute-call (call-string) + (handler-case + (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) + (if fn + (apply (first rpc-call-list) (rest rpc-call-list)) + (error 'authorization-error))) + (reader-error (re) (format t "No such function ~A~%" call-string)))) -(defremote my-remote-fn (arg1 arg2) - (format t "~A~A~%" arg1 arg2)) \ No newline at end of file

1 0

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

07 Jan '07

Author: psmith Date: Sun Jan 7 15:08:46 2007 New Revision: 30 Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp Log: Start of remote authorization 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 7 15:08:46 2007 @@ -38,7 +38,7 @@ ;; Connected to 127.0.0.1. ;; Escape character is '^]'. ;; (test-rpc "who" 2 's) -;; response - who 2 'S ∑ +;; response - who 2 'S ;; (defclass yarpc-state-machine (async-fd)()) @@ -58,8 +58,17 @@ (rpc-call-list (read-from-string call-string ))) (apply (first rpc-call-list) (rest rpc-call-list)))) -(defun test-rpc-list() + +(defmacro defremote (name args &rest body) + `(defun ,name (,@args) ,@body)) + + +(defremote test-rpc-list() (list 3 "as" 's (code-char #x2211))) -(defun test-rpc-string(a b c) +(defremote test-rpc-string(a b c) (format nil "response - ~A ~A ~A ~A~%" a b c (code-char #x2211))) + + +(defremote my-remote-fn (arg1 arg2) + (format t "~A~A~%" arg1 arg2)) \ No newline at end of file

1 0

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

06 Jan '07

Author: psmith Date: Sat Jan 6 01:08:44 2007 New Revision: 29 Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp Log: yarpc: allow return types other than string 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 Sat Jan 6 01:08:44 2007 @@ -49,7 +49,7 @@ (with-slots (foreign-read-buffer foreign-write-buffer) sm (let ((fn-result (execute-call (sb-ext:octets-to-string (get-string foreign-read-buffer) :external-format :ascii)))) (format t "process-read - function result: ~A~%" fn-result) - (nio-buffer:bytebuffer-write-string foreign-write-buffer fn-result 0 :utf-8) + (nio-buffer:bytebuffer-write-string foreign-write-buffer (write-to-string fn-result) 0 :utf-8) (close-sm sm)))) @@ -58,6 +58,8 @@ (rpc-call-list (read-from-string call-string ))) (apply (first rpc-call-list) (rest rpc-call-list)))) +(defun test-rpc-list() + (list 3 "as" 's (code-char #x2211))) -(defun test-rpc(a b c) +(defun test-rpc-string(a b c) (format nil "response - ~A ~A ~A ~A~%" a b c (code-char #x2211)))

1 0

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

06 Jan '07

Author: psmith Date: Sat Jan 6 00:28:54 2007 New Revision: 28 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/http/http-state-machine.lisp branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp Log: tidy up 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 6 00:28:54 2007 @@ -78,16 +78,16 @@ (defclass byte-buffer (buffer)()) (defun byte-buffer (capacity) - (make-instance 'byte-buffer :capacity capacity :limit capacity :position 0 :buf (foreign-alloc :uint8 :count 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 (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 - (foreign-free buf) + (cffi:foreign-free buf) (setf buf NIL) (setf capacity 0) (setf limit 0) @@ -140,23 +140,13 @@ 0 (progn (clear byte-buffer) - (let ((bytes-written (mem-write-vector vec (buffer-buf byte-buffer) :unsigned-char))) + (let ((bytes-written (cffi:mem-write-vector vec (buffer-buf byte-buffer) :unsigned-char))) (format t "bytebuffer-write-vector - byteswritten: ~A" bytes-written) (inc-position byte-buffer bytes-written) bytes-written)))) -(defmethod map-to-foreign ((byte-buffer byte-buffer) seq &optional (start 0) (end (length seq))) - "Map SEQ to foreign array." - (clear byte-buffer) - (let* ((len (- end start))) - (loop for i from 0 below len do - (setf (mem-aref (buffer-buf byte-buffer) :uint8 i) (aref seq (+ start i))))) - (inc-position byte-buffer end)) - - - -(defcfun ("memset" %memset) :pointer +(cffi:defcfun ("memset" %memset) :pointer (buffer :pointer) (byte :int) (len :int)) 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 6 00:28:54 2007 @@ -24,8 +24,8 @@ (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-buffer (:use :cl :cffi) +(defpackage :nio-buffer (:use :cl) (:export - byte-buffer free-buffer remaining inc-position get-string buffer-buf bytebuffer-write-vector bytebuffer-write-string flip map-to-foreign + byte-buffer free-buffer remaining inc-position get-string buffer-buf bytebuffer-write-vector bytebuffer-write-string flip )) Modified: branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp (original) +++ branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp Sat Jan 6 00:28:54 2007 @@ -38,7 +38,7 @@ (defmethod process-read((sm http-state-machine)) (with-slots (foreign-read-buffer foreign-write-buffer) sm #+nio-debug (format t "process-read got: ~A~%" (get-string foreign-read-buffer)) - (nio-buffer:map-to-foreign foreign-write-buffer (get-bytes (http-response :status :ok :html "<html> ock </html>"))) + (nio-buffer:bytebuffer-write-vector foreign-write-buffer (get-bytes (http-response :status :ok :html "<html> ock </html>"))) (close-sm sm))) 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 Sat Jan 6 00:28:54 2007 @@ -39,7 +39,7 @@ ;; Escape character is '^]'. ;; (test-rpc "who" 2 's) ;; response - who 2 'S ∑ - +;; (defclass yarpc-state-machine (async-fd)()) (defmethod print-object ((sm yarpc-state-machine) stream)

1 0

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

06 Jan '07

Author: psmith Date: Fri Jan 5 23:42:00 2007 New Revision: 27 Added: branches/home/psmith/restructure/TODO branches/home/psmith/restructure/run-http.lisp - copied unchanged from r25, branches/home/psmith/restructure/run.lisp branches/home/psmith/restructure/run-yarpc.lisp - copied, changed from r25, branches/home/psmith/restructure/run.lisp branches/home/psmith/restructure/run.sh (contents, props changed) branches/home/psmith/restructure/src/protocol/yarpc/ branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc.asd branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp Removed: branches/home/psmith/restructure/run.lisp Modified: branches/home/psmith/restructure/patches/cffi_0.9.2-mem_rw.diff branches/home/psmith/restructure/src/buffer/buffer.lisp branches/home/psmith/restructure/src/buffer/nio-buffer-package.lisp Log: Added first steps of YetAnotherRPC protocol Added: branches/home/psmith/restructure/TODO ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/TODO Fri Jan 5 23:42:00 2007 @@ -0,0 +1,14 @@ +Do eagain queue + +Look into possibility of using chunga for chunked encoding on top of +nio-buffer for http. + +Reinstate nio-httpd with new structure (dependency on above). + +Simple API: Consider buffered-state-machine layer which just buffers +everything and assumes we have enough memory, which will allow classic +coding style for people who dont need direct memory / low level control. + +Create UDP server + +Create RPC server / client Modified: branches/home/psmith/restructure/patches/cffi_0.9.2-mem_rw.diff ============================================================================== --- branches/home/psmith/restructure/patches/cffi_0.9.2-mem_rw.diff (original) +++ branches/home/psmith/restructure/patches/cffi_0.9.2-mem_rw.diff Fri Jan 5 23:42:00 2007 @@ -18,7 +18,7 @@ > (defun mem-write-vector (vector ptr type &optional (count (length vector)) (offset 0)) > (loop for i below count > for off from offset by (%foreign-type-size type) -> do (setf (%mem-ref ptr type off) (aref vector i)) +> do (%mem-set (aref vector i) ptr type off) > finally (return i))) > > Copied: branches/home/psmith/restructure/run-yarpc.lisp (from r25, branches/home/psmith/restructure/run.lisp) ============================================================================== --- branches/home/psmith/restructure/run.lisp (original) +++ branches/home/psmith/restructure/run-yarpc.lisp Fri Jan 5 23:42:00 2007 @@ -1,4 +1,4 @@ (push :nio-debug *features*) (require :asdf) -(require :nio-http) -(nio:start-server 'identity 'identity 'nio-http:http-state-machine :host "127.0.0.1") +(require :nio-yarpc) +(nio:start-server 'identity 'identity 'nio-yarpc:yarpc-state-machine :host "127.0.0.1") Added: branches/home/psmith/restructure/run.sh ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/run.sh Fri Jan 5 23:42:00 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/buffer/buffer.lisp ============================================================================== --- branches/home/psmith/restructure/src/buffer/buffer.lisp (original) +++ branches/home/psmith/restructure/src/buffer/buffer.lisp Fri Jan 5 23:42:00 2007 @@ -129,9 +129,9 @@ ;;TODO ;;mem-write-vector (vector ptr type &optional (count (length vector)) (offset 0)) -(defmethod bytebuffer-write-string((byte-buffer byte-buffer) str &optional (index 0)) +(defmethod bytebuffer-write-string((byte-buffer byte-buffer) str &optional (index 0) (external-format :ascii)) :documentation "Returns number of bytes written to bytebuffer" - (bytebuffer-write-vector byte-buffer (sb-ext:string-to-octets str :external-format :ascii))) + (bytebuffer-write-vector byte-buffer (sb-ext:string-to-octets str :external-format external-format))) ;;TODO rename (defmethod bytebuffer-write-vector((byte-buffer byte-buffer) vec &optional (index 0)) 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 Fri Jan 5 23:42:00 2007 @@ -27,5 +27,5 @@ (defpackage :nio-buffer (:use :cl :cffi) (:export - byte-buffer free-buffer remaining inc-position get-string buffer-buf bytebuffer-write-vector flip map-to-foreign + byte-buffer free-buffer remaining inc-position get-string buffer-buf bytebuffer-write-vector bytebuffer-write-string flip map-to-foreign )) Added: branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp Fri Jan 5 23:42:00 2007 @@ -0,0 +1,33 @@ +#| +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. +|# +(defpackage :nio-yarpc (:use :cl :nio :nio-buffer) + + (:export + + ;; yarpc-state-machine + yarpc-state-machine test-rpc + )) Added: branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc.asd ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc.asd Fri Jan 5 23:42:00 2007 @@ -0,0 +1,11 @@ +;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- + +(in-package :asdf) + +(defsystem :nio-yarpc + + :components ((:file "nio-yarpc-package") + (:file "yarpc-state-machine" :depends-on ("nio-yarpc-package")) + ) + + :depends-on (:nio)) \ No newline at end of file Added: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp Fri Jan 5 23:42:00 2007 @@ -0,0 +1,63 @@ +#| +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-yarpc) + +(declaim (optimize (debug 3) (speed 3) (space 0))) + +;; YetAnotherRPC state machine +;; +;; A server that processes remote procedure calls and returns results +;; +;; Test with: +;; > telnet 127.0.0.1 16323 +;; Trying 127.0.0.1... +;; Connected to 127.0.0.1. +;; Escape character is '^]'. +;; (test-rpc "who" 2 's) +;; response - who 2 'S ∑ + +(defclass yarpc-state-machine (async-fd)()) + +(defmethod print-object ((sm yarpc-state-machine) stream) + (format stream "#<YARPC-STATE-MACHINE ~A >" (call-next-method sm nil))) + +(defmethod process-read((sm yarpc-state-machine)) + (with-slots (foreign-read-buffer foreign-write-buffer) sm + (let ((fn-result (execute-call (sb-ext:octets-to-string (get-string foreign-read-buffer) :external-format :ascii)))) + (format t "process-read - function result: ~A~%" fn-result) + (nio-buffer:bytebuffer-write-string foreign-write-buffer fn-result 0 :utf-8) + (close-sm sm)))) + + +(defun execute-call (call-string) + (let* ((*package* (find-package :nio-yarpc)) + (rpc-call-list (read-from-string call-string ))) + (apply (first rpc-call-list) (rest rpc-call-list)))) + + +(defun test-rpc(a b c) + (format nil "response - ~A ~A ~A ~A~%" a b c (code-char #x2211)))

1 0

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

04 Jan '07

Author: psmith Date: Thu Jan 4 18:20:01 2007 New Revision: 26 Modified: branches/home/psmith/restructure/src/event/event-notification.lisp Log: Added dependency for errno to event-notification Modified: branches/home/psmith/restructure/src/event/event-notification.lisp ============================================================================== --- branches/home/psmith/restructure/src/event/event-notification.lisp (original) +++ branches/home/psmith/restructure/src/event/event-notification.lisp Thu Jan 4 18:20:01 2007 @@ -24,6 +24,6 @@ (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 :event-notification (:use :cl :cffi) +(defpackage :event-notification (:use :cl :cffi :nio-compat) (:export make-event-queue add-fd remove-fd poll-events poll-error read-event-p write-event-p)) \ No newline at end of file

1 0

[nio-cvs] r25 - branches/home/psmith/restructure/patches
by psmith＠common-lisp.net 04 Jan '07

04 Jan '07

Author: psmith Date: Wed Jan 3 23:29:35 2007 New Revision: 25 Added: branches/home/psmith/restructure/patches/ branches/home/psmith/restructure/patches/cffi_0.9.2-mem_rw.diff Log: NIO needs following patch needed to cffi Added: branches/home/psmith/restructure/patches/cffi_0.9.2-mem_rw.diff ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/patches/cffi_0.9.2-mem_rw.diff Wed Jan 3 23:29:35 2007 @@ -0,0 +1,24 @@ +58c58,60 +< #:cancel-finalization)) +--- +> #:cancel-finalization +> #:mem-read-vector +> #:mem-write-vector)) +319a322,338 +> +> +> ;;from http://common-lisp.net/project/cffi/darcs/cffi/doc/mem-vector.txt +> +> (defun mem-read-vector (vector ptr type count &optional (offset 0)) +> (loop for i below (min count (length vector)) +> for off from offset by (%foreign-type-size type) +> do (setf (aref vector i) (%mem-ref ptr type off)) +> finally (return i))) +> +> (defun mem-write-vector (vector ptr type &optional (count (length vector)) (offset 0)) +> (loop for i below count +> for off from offset by (%foreign-type-size type) +> do (setf (%mem-ref ptr type off) (aref vector i)) +> finally (return i))) +> +>

1 0

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

04 Jan '07

Author: psmith Date: Wed Jan 3 23:10:39 2007 New Revision: 24 Modified: branches/home/psmith/restructure/src/io/async-fd.lisp branches/home/psmith/restructure/src/io/nio.asd branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp Log: Corrected packet defn 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 Wed Jan 3 23:10:39 2007 @@ -99,20 +99,8 @@ (with-slots (close-pending) async-fd (setf close-pending t))) - -(defclass packet () - ((buffer :initarg :buffer :initform nil :documentation "Foreign array") - (size :initarg :size :initform 0) - (written :initarg :written :initform 0))) - - ;;; FUNCTIONS - - - - - (define-condition read-error (error) ()) ;; "Read more data from STATE-MACHINE." 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 Wed Jan 3 23:10:39 2007 @@ -6,6 +6,7 @@ :components ((:file "nio-package") (:file "fd-helper" :depends-on ("nio-package")) + (:file "packet" :depends-on ("nio-package")) (:file "async-fd" :depends-on ("fd-helper")) (:file "async-socket" :depends-on ("async-fd")) (:file "nio-server" :depends-on ("async-socket")) Modified: branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp (original) +++ branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp Wed Jan 3 23:10:39 2007 @@ -38,13 +38,10 @@ (defmethod process-read((sm http-state-machine)) (with-slots (foreign-read-buffer foreign-write-buffer) sm #+nio-debug (format t "process-read got: ~A~%" (get-string foreign-read-buffer)) -;;todo create packet and get-bytes (nio-buffer:map-to-foreign foreign-write-buffer (get-bytes (http-response :status :ok :html "<html> ock </html>"))) (close-sm sm))) -;;end TODO - (defun page-not-found (client) (serve-content client :not-found "text/html" (string-to-octets "<html><body><h3>404 Page not found</h3>The requested URL was not found on this server.</body></html>")))

1 0

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

04 Jan '07

Author: psmith Date: Wed Jan 3 20:55:33 2007 New Revision: 23 Added: branches/home/psmith/restructure/README branches/home/psmith/restructure/src/io/nio-server.lisp - copied, changed from r22, branches/home/psmith/restructure/src/nio-server.lisp Removed: branches/home/psmith/restructure/src/nio-server.lisp Modified: branches/home/psmith/restructure/run.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.asd branches/home/psmith/restructure/src/protocol/http/http-response.lisp branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp branches/home/psmith/restructure/src/protocol/http/nio-http-package.lisp Log: moved nio-server into nio package narrowed nio external i/f back to base working case after restructure Added: branches/home/psmith/restructure/README ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/README Wed Jan 3 20:55:33 2007 @@ -0,0 +1,5 @@ +To run install asd's + +sbcl --load run.lisp + +wget http://localhost:16323/index.html Modified: branches/home/psmith/restructure/run.lisp ============================================================================== --- branches/home/psmith/restructure/run.lisp (original) +++ branches/home/psmith/restructure/run.lisp Wed Jan 3 20:55:33 2007 @@ -1,5 +1,4 @@ (push :nio-debug *features*) (require :asdf) (require :nio-http) -(load "src/nio-server") -(nio-server:start-server 'identity 'identity 'nio-http:http-state-machine :host "127.0.0.1") +(nio:start-server 'identity 'identity 'nio-http:http-state-machine :host "127.0.0.1") 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 Wed Jan 3 20:55:33 2007 @@ -40,10 +40,12 @@ (defclass async-fd () - ((write-fd :initarg :write-fd) + ((write-fd :initarg :write-fd + :accessor write-fd) ;; (write-queue :initform nil) - (read-fd :initarg :read-fd) + (read-fd :initarg :read-fd + :accessor read-fd) (foreign-read-buffer :initform (byte-buffer 4096)) (foreign-write-buffer :initform (byte-buffer 4096) @@ -69,16 +71,25 @@ )) -;'http-state-machine + +(defmethod print-object ((async-fd async-fd) stream) + (with-slots (read-fd write-fd) async-fd + (format stream "#<ASYNC-FD r/w fd: ~D/~D.>" + read-fd write-fd))) + + +;;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) (nio-buffer:flip (foreign-write-buffer sm)) sm)) -;;override this in concrete SM for read -(defmethod process-read((async-fd async-fd))()) +;;Implement this in concrete SM for read +(defgeneric process-read (async-fd)) ;;override this in concrete SM for close +;(defmethod process-close((async-fd async-fd)reason)()) (defmethod process-close((async-fd async-fd)reason)()) @@ -89,13 +100,6 @@ (setf close-pending t))) - -(defmethod print-object ((async-fd async-fd) stream) - (with-slots (read-fd write-fd) async-fd - (format stream "#<ASYNC-FD r/w fd: ~D/~D.>~%" - read-fd write-fd))) - - (defclass packet () ((buffer :initarg :buffer :initform nil :documentation "Foreign array") (size :initarg :size :initform 0) @@ -114,7 +118,7 @@ ;; "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) + (format t "read-more called with ~A~%" state-machine) #+nio-debug (format t "read-more - calling read()~%") (let ((new-bytes (%read read-fd (buffer-buf foreign-read-buffer) (remaining foreign-read-buffer)))) 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 Wed Jan 3 20:55:33 2007 @@ -29,15 +29,13 @@ (:export ;; async-fd.lisp - set-fd-nonblocking close-fd read-more write-more - async-write-seq close-async-fd force-close-async-fd - async-fd-read-fd async-fd-write-fd - add-async-fd remove-async-fd - set-accept-filter set-read-callback - read-error async-fd + async-fd process-read foreign-read-buffer foreign-write-buffer close-sm ;; async-socket.lisp - make-inet-socket make-inet6-socket - bind-inet-socket bind-inet6-socket - start-listen socket-accept remote-info + + ;;nio-server + start-server + + ;;packet + packet )) Copied: branches/home/psmith/restructure/src/io/nio-server.lisp (from r22, branches/home/psmith/restructure/src/nio-server.lisp) ============================================================================== --- branches/home/psmith/restructure/src/nio-server.lisp (original) +++ branches/home/psmith/restructure/src/io/nio-server.lisp Wed Jan 3 20:55:33 2007 @@ -24,9 +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-server (:use :cl :nio :event-notification) - (:export start-server)) -(in-package :nio-server) +(in-package :nio) (declaim (optimize (debug 3) (speed 3) (space 0))) 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 Wed Jan 3 20:55:33 2007 @@ -8,6 +8,7 @@ (:file "fd-helper" :depends-on ("nio-package")) (:file "async-fd" :depends-on ("fd-helper")) (:file "async-socket" :depends-on ("async-fd")) + (:file "nio-server" :depends-on ("async-socket")) ) :depends-on (:cffi :event-notification :nio-buffer :nio-compat)) Modified: branches/home/psmith/restructure/src/protocol/http/http-response.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/http/http-response.lisp (original) +++ branches/home/psmith/restructure/src/protocol/http/http-response.lisp Wed Jan 3 20:55:33 2007 @@ -69,7 +69,7 @@ (defmethod get-bytes ((http-response http-response)) (with-slots (status html) http-response - (sb-ext:string-to-octets (get-packet status "text/html" html)))) + (get-packet status "text/html" html))) Modified: branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp (original) +++ branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp Wed Jan 3 20:55:33 2007 @@ -31,12 +31,15 @@ ;; A SM that speaks HTTP (defclass http-state-machine (async-fd)()) +(defmethod print-object ((sm http-state-machine) stream) + (format stream "#<HTTP-STATE-MACHINE ~A >" (call-next-method sm nil))) + + (defmethod process-read((sm http-state-machine)) (with-slots (foreign-read-buffer foreign-write-buffer) sm #+nio-debug (format t "process-read got: ~A~%" (get-string foreign-read-buffer)) ;;todo create packet and get-bytes - - (get-bytes (http-response :status :ok :html "<html> ock </html>")) + (nio-buffer:map-to-foreign foreign-write-buffer (get-bytes (http-response :status :ok :html "<html> ock </html>"))) (close-sm sm))) Modified: branches/home/psmith/restructure/src/protocol/http/nio-http-package.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/http/nio-http-package.lisp (original) +++ branches/home/psmith/restructure/src/protocol/http/nio-http-package.lisp Wed Jan 3 20:55:33 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-http (:use :cl :nio) +(defpackage :nio-http (:use :cl :nio :nio-buffer) (:export

1 0

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

02 Jan '07

Author: psmith Date: Mon Jan 1 21:31:43 2007 New Revision: 22 Modified: branches/home/psmith/restructure/run.lisp branches/home/psmith/restructure/src/io/async-socket.lisp branches/home/psmith/restructure/src/io/nio-package.lisp branches/home/psmith/restructure/src/nio-server.lisp branches/home/psmith/restructure/src/protocol/http/nio-http-package.lisp branches/home/psmith/restructure/src/protocol/http/nio-http.asd Log: Parameterised protocol in nio-server Modified: branches/home/psmith/restructure/run.lisp ============================================================================== --- branches/home/psmith/restructure/run.lisp (original) +++ branches/home/psmith/restructure/run.lisp Mon Jan 1 21:31:43 2007 @@ -1,5 +1,5 @@ -;;(push :nio-debug *features*) +(push :nio-debug *features*) (require :asdf) -(require :nio) +(require :nio-http) (load "src/nio-server") -(nio-server:start-server 'identity 'identity :host "127.0.0.1") +(nio-server:start-server 'identity 'identity 'nio-http:http-state-machine :host "127.0.0.1") 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 1 21:31:43 2007 @@ -146,7 +146,7 @@ (remote-port :initform nil :initarg :remote-port))) -(defun socket-accept (socket-fd) +(defun socket-accept (socket-fd connection-type) "Accept connection from SOCKET-FD. Allocates and returns socket structure denoting the connection." (flet ((parse-inet6-addr (addr) @@ -170,7 +170,7 @@ ;; accept connection (let* ((res (%accept socket-fd addr len)) ;; (async-socket-fd (make-instance 'async-socket-fd :read-fd res :write-fd res))) - (async-socket-fd (create-state-machine res res (make-instance 'async-socket-fd)))) + (async-socket-fd (create-state-machine connection-type res res (make-instance 'async-socket-fd)))) (unless (< res 0) (let ((len-value (mem-ref len :unsigned-int))) 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 1 21:31:43 2007 @@ -34,7 +34,7 @@ async-fd-read-fd async-fd-write-fd add-async-fd remove-async-fd set-accept-filter set-read-callback - read-error + read-error async-fd ;; async-socket.lisp make-inet-socket make-inet6-socket Modified: branches/home/psmith/restructure/src/nio-server.lisp ============================================================================== --- branches/home/psmith/restructure/src/nio-server.lisp (original) +++ branches/home/psmith/restructure/src/nio-server.lisp Mon Jan 1 21:31:43 2007 @@ -35,8 +35,11 @@ ;; (format t "Accepting connection from ~S:~D [~A].~%" host port proto) t) -(defun start-server (connection-handler accept-filter &key - (protocol :inet) (port (+ (random 60000) 1024)) (host "localhost") +(defun start-server (connection-handler accept-filter connection-type + &key + (protocol :inet) + (port (+ (random 60000) 1024)) + (host "localhost") (accept-connection #'trivial-accept)) @@ -72,12 +75,12 @@ (loop for unix-epoll-events = (poll-events event-queue) do - (loop for (fd . event) in unix-epoll-events do + (loop for (fd . event) in unix-epoll-events do (cond ;; new connection ((= fd sock) - (let ((async-fd (socket-accept fd))) + (let ((async-fd (socket-accept fd connection-type))) #+nio-debug (format t "start-server - New conn: ~A~%" async-fd) (cond ((null async-fd) Modified: branches/home/psmith/restructure/src/protocol/http/nio-http-package.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/http/nio-http-package.lisp (original) +++ branches/home/psmith/restructure/src/protocol/http/nio-http-package.lisp Mon Jan 1 21:31:43 2007 @@ -28,6 +28,6 @@ (:export - ;; http-response - http-response + ;; http-state-machine + http-state-machine )) Modified: branches/home/psmith/restructure/src/protocol/http/nio-http.asd ============================================================================== --- branches/home/psmith/restructure/src/protocol/http/nio-http.asd (original) +++ branches/home/psmith/restructure/src/protocol/http/nio-http.asd Mon Jan 1 21:31:43 2007 @@ -6,6 +6,7 @@ :components ((:file "nio-http-package") (:file "http-response" :depends-on ("nio-http-package")) + (:file "http-state-machine" :depends-on ("nio-http-package")) ) :depends-on (:nio)) \ No newline at end of file

1 0