FINALLY...

[vsys.git] / directfifowatcher.ml

diff --git a/directfifowatcher.ml b/directfifowatcher.ml
index 075f08c..e97d7c5 100644 (file)
--- a/directfifowatcher.ml
+++ b/directfifowatcher.ml
@@ -26,16 +26,30 @@ type directory = string
 type base_pathname = string
 type slice_name = string
 
-
 let direct_fifo_table: (in_pathname,(directory*base_pathname*slice_name*Unix.file_descr) option) Hashtbl.t = 
   Hashtbl.create 1024
 
 let pidmap: (int,in_pathname * Unix.file_descr) Hashtbl.t = Hashtbl.create 1024
 
-let rec list_check lst elt =
-  match lst with
-    | [] -> false
-    | car::cdr -> if (car==elt) then true else list_check cdr elt
+let move_gate fname =
+  let tmpfname=String.concat "." [fname;"tmp"] in 
+    Unix.rename fname tmpfname;
+    tmpfname
+
+let move_ungate fname restore =
+  Unix.rename restore fname
+
+let list_check lst elt _ =
+  let rec list_check_rec lst = 
+    match lst with
+      | [] -> false
+      | car::cdr -> 
+          if (car==elt) then
+               true
+          else
+            list_check_rec cdr
+  in
+    list_check_rec lst
 
 let openentry_int fifoin =
   let fdin =
@@ -46,23 +60,21 @@ let openentry_int fifoin =
 
 (** Open entry safely, by first masking out the file to be opened *)
 let openentry_safe root_dir fqp_in backend_spec =
-  Dirwatcher.mask_watch fqp_in;
-  let fd_in = openentry_int fqp_in in
+  let restore = move_gate fqp_in in
+  let fd_in = openentry_int restore in
+    move_ungate fqp_in restore;
     let (fqp,slice_name) = backend_spec in
       Hashtbl.replace direct_fifo_table fqp_in (Some(root_dir,fqp,slice_name,fd_in))
 
 let openentry root_dir fqp backend_spec =
-  () (*
   let fqp_in = String.concat "." [fqp;"in"] in
-    openentry_safe root_dir fqp_in backend_spec*)
+    openentry_safe root_dir fqp_in backend_spec
 
 let reopenentry fifoin =
-  ()
-    (*
   let entry = try Hashtbl.find direct_fifo_table fifoin with _ -> None in
     match entry with
       | Some(dir, fqp,slice_name,fd) -> close_if_open fd;openentry_safe dir fifoin (fqp,slice_name)
-      | None -> ()*)
+      | None -> ()
 
 (* vsys is activated when a client opens an in file *)
 let connect_file fqp_in =
@@ -77,7 +89,10 @@ let connect_file fqp_in =
             let fqp_out = String.concat "." [fqp;"out"] in
             let fifo_fdout =
               try openfile fqp_out [O_WRONLY;O_NONBLOCK] 0o777 with
-                  _->logprint "%s Output pipe not open, using stdout in place of %s\n" slice_name fqp_out;stdout
+                  _-> (* The client is opening the descriptor too fast *)
+                    sleep 1;try openfile fqp_out [O_WRONLY;O_NONBLOCK] 0o777 with
+                        _->
+                        logprint "%s Output pipe not open, using stdout in place of %s\n" slice_name fqp_out;stdout
             in
               ignore(sigprocmask SIG_BLOCK [Sys.sigchld]);
               (
@@ -141,9 +156,9 @@ let rec add_dir_watch fqp =
 and
     direct_fifo_handler wd dirname evlist fname =
   let is_event = list_check evlist in
-    if (is_event Open) then 
+    if (is_event Open Attrib) then 
       let fqp_in = String.concat "/" [dirname;fname] in
-          connect_file fqp_in
+        connect_file fqp_in
 
 let del_dir_watch fqp =
   ()