X-Git-Url: http://git.onelab.eu/?p=vsys.git;a=blobdiff_plain;f=fdwatcher.ml;h=6c30b08148e5cea06bd68b592ceecbadaf06fa97;hp=eb9559ccec73b85185f8f716572b0908317eb43d;hb=HEAD;hpb=4bb506215c662d430a339b7a3d24db10d43de61b

diff --git a/fdwatcher.ml b/fdwatcher.ml
index eb9559c..6c30b08 100644
--- a/fdwatcher.ml
+++ b/fdwatcher.ml
@@ -1,34 +1,34 @@
 (** Fdwatcher - The main event loop. Agnostic to the type of file descriptors
- involved.*)
+  involved.*)
 
 open Printf
 open Globals
+open Printexc
 
 let fdset = ref []
 let cbtable = Hashtbl.create 1024
 
-(* The in descriptor is always open. Thanks to the broken semantics of
- * fifo outputs, the out descriptor must be opened a nouveau whenever we
- * want to send out data, and so we keep the associated filename as well.
- * Same with input fifos. Yipee.*)
 let add_fd (evpair:fname_and_fd) (fd_other:fname_and_fd) (callback:fname_and_fd->fname_and_fd->unit) = 
   let (fname,fd) = evpair in
-  fdset := (fd::!fdset);
-  Hashtbl.replace cbtable fd (callback,(evpair,fd_other))
+    fdset := (fd::!fdset);
+    Hashtbl.replace cbtable fd (callback,(evpair,fd_other))
 
 let del_fd fd =
-  fdset:=List.filter (fun l->l<>fd) !fdset;
-  flush Pervasives.stdout
+  fdset:=List.filter (fun l->l<>fd) !fdset
 
 let start_watch () =
-    while (true)
-    do
-              let (fds,_,_) = try Unix.select !fdset [] [] (-1.) 
-              with e->
-                ([],[],[])
-              in
-                List.iter (fun elt->
-                             let (func,(evd,fd_other)) = Hashtbl.find cbtable elt in
-                               func evd fd_other) fds
-    done
-
+  while (true)
+  do
+    let (fds,_,_) = try Unix.select !fdset [] [] (-1.) 
+    with e->
+      ([],[],[])
+    in
+      List.iter (fun elt->
+                   let (func,(evd,fd_other)) = Hashtbl.find cbtable elt in
+                     try (* Never fail *)
+                       func evd fd_other
+                     with e->
+                       let wtf = Printexc.to_string e in
+                         logprint "%s\n" wtf
+                ) fds
+  done