From 87887a11654619d03ca37e7d63a87196c5506a7e Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Mon, 4 Feb 2008 23:30:49 -0600
Subject: [PATCH] Monitors tweak

---
 extra/io/unix/linux/linux.factor           | 10 ++--------
 extra/io/windows/nt/monitor/monitor.factor | 16 ++++++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/extra/io/unix/linux/linux.factor b/extra/io/unix/linux/linux.factor
index 1707ac9546..dcf1beabf9 100755
--- a/extra/io/unix/linux/linux.factor
+++ b/extra/io/unix/linux/linux.factor
@@ -25,8 +25,6 @@ TUPLE: inotify watches ;
 
 : wd>monitor ( wd -- monitor ) watches at ;
 
-: wd>path ( wd -- path ) wd>monitor linux-monitor-path ;
-
 : <inotify> ( -- port )
     H{ } clone
     inotify_init dup io-error inotify <buffered-port>
@@ -89,12 +87,8 @@ M: linux-monitor dispose ( monitor -- )
     ] { } make ;
 
 : parse-file-notify ( buffer -- changed path )
-    {
-        inotify-event-wd
-        inotify-event-name
-        inotify-event-mask
-    } get-slots
-    parse-action -rot alien>char-string >r wd>path r> path+ ;
+    { inotify-event-name inotify-event-mask } get-slots
+    parse-action swap alien>char-string ;
 
 : events-exhausted? ( i buffer -- ? )
     buffer-fill >= ;
diff --git a/extra/io/windows/nt/monitor/monitor.factor b/extra/io/windows/nt/monitor/monitor.factor
index d418dff270..6f956760a8 100755
--- a/extra/io/windows/nt/monitor/monitor.factor
+++ b/extra/io/windows/nt/monitor/monitor.factor
@@ -65,20 +65,20 @@ M: windows-nt-io <monitor> ( path recursive? -- monitor )
         { [ t ] [ +modify-file+ ] }
     } cond nip ;
 
-: parse-file-notify ( directory buffer -- changed path )
+: parse-file-notify ( buffer -- changed path )
     {
         FILE_NOTIFY_INFORMATION-FileName
         FILE_NOTIFY_INFORMATION-FileNameLength
         FILE_NOTIFY_INFORMATION-Action
-    } get-slots parse-action 1array -rot
-    memory>u16-string path+ ;
+    } get-slots parse-action 1array swap
+    memory>u16-string ;
 
-: (changed-files) ( directory buffer -- )
-    2dup parse-file-notify changed-file
+: (changed-files) ( buffer -- )
+    dup parse-file-notify changed-file
     dup FILE_NOTIFY_INFORMATION-NextEntryOffset dup zero?
-    [ 3drop ] [ swap <displaced-alien> (changed-files) ] if ;
+    [ 2drop ] [ swap <displaced-alien> (changed-files) ] if ;
 
 M: windows-nt-io fill-queue ( monitor -- )
-    dup win32-monitor-path over buffer-ptr pick read-changes
-    [ zero? [ 2drop ] [ (changed-files) ] if ] H{ } make-assoc
+    dup buffer-ptr over read-changes
+    [ zero? [ drop ] [ (changed-files) ] if ] H{ } make-assoc
     swap set-monitor-queue ;