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

[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

[nio-cvs] r21 - branches/home/psmith/restructure/src/protocol/http
by psmith＠common-lisp.net 28 Dec '06

28 Dec '06

Author: psmith Date: Wed Dec 27 20:34:39 2006 New Revision: 21 Modified: branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp branches/home/psmith/restructure/src/protocol/http/nio-http-package.lisp branches/home/psmith/restructure/src/protocol/http/nio-http.asd Log: Done nio-http 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 Dec 27 20:34:39 2006 @@ -29,7 +29,7 @@ (declaim (optimize (debug 3) (speed 3) (space 0))) ;; A SM that speaks HTTP -(defclass http-state-machine (state-machine)()) +(defclass http-state-machine (async-fd)()) (defmethod process-read((sm http-state-machine)) (with-slots (foreign-read-buffer foreign-write-buffer) 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 Dec 27 20:34:39 2006 @@ -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 :packets :nio) +(defpackage :nio-http (:use :cl :nio) (:export 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 Wed Dec 27 20:34:39 2006 @@ -8,4 +8,4 @@ (:file "http-response" :depends-on ("nio-http-package")) ) - :depends-on (:packets)) \ No newline at end of file + :depends-on (:nio)) \ No newline at end of file

1 0

[nio-cvs] r20 - branches/home/psmith/restructure/src/io
by psmith＠common-lisp.net 28 Dec '06

28 Dec '06

Author: psmith Date: Wed Dec 27 20:31:08 2006 New Revision: 20 Modified: branches/home/psmith/restructure/src/io/nio.asd Log: done io 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 Dec 27 20:31:08 2006 @@ -4,11 +4,11 @@ (defsystem :nio - :components ((:file "nio") - (:file "fd-helper" :depends-on ("nio")) - (:file "async-fd" :depends-on ("nio" "fd-helper")) + :components ((:file "nio-package") + (:file "fd-helper" :depends-on ("nio-package")) + (:file "async-fd" :depends-on ("fd-helper")) (:file "async-socket" :depends-on ("async-fd")) ) - :depends-on (:cffi :event-notification :nio-buffer)) + :depends-on (:cffi :event-notification :nio-buffer :nio-compat))

1 0

[nio-cvs] r19 - branches/home/psmith/restructure/src/buffer
by psmith＠common-lisp.net 28 Dec '06

28 Dec '06

Author: psmith Date: Wed Dec 27 20:27:34 2006 New Revision: 19 Added: branches/home/psmith/restructure/src/buffer/nio-buffer-package.lisp - copied unchanged from r14, branches/home/psmith/restructure/src/buffer/nio-buffer.lisp Removed: branches/home/psmith/restructure/src/buffer/nio-buffer.lisp Modified: branches/home/psmith/restructure/src/buffer/nio-buffer.asd Log: updated buffer package Modified: branches/home/psmith/restructure/src/buffer/nio-buffer.asd ============================================================================== --- branches/home/psmith/restructure/src/buffer/nio-buffer.asd (original) +++ branches/home/psmith/restructure/src/buffer/nio-buffer.asd Wed Dec 27 20:27:34 2006 @@ -4,8 +4,8 @@ (defsystem :nio-buffer - :components ((:file "src/buffer/nio-buffer") - (:file "src/buffer/buffer" :depends-on ("src/buffer/nio-buffer")) + :components ((:file "nio-buffer-package") + (:file "buffer" :depends-on ("nio-buffer-package")) ) :depends-on (:cffi))

1 0

[nio-cvs] r18 - in branches/home/psmith/restructure: . src/compat src/io src/old
by psmith＠common-lisp.net 28 Dec '06

28 Dec '06

Author: psmith Date: Wed Dec 27 20:20:51 2006 New Revision: 18 Added: branches/home/psmith/restructure/src/io/nio-package.lisp - copied, changed from r16, branches/home/psmith/restructure/src/io/nio.lisp branches/home/psmith/restructure/src/old/nio-httpd.asd - copied unchanged from r13, branches/home/psmith/restructure/nio-httpd.asd Removed: branches/home/psmith/restructure/nio-httpd.asd branches/home/psmith/restructure/src/io/nio.lisp Modified: branches/home/psmith/restructure/src/compat/errno.lisp branches/home/psmith/restructure/src/io/async-fd.lisp Log: getting there... Modified: branches/home/psmith/restructure/src/compat/errno.lisp ============================================================================== --- branches/home/psmith/restructure/src/compat/errno.lisp (original) +++ branches/home/psmith/restructure/src/compat/errno.lisp Wed Dec 27 20:20:51 2006 @@ -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. |# -(in-package :event-notification) +(in-package :nio-compat) (declaim (optimize (debug 3) (speed 3) (space 0))) 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 Dec 27 20:20:51 2006 @@ -123,9 +123,9 @@ ((< new-bytes 0) (progn -;;pdw - this is not necessarily an error if the ret is -1 and errno is EAGAIN (and we're in nbio mode - which we are) +;;TODO if ret is -1 and errno is EAGAIN save state and wait for notification - (format t "read-error - Errno: ~A~%" (sb-alien:get-errno)) + (format t "read-error - Errno: ~A~%" (get-errno)) (error 'read-error))) ((= new-bytes 0) Copied: branches/home/psmith/restructure/src/io/nio-package.lisp (from r16, branches/home/psmith/restructure/src/io/nio.lisp) ============================================================================== --- branches/home/psmith/restructure/src/io/nio.lisp (original) +++ branches/home/psmith/restructure/src/io/nio-package.lisp Wed Dec 27 20:20:51 2006 @@ -24,7 +24,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |# -(defpackage :nio (:use :cl :cffi :event-notification :nio-buffer) +(defpackage :nio (:use :cl :cffi :event-notification :nio-buffer :nio-compat) (:export

1 0

[nio-cvs] r17 - in branches/home/psmith/restructure: . src src/buffer src/compat src/event
by psmith＠common-lisp.net 28 Dec '06

28 Dec '06

Author: psmith Date: Wed Dec 27 20:05:42 2006 New Revision: 17 Added: branches/home/psmith/restructure/src/buffer/nio-buffer.asd - copied unchanged from r14, branches/home/psmith/restructure/nio-buffer.asd branches/home/psmith/restructure/src/compat/nio-compat-package.lisp branches/home/psmith/restructure/src/compat/nio-compat.asd Removed: branches/home/psmith/restructure/nio-buffer.asd branches/home/psmith/restructure/src/load.lisp Modified: branches/home/psmith/restructure/src/event/event-notification.asd Log: more tidy Added: branches/home/psmith/restructure/src/compat/nio-compat-package.lisp ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/src/compat/nio-compat-package.lisp Wed Dec 27 20:05:42 2006 @@ -0,0 +1,34 @@ +#| +Copyright (c) 2006 Risto Laakso +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-compat (:use :cl) + + (:export + + ;; errno.lisp + get-errno +ERRNO_EAGAIN+ + + )) Added: branches/home/psmith/restructure/src/compat/nio-compat.asd ============================================================================== --- (empty file) +++ branches/home/psmith/restructure/src/compat/nio-compat.asd Wed Dec 27 20:05:42 2006 @@ -0,0 +1,12 @@ +;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- + +(in-package :asdf) + +(defsystem :nio-compat + + :components ((:file "nio-compat-package") + (:file "errno" :depends-on ("nio-compat-package")) + ) + + :depends-on ()) + Modified: branches/home/psmith/restructure/src/event/event-notification.asd ============================================================================== --- branches/home/psmith/restructure/src/event/event-notification.asd (original) +++ branches/home/psmith/restructure/src/event/event-notification.asd Wed Dec 27 20:05:42 2006 @@ -4,12 +4,11 @@ (defsystem :event-notification - :components ((:file "src/event-notification") - (:file "src/kqueue-cffi" :depends-on ("src/event-notification")) - (:file "src/epoll-cffi" :depends-on ("src/event-notification")) - (:file "src/kqueue" :depends-on ("src/event-notification" "src/kqueue-cffi")) - (:file "src/errno") - (:file "src/epoll" :depends-on ("src/event-notification" "src/epoll-cffi" "src/errno"))) + :components ((:file "event-notification") + (:file "kqueue-cffi" :depends-on ("event-notification")) + (:file "epoll-cffi" :depends-on ("event-notification")) + (:file "kqueue" :depends-on ("event-notification" "kqueue-cffi")) + (:file "epoll" :depends-on ("event-notification" "epoll-cffi"))) - :depends-on (:cffi)) + :depends-on (:cffi :nio-compat))

1 0

[nio-cvs] r16 - in branches/home/psmith/restructure/src: . compat io
by psmith＠common-lisp.net 28 Dec '06

28 Dec '06

Author: psmith Date: Wed Dec 27 19:37:50 2006 New Revision: 16 Added: branches/home/psmith/restructure/src/compat/ branches/home/psmith/restructure/src/compat/errno.lisp - copied unchanged from r14, branches/home/psmith/restructure/src/errno.lisp branches/home/psmith/restructure/src/io/packet.lisp - copied unchanged from r15, branches/home/psmith/restructure/src/packet.lisp Removed: branches/home/psmith/restructure/src/errno.lisp branches/home/psmith/restructure/src/packet.lisp Modified: branches/home/psmith/restructure/src/io/nio.asd branches/home/psmith/restructure/src/io/nio.lisp Log: more tidy 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 Dec 27 19:37:50 2006 @@ -4,12 +4,11 @@ (defsystem :nio - :components ((:file "src/nio") - (:file "src/fd-helper" :depends-on ("src/nio")) - (:file "src/async-fd" :depends-on ("src/nio" "src/fd-helper")) - (:file "src/http-state-machine" :depends-on ("src/async-fd")) - (:file "src/async-socket" :depends-on ("src/async-fd")) + :components ((:file "nio") + (:file "fd-helper" :depends-on ("nio")) + (:file "async-fd" :depends-on ("nio" "fd-helper")) + (:file "async-socket" :depends-on ("async-fd")) ) - :depends-on (:cffi :event-notification :nio-buffer :http-protocol)) + :depends-on (:cffi :event-notification :nio-buffer)) Modified: branches/home/psmith/restructure/src/io/nio.lisp ============================================================================== --- branches/home/psmith/restructure/src/io/nio.lisp (original) +++ branches/home/psmith/restructure/src/io/nio.lisp Wed Dec 27 19:37:50 2006 @@ -24,7 +24,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |# -(defpackage :nio (:use :cl :cffi :event-notification :nio-buffer :packets) +(defpackage :nio (:use :cl :cffi :event-notification :nio-buffer) (:export

1 0