X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=directfifowatcher.ml;h=206ca53d54dd4502560dd1bbadc33cf8144c014f;hb=755411474ed0a694766fc6f3a916afaee1da7ebd;hp=075f08c76695e9618961746e103b73c195ba35f9;hpb=7ae75ecaa4e7772450202515acf892685ee6179e;p=vsys.git

diff --git a/directfifowatcher.ml b/directfifowatcher.ml
index 075f08c..206ca53 100644
--- a/directfifowatcher.ml
+++ b/directfifowatcher.ml
@@ -26,18 +26,34 @@ 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 
+    (* XXX add a check *)
+    Unix.rename fname tmpfname;
+    tmpfname
+
+let move_ungate fname restore =
+  (* XXX add a check *)
+  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 fs_openentry fifoin =
   let fdin =
     try openfile fifoin [O_RDONLY;O_NONBLOCK] 0o777 with 
         e->logprint "Error opening and connecting FIFO: %s,%o\n" fifoin 0o777;raise e
@@ -46,23 +62,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 = fs_openentry 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,12 +91,22 @@ 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;
+                        logprint "Check if vsys script %s is executable\n" execpath;
+                        stdout
             in
               ignore(sigprocmask SIG_BLOCK [Sys.sigchld]);
               (
                 clear_nonblock fifo_fdin;
-                let pid=try Some(create_process execpath [|execpath;slice_name|] fifo_fdin fifo_fdout fifo_fdout) with e -> None in
+                let pid = 
+                  try
+                    Some(create_process execpath [|execpath;slice_name|] fifo_fdin fifo_fdout fifo_fdout) 
+                  with 
+                    e -> logprint "Error executing %s for slice %s\n" execpath slice_name; None
+                in
                   match pid with 
                     | Some(pid) ->
                         if (fifo_fdout <> stdout) then close_if_open fifo_fdout;
@@ -104,11 +128,13 @@ let mkentry fqp abspath perm uname =
     (try 
        let infname =(sprintf "%s.in" fqp) in
        let outfname =(sprintf "%s.out" fqp) in
+         (* XXX add checks *)
          Unix.mkfifo infname 0o666;
          Unix.mkfifo outfname 0o666;
          ( (* Make the user the owner of the pipes in a non-chroot environment *)
            if (!Globals.nochroot) then
              let pwentry = Unix.getpwnam uname in
+               (* XXX add checks *)
                Unix.chown infname pwentry.pw_uid pwentry.pw_gid; 
                Unix.chown outfname pwentry.pw_uid pwentry.pw_gid
          );
@@ -128,22 +154,37 @@ let closeentry fqp =
           Hashtbl.remove direct_fifo_table fqp_in
 
 let sigchld_handle s =
-  let pid,_=Unix.waitpid [Unix.WNOHANG] 0 in
-    try
-      let fqp_in,fd_out = Hashtbl.find pidmap pid in
+  let rec reap_all_processes () =
+    let pid,_= try Unix.waitpid [Unix.WNOHANG] 0 with _ -> (-1,WEXITED(-1)) in
+      if (pid > 0) then
         begin
-          reopenentry fqp_in
+          begin
+            try
+              let fqp_in,fd_out = Hashtbl.find pidmap pid in
+                begin
+                  reopenentry fqp_in;
+                  Hashtbl.remove pidmap pid
+                end
+            with _ -> ()
+          end;
+          reap_all_processes ()
         end
-    with _ -> ()
-
+  in
+    reap_all_processes()
+                
+(** The backendhandler class: defines event handlers for events in
+the backend backend directory.
+  @param dir_root The location of the backend in the server context (eg. root context for vservers)
+  @param frontend_list List of frontends to serve with this backend
+  *)
 let rec add_dir_watch fqp =
   Dirwatcher.add_watch fqp [S_Open] direct_fifo_handler
 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 =
   ()