Continuation of the previous set

[vsys.git] / dirwatcher.ml

diff --git a/dirwatcher.ml b/dirwatcher.ml
index 643830e..667eba7 100644 (file)
--- a/dirwatcher.ml
+++ b/dirwatcher.ml
@@ -1,5 +1,5 @@
 (** Watches directories for events. Agnostic to vsys semantics of backends and
-frontends *)
+  frontends *)
 open Inotify
 open Fdwatcher
 open Printf
@@ -8,79 +8,78 @@ open Globals
 (* I don't know if a wd corresponding to a deleted directory is evicted or just
  * leaks - fix implementation of rmdir accordingly
  *)
-
-type 'a handlertype = Nohandler | Activehandler of 'a | Maskedhandler of 'a
-
 let wdmap = Hashtbl.create 1024
+let masks = Hashtbl.create 1024
 
 let fd = Inotify.init ()
 
+let rec list_check lst elt =
+  match lst with
+    | [] -> false
+    | car::cdr -> if (car==elt) then true else list_check cdr elt
+
 let handle_dir_event dirname evlist str = 
-    let fname = String.concat "/" [dirname;str] in
-        fprintf logfd "File: %s. " fname;List.iter 
-                  (fun e -> 
-                     fprintf logfd "Event: %s\n" (string_of_event e)) 
-                  evlist;
-        flush logfd
+  let fname = String.concat "/" [dirname;str] in
+    fprintf logfd "File: %s. " fname;List.iter 
+                                       (fun e -> 
+                                          fprintf logfd "Event: %s\n" (string_of_event e)) 
+                                       evlist;
+    flush logfd
 
 let add_watch dir events handler =
+  let evcheck = list_check events in
   let wd = Inotify.add_watch fd dir events in
-      Hashtbl.add wdmap wd (dir,Activehandler(handler))
-
-let mask_events wd =
-  let (dirname,handler) = try Hashtbl.find wdmap wd with Not_found->("",Nohandler)
-  in
-    match handler with
-      | Activehandler(func)->
-          Hashtbl.replace wdmap wd (dirname,Maskedhandler(func))
-      | _ ->
-          ()
-
-let unmask_events wd =
-  let (dirname,handler) = try Hashtbl.find wdmap wd with Not_found->("",Nohandler)
-  in
-    match handler with
-      | Maskedhandler(func)->
-          Hashtbl.replace wdmap wd (dirname,Activehandler(func))
-      | _ ->
-          ()
-
+    Hashtbl.add wdmap wd (dir,Some(handler))
+      (* Ignore the possibility that the whole directory can disappear and come
+       * back while it is masked *)
 
-        (* XXX
-let del_watch dir =
-  fprintf logfd "Removing watch for %s\n" dir;flush logfd;
-  let wd = Inotify.rm_watch fd dir in
-      Hashtbl.remove wdmap wd 
-         *)
+let mask_watch fqp =
+  try 
+    Hashtbl.replace masks fqp true
+  with _ ->
+    ()
 
+let unmask_watch fqp =
+  if (Hashtbl.mem masks fqp) then
+    begin
+      Hashtbl.remove masks fqp
+    end
+  else
+    fprintf logfd "WARNING: %s -- Unpaired unmask\n" fqp;flush logfd
+  
 let asciiz s =
   let rec findfirstnul str idx len =
     if ((idx==len) || 
-      (str.[idx]==(char_of_int 0))) then idx
-      else
-        findfirstnul str (idx+1) len
+        (str.[idx]==(char_of_int 0))) then idx
+    else
+      findfirstnul str (idx+1) len
   in
   let nulterm = findfirstnul s 0 (String.length s) in
     String.sub s 0 nulterm
 
 let receive_event (eventdescriptor:fname_and_fd) (bla:fname_and_fd) =
   let (_,fd) = eventdescriptor in
-      let evs = Inotify.read fd in
-        List.iter (fun x->
-                match x with
-                  | (wd,evlist,_,Some(str)) ->
-                      let purestr = asciiz(str) in
-                      let (dirname,handler) = 
-                        try Hashtbl.find wdmap wd with Not_found->("",Nohandler)
-                      in
-                        (
-                        match handler with
-                          | Nohandler->fprintf logfd "Unhandled watch descriptor\n";flush logfd
-                          | Activehandler(handler)->handler wd dirname evlist purestr
-                          | Maskedhandler(_)->()
-                        )
-                  | _ -> ()) 
-          evs
+  let evs = Inotify.read fd in
+    List.iter (fun x->
+                 match x with
+                   | (wd,evlist,_,Some(str)) ->
+                       begin
+                               let purestr = asciiz(str) in
+                               let (dirname,handler) = 
+                                 try Hashtbl.find wdmap wd with Not_found->("",None)
+                               in
+                                   match handler with
+                                     | None->fprintf logfd "Unhandled watch descriptor\n";flush logfd
+                                     | Some(handler)->
+                                         let fqp = String.concat "/" [dirname;purestr] in
+                                         let mask_filter = Hashtbl.mem masks fqp in
+                                           if (not mask_filter) then
+                                             begin
+                                                handler wd dirname evlist purestr
+                                             end
+                       end
+                   | _ -> ()) 
+      evs
 
 let initialize () =
   Fdwatcher.add_fd (None,fd) (None,fd) receive_event