X-Git-Url: http://git.onelab.eu/?p=vsys.git;a=blobdiff_plain;f=directfifowatcher.ml;h=e97d7c5e33c4822bf23b2a6ecc5148084a2a994e;hp=ea71ca129fbf1f40721ee6c197d3af5ca257db5a;hb=2b608078f42cc629a62b64149bc620a227c8831f;hpb=542f2c4d52a5a1113ba9017cb0ee70304393fac4

diff --git a/directfifowatcher.ml b/directfifowatcher.ml
index ea71ca1..e97d7c5 100644
--- a/directfifowatcher.ml
+++ b/directfifowatcher.ml
@@ -26,29 +26,43 @@ 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_safet fifoin =
+let openentry_int fifoin =
   let fdin =
     try openfile fifoin [O_RDONLY;O_NONBLOCK] 0o777 with 
-        e->fprintf logfd "Error opening and connecting FIFO: %s,%o\n" fifoin 0o777;flush logfd;raise e
+        e->logprint "Error opening and connecting FIFO: %s,%o\n" fifoin 0o777;raise e
   in
     fdin
 
 (** 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_safet fqp_in in
-    Dirwatcher.unmask_watch fqp_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))
 
@@ -69,15 +83,16 @@ let connect_file fqp_in =
     Hashtbl.find direct_fifo_table fqp_in with _ -> None in
     match entry_info with
       | Some(_,execpath,slice_name,fifo_fdin) ->
-          (*fprintf logfd "Executing %s for slice %s\n" execpath
-           * slice_name;flush logfd;*)
           begin
             let len = String.length fqp_in in
             let fqp = String.sub fqp_in 0 (len-3) in
             let fqp_out = String.concat "." [fqp;"out"] in
             let fifo_fdout =
               try openfile fqp_out [O_WRONLY;O_NONBLOCK] 0o777 with
-                  _->fprintf logfd "%s Output pipe not open, using stdout in place of %s\n" slice_name fqp_out;flush logfd;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]);
               (
@@ -87,7 +102,7 @@ let connect_file fqp_in =
                     | Some(pid) ->
                         if (fifo_fdout <> stdout) then close_if_open fifo_fdout;
                         Hashtbl.add pidmap pid (fqp_in,fifo_fdout)
-                    | None ->fprintf logfd "Error executing service: %s\n" execpath;flush logfd;reopenentry fqp_in
+                    | None ->logprint "Error executing service: %s\n" execpath;reopenentry fqp_in
               );
               ignore(sigprocmask SIG_UNBLOCK [Sys.sigchld]);
           end
@@ -96,7 +111,7 @@ let connect_file fqp_in =
 
 (** Make a pair of fifo entries *)
 let mkentry fqp abspath perm uname = 
-  fprintf logfd "Making entry %s->%s\n" fqp abspath;flush logfd;
+  logprint "Making entry %s->%s\n" fqp abspath;
   let fifoin=sprintf "%s.in" fqp in
   let fifoout=sprintf "%s.out" fqp in
     (try Unix.unlink fifoin with _ -> ());
@@ -114,7 +129,7 @@ let mkentry fqp abspath perm uname =
          );
          Success
      with 
-         e->fprintf logfd "Error creating FIFO: %s->%s. May be something wrong at the frontend.\n" fqp fifoout;flush logfd;Failed)
+         e->logprint "Error creating FIFO: %s->%s. May be something wrong at the frontend.\n" fqp fifoout;Failed)
 
 
 (** Close fifos that just got removed *)
@@ -134,7 +149,6 @@ let sigchld_handle s =
         begin
           reopenentry fqp_in
         end
-
     with _ -> ()
 
 let rec add_dir_watch fqp =
@@ -142,12 +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
-        begin
-          connect_file fqp_in;
-          add_dir_watch dirname
-        end
+        connect_file fqp_in
 
 let del_dir_watch fqp =
   ()