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