X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=frontend.ml;h=ad36172c0087d9116c5087a2de2972ef4230e60d;hb=4eccf5deff6324957d0bf0799dee6decb8d5f05a;hp=77e5ffe5dc7d8adff677be59d3098a0cb95ffeb1;hpb=a9f606051125de2acc9140074f91054755fa67b4;p=vsys.git

diff --git a/frontend.ml b/frontend.ml
index 77e5ffe..ad36172 100644
--- a/frontend.ml
+++ b/frontend.ml
@@ -1,53 +1,96 @@
+(* frontend.ml: Routines that implement frontend actions, such as creating directories in a slice, creating pipes etc. *)
+
 open Printf
 open Unix
 open Globals
-open Fifowatcher
+open Directfifowatcher
 
+(** frontendhandler class: Methods to create and unlink pipes and directories 
+  @param root_dir vsys directory inside a slice
+  @param slice_name actual slice name - set with care, since the acl functionality refers to these names *)
 class frontendHandler (root_dir,slice_name) = 
 object(this)
   method get_slice_name () = slice_name
+
+  (** A new script was copied into the backend, make a corresponding entry in
+    the frontend.
+    @param rp Relative path of the entry in the backend
+    @param abspath Absolute path of the entry
+    @param perm Permissions of the entry at the frontend *)
   method mkentry (rp:relpath) abspath perm = 
-            let realperm = perm land (lnot 0o111) in
-    match rp with Relpath(rel) ->
-      let fqp = String.concat "/" [root_dir;rel] in
-         Fifowatcher.mkentry fqp abspath realperm;
-         Fifowatcher.openentry fqp (abspath,slice_name) realperm
+    let realperm = perm land (lnot 0o111) in
+      match rp with Relpath(rel) ->
+        let fqp = String.concat "/" [root_dir;rel] in
+        let res = Directfifowatcher.mkentry fqp abspath realperm slice_name in
+          match res with 
+            | Success ->
+                Directfifowatcher.openentry root_dir fqp (abspath,slice_name)
+            | _ -> ()
 
+  (** A new directory was created at the backend, make a corresponding directory
+    at the frontend. Refer to mkentry for parameters *)
   method mkdir rp perm =
     match rp with Relpath(rel) ->
-    let fqp = String.concat "/" [root_dir;rel] in
-      try 
-            let s = Unix.stat fqp in
-              if (s.st_kind<>S_DIR) then
-                begin
-                        Unix.unlink fqp;
-                        Unix.mkdir fqp perm
-                end
-              else if (s.st_perm <> perm) then
-                begin
-                        printf "Removing directory %s\n" fqp;
-                        flush Pervasives.stdout;
-                        Unix.rmdir fqp;
-                        Unix.mkdir fqp perm
-                end
-      with Unix.Unix_error(_,_,_) ->
-        Unix.mkdir fqp perm
+      let fqp = String.concat "/" [root_dir;rel] in
+        try 
+          let s = Unix.stat fqp in
+            if (s.st_kind<>S_DIR) then
+              begin
+                Unix.unlink fqp;
+                Unix.mkdir fqp perm
+              end
+            else if (s.st_perm <> perm) then
+              begin
+                Unix.rmdir fqp;
+                Unix.mkdir fqp perm
+              end;
+        with Unix.Unix_error(_,_,_) ->
+          Unix.mkdir fqp perm;
+          Directfifowatcher.add_dir_watch fqp
 
+  (** Functions corresponding to file deletion/directory removal *)
+
+  (** *)
   method unlink rp =
     match rp with Relpath(rel) ->
-    let fqp1 = String.concat "/" [root_dir;rel;".in"] in
-    let fqp2 = String.concat "/" [root_dir;rel;".out"] in
-      try 
-      Unix.unlink fqp1;
-      Unix.unlink fqp2
-      with _ ->
-        printf "Hm. %s disappeared. Never mind\n" fqp1;flush Pervasives.stdout
+      let fqp = String.concat "/" [root_dir;rel] in
+      let fqp_in = String.concat "." [fqp;"in"] in
+      let fqp_out = String.concat "." [fqp;"out"] in
+        Directfifowatcher.closeentry fqp;
+        try 
+          Unix.unlink fqp_in;
+          Unix.unlink fqp_out
+        with _ ->
+          logprint "Hm. %s disappeared. Looks like slice %s shot itself in the foot\n" fqp (this#get_slice_name ())
 
   method rmdir rp =
     match rp with Relpath(rel) ->
-    let fqp = String.concat "/" [root_dir;rel] in
-      try
-      Unix.rmdir fqp
-      with _ ->
-        printf "Hm. %s disappeared. Never mind\n" fqp;flush Pervasives.stdout
+      let fqp = String.concat "/" [root_dir;rel] in
+        Directfifowatcher.del_dir_watch fqp;
+        try
+          Unix.rmdir fqp
+        with _ ->
+          logprint "Hm. %s disappeared or not empty. Looks like slice %s shot itself in the foot\n" fqp (this#get_slice_name ())
+
+  initializer 
+    (
+      try 
+        let s = Unix.stat root_dir in
+          if (s.st_kind<>S_DIR) then
+            begin
+              Unix.unlink root_dir;
+              Unix.mkdir root_dir 0o700
+            end
+          else if (s.st_perm <> 0o700) then
+            begin
+              Unix.rmdir root_dir;
+              Unix.mkdir root_dir 0o700
+            end;
+      with Unix.Unix_error(_,_,_) ->
+        begin
+          try 
+            Unix.mkdir root_dir 0o700;
+          with _ -> ();
+        end);
+          Directfifowatcher.add_dir_watch root_dir
 end