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 _ =
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
(** Open entry safely, by first masking out the file to be opened *)
let openentry_safe root_dir fqp_in backend_spec =
let restore = move_gate fqp_in in
- let fd_in = openentry_int restore 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))
(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
);
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
+ 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