Fix some bugs in epoll, and use it on Linux

diff --git a/basis/io/unix/epoll/epoll.factor b/basis/io/unix/epoll/epoll.factor
index 237985742b7ee6684094bf1c7afdaa85d74b59de..e8d33787f38b295f27d5fe90f6ff5550c7ac89a8 100644 (file)
--- a/basis/io/unix/epoll/epoll.factor
+++ b/basis/io/unix/epoll/epoll.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types kernel io.ports io.unix.backend
-bit-arrays sequences assocs struct-arrays unix unix.linux.epoll
-math namespaces locals unix.time ;
+bit-arrays sequences assocs struct-arrays math namespaces locals
+fry unix unix.linux.epoll unix.time ;
 IN: io.unix.epoll
 
 TUPLE: epoll-mx < mx events ;
@@ -23,7 +23,7 @@ TUPLE: epoll-mx < mx events ;
     [ set-epoll-event-fd ] keep ;
 
 :: do-epoll-ctl ( fd mx what events -- )
-    mx fd>> what fd events make-event what epoll_ctl io-error ;
+    mx fd>> what fd fd events make-event epoll_ctl io-error ;
 
 : do-epoll-add ( fd mx events -- )
     EPOLL_CTL_ADD swap EPOLLONESHOT bitor do-epoll-ctl ;
@@ -48,14 +48,16 @@ M: epoll-mx remove-output-callbacks ( fd mx -- seq )
     ] [ 2drop f ] if ;
 
 : wait-event ( mx us -- n )
-    [ [ fd>> ] [ events>> ] bi max-events ] [ 1000 /i ] bi*
+    [ [ fd>> ] [ events>> ] bi [ underlying>> ] [ length ] bi ] [ 1000 /i ] bi*
     epoll_wait dup multiplexer-error ;
 
-: handle-event ( mx event -- )
-    epoll-event-fd [ input-available ] [ output-available ] 2bi ;
+: handle-event ( event mx -- )
+    [ epoll-event-fd ] dip
+    [ EPOLLIN EPOLLOUT bitor do-epoll-del ]
+    [ input-available ] [ output-available ] 2tri ;
 
 : handle-events ( mx n -- )
-    [ dup events>> ] dip head-slice [ handle-event ] with each ;
+    [ dup events>> ] dip head-slice swap '[ _ handle-event ] each ;
 
 M: epoll-mx wait-for-events ( us mx -- )
-    swap 60000 or dupd wait-event handle-events ;
+    swap 60000000 or dupd wait-event handle-events ;

diff --git a/basis/io/unix/linux/linux.factor b/basis/io/unix/linux/linux.factor
index e75f4c5f6b9b3a08ba2285a1a20902b367daadeb..be5b83f1b06e33e72762249fb09a873fafbb3d7a 100644 (file)
--- a/basis/io/unix/linux/linux.factor
+++ b/basis/io/unix/linux/linux.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel io.backend io.monitors io.unix.backend
-io.unix.select io.unix.linux.monitors system namespaces ;
+io.unix.epoll io.unix.linux.monitors system namespaces ;
 IN: io.unix.linux
 
 M: linux init-io ( -- )
-    <select-mx> mx set-global ;
+    <epoll-mx> mx set-global ;
 
 linux set-io-backend