From c2504f207d18d477bc1a5c550cb8821b77b8844a Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 9 Dec 2008 17:49:03 -0600
Subject: [PATCH] Use kqueue on Mac OS X instead of select

---
 basis/io/unix/backend/backend.factor |  4 +--
 basis/io/unix/kqueue/kqueue.factor   | 40 ++++++++++++----------------
 basis/io/unix/macosx/macosx.factor   |  6 ++++-
 basis/unix/kqueue/kqueue.factor      |  3 ++-
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/basis/io/unix/backend/backend.factor b/basis/io/unix/backend/backend.factor
index 85363c8404..1666d60c83 100644
--- a/basis/io/unix/backend/backend.factor
+++ b/basis/io/unix/backend/backend.factor
@@ -64,10 +64,10 @@ M: mx remove-output-callbacks writes>> delete-at* drop ;
 GENERIC: wait-for-events ( ms mx -- )
 
 : input-available ( fd mx -- )
-    remove-input-callbacks [ resume ] each ;
+    reads>> delete-at* drop [ resume ] each ;
 
 : output-available ( fd mx -- )
-    remove-output-callbacks [ resume ] each ;
+    writes>> delete-at* drop [ resume ] each ;
 
 M: fd cancel-operation ( fd -- )
     dup disposed>> [ drop ] [
diff --git a/basis/io/unix/kqueue/kqueue.factor b/basis/io/unix/kqueue/kqueue.factor
index 6b687a8afb..b4e2b7af6f 100644
--- a/basis/io/unix/kqueue/kqueue.factor
+++ b/basis/io/unix/kqueue/kqueue.factor
@@ -2,10 +2,10 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types combinators io.unix.backend
 kernel math.bitwise sequences struct-arrays unix unix.kqueue
-unix.time ;
+unix.time assocs ;
 IN: io.unix.kqueue
 
-TUPLE: kqueue-mx < mx events monitors ;
+TUPLE: kqueue-mx < mx events ;
 
 : max-events ( -- n )
     #! We read up to 256 events at a time. This is an arbitrary
@@ -14,7 +14,6 @@ TUPLE: kqueue-mx < mx events monitors ;
 
 : <kqueue-mx> ( -- mx )
     kqueue-mx new-mx
-        H{ } clone >>monitors
         kqueue dup io-error >>fd
         max-events "kevent" <struct-array> >>events ;
 
@@ -35,30 +34,25 @@ M: kqueue-mx add-input-callback ( thread fd mx -- )
 
 M: kqueue-mx add-output-callback ( thread fd mx -- )
     [ call-next-method ] [
-        [ EVFILT_WRITE EV_DELETE make-kevent ] dip
+        [ EVFILT_WRITE { EV_ADD EV_ONESHOT } flags make-kevent ] dip
         register-kevent
     ] 2bi ;
 
-: cancel-input-callbacks ( fd mx -- seq )
-    [
-        [ EVFILT_READ EV_DELETE make-kevent ] dip
-        register-kevent
-    ] [ remove-input-callbacks ] 2bi ;
+M: kqueue-mx remove-input-callbacks ( fd mx -- seq )
+    2dup reads>> key? [
+        [ call-next-method ] [
+            [ EVFILT_READ EV_DELETE make-kevent ] dip
+            register-kevent
+        ] 2bi
+    ] [ 2drop f ] if ;
 
-: cancel-output-callbacks ( fd mx -- seq )
-    [
-        [ EVFILT_WRITE EV_DELETE make-kevent ] dip
-        register-kevent
-    ] [ remove-output-callbacks ] 2bi ;
-
-M: fd cancel-operation ( fd -- )
-    dup disposed>> [ drop ] [
-        fd>>
-        mx get-global
-        [ cancel-input-callbacks [ t swap resume-with ] each ]
-        [ cancel-output-callbacks [ t swap resume-with ] each ]
-        2bi
-    ] if ;
+M: kqueue-mx remove-output-callbacks ( fd mx -- seq )
+    2dup writes>> key? [
+        [
+            [ EVFILT_WRITE EV_DELETE make-kevent ] dip
+            register-kevent
+        ] [ call-next-method ] 2bi
+    ] [ 2drop f ] if ;
 
 : wait-kevent ( mx timespec -- n )
     [
diff --git a/basis/io/unix/macosx/macosx.factor b/basis/io/unix/macosx/macosx.factor
index 77140b81c9..ef52b676fb 100644
--- a/basis/io/unix/macosx/macosx.factor
+++ b/basis/io/unix/macosx/macosx.factor
@@ -1,6 +1,10 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 IN: io.unix.macosx
-USING: io.unix.bsd io.backend system ;
+USING: io.unix.backend io.unix.bsd io.unix.kqueue io.backend
+namespaces system ;
+
+M: macosx init-io ( -- )
+    <kqueue-mx> mx set-global ;
 
 macosx set-io-backend
diff --git a/basis/unix/kqueue/kqueue.factor b/basis/unix/kqueue/kqueue.factor
index 83c3bb5232..d7623df8be 100644
--- a/basis/unix/kqueue/kqueue.factor
+++ b/basis/unix/kqueue/kqueue.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax system sequences vocabs.loader words ;
+USING: alien.syntax system sequences vocabs.loader words
+accessors ;
 IN: unix.kqueue
 
 << "unix.kqueue." os name>> append require >>