open Printf
(** A connected process, FIFO *)
-type channel_pipe = Process of out_channel | Fifo of out_channel
-
-type signed_fd = Infd of Unix.file_descr | Outfd of Unix.file_descr
+type channel_pipe = Process of out_channel | Fifo of out_channel | BrokenPipe
+(** Signed file descriptors. Usually, we'll make sure that they're not
+ mistreated *)
+type signed_fd = Infd of Unix.file_descr | Outfd of Unix.file_descr | Eventfd of Unix.file_descr
let fdmap: (Unix.file_descr,string*string) Hashtbl.t = Hashtbl.create 1024
-let pidmap: (int,signed_fd*signed_fd*Unix.file_descr) Hashtbl.t = Hashtbl.create 1024
+(** Maps pids to slice connections. Needed to clean up fds when a script dies
+ with EPIPE *)
+let pidmap: (int,signed_fd list) Hashtbl.t = Hashtbl.create 1024
let backend_prefix = ref ""
let open_fds: (Unix.file_descr,channel_pipe) Hashtbl.t = Hashtbl.create 1024
+
(** Receive an event from a running script. This event must be relayed to the
- slice that invoked it
+ slice that invoked it.
+
@param idesc fd/fname identifier for process
*)
let receive_process_event (idesc: fname_and_fd) (_: fname_and_fd) =
let (_,ifd) = idesc in
let cp = try Hashtbl.find open_fds ifd with
Not_found->
- printf "Fifo fd disappeared\n";raise Bug
+ fprintf logfd "Fifo fd disappeared\n";flush logfd;raise Bug
in
match (cp) with
| Fifo(fifo_outchan) ->
let process_inchan = in_channel_of_descr ifd in
let cont = ref true in
- let count = ref 0 in
- count:=!count + 1;
while (!cont) do
try
let curline = input_line process_inchan in
begin
cont:=false
end
- | Unix_error(_,s1,s2) -> printf "Unix error %s - %s\n" s1 s2;flush Pervasives.stdout;cont:=false
- | e -> printf "Error - received unexpected event from file system !!!\n";raise e
+ | Unix_error(_,s1,s2) -> fprintf logfd "Unix error %s - %s\n" s1 s2;flush logfd;cont:=false
+ | Sys_error(s) -> (* We get this error if the EPIPE comes before the EOF marker*) cont:=false
+ | e -> fprintf logfd "Error - received unexpected event from file system !!!\n";raise e
done
- | _ -> printf "Bug! Process fd received in the channel handler\n";raise Bug
-
+ | _ -> fprintf logfd "Bug! Process fd received in the channel handler\n";flush logfd;raise Bug
let rec openentry_int fifoin fifoout (abspath:string*string) =
let fdin =
try openfile fifoin [O_RDONLY;O_NONBLOCK] 0o777 with
- e->printf "Error opening and connecting FIFO: %s,%o\n" fifoin 0o777;flush Pervasives.stdout;raise e
+ e->fprintf logfd "Error opening and connecting FIFO: %s,%o\n" fifoin 0o777;flush logfd;raise e
in
Hashtbl.replace fdmap fdin abspath;
Fdwatcher.add_fd (Some(fifoin),fdin) (Some(fifoout),stdout) receive_fifo_event
close fdin;
Fdwatcher.del_fd fdin;
let abspath = try
- Hashtbl.find fdmap fdin with _ -> printf "Bug: Phantom pipe\n";flush Pervasives.stdout;raise Bug
+ Hashtbl.find fdmap fdin with _ -> fprintf logfd "Bug: Phantom pipe\n";flush logfd;raise Bug
in
openentry_int fifoin fifoout abspath
+(** receive an event from a fifo and connect to the corresponding service, or to
+ create it if it doesn't exit
+ @param eventdescriptor Name of input pipe,in descriptor
+ @param outdescriptor Name of output pipe, out descriptor
+ *)
and receive_fifo_event eventdescriptor outdescriptor =
- let evfname,evfd = eventdescriptor in
+ let (evfname,evfd) = eventdescriptor in
let (fname_other,fd_other) = outdescriptor in
+ (* Open the output pipe, or use stdout instead *)
let outfd =
match (fname_other) with
| Some(str)->
(
try openfile str [O_WRONLY;O_NONBLOCK] 0o777 with
- _->printf "Output pipe not open, using stdout in place of %s\n" str;flush Pervasives.stdout;stdout
+ _->fprintf logfd "Output pipe not open, using stdout in place of %s\n" str;flush logfd;stdout
)
- | None-> printf "Bug, nameless pipe\n";raise Bug
+ | None-> fprintf logfd "Bug, nameless pipe\n";flush logfd;raise Bug
in
+ (* Check if the input descriptor is already registered (=> a session is open).
+ If not, register it and start a new session.*)
let pipe = try Hashtbl.find open_fds evfd with
| Not_found ->
- (* This is a fifo fd for sure *)
+ (* Ok, need to launch script *)
let execpath,slice_name = Hashtbl.find fdmap evfd in
- (* Spawn server. We assume that the fd is one fifo opened RW *)
- let (myinfd,pout) = Unix.pipe () in
- let (pin,myoutfd) = Unix.pipe () in
- set_nonblock myinfd;
- let pid = try create_process execpath [|execpath;slice_name|] pin pout pout with e -> printf "Error executing service: %s\n" execpath;flush Pervasives.stdout;raise e
+ let (script_infd,pout) = Unix.pipe () in
+ let (pin,script_outfd) = Unix.pipe () in
+ set_nonblock script_infd;
+ ignore(sigprocmask SIG_BLOCK [Sys.sigchld]);
+ let rpid = try Some(create_process execpath [|execpath;slice_name|] pin pout pout) with e -> fprintf logfd "Error executing service: %s\n" execpath;flush logfd;None
in
- Hashtbl.add pidmap pid (Infd(myinfd),Outfd(myoutfd),evfd);
- Hashtbl.add open_fds evfd (Process(out_channel_of_descr myoutfd));
- Hashtbl.add open_fds myinfd (Fifo(out_channel_of_descr outfd));
- Fdwatcher.add_fd (None,myinfd) (None,myinfd) receive_process_event;
- (Process(out_channel_of_descr myoutfd))
+ match rpid with
+ | None-> BrokenPipe
+ | Some(pid)->
+ (* Register fds associated with pid so that they can be cleaned up
+ * when it dies *)
+ Hashtbl.add pidmap pid [Infd(script_infd);Outfd(script_outfd);Eventfd(evfd)];
+
+ (* Connect pipe to running script *)
+ Hashtbl.add open_fds evfd (Process(out_channel_of_descr script_outfd));
+
+ (* Connect the running script to the pipe *)
+ Hashtbl.add open_fds script_infd (Fifo(out_channel_of_descr outfd));
+
+ (* Activate running script *)
+ Fdwatcher.add_fd (None,script_infd) (None,script_infd) receive_process_event;
+
+ (Process(out_channel_of_descr script_outfd))
in
+ (* We have the connection to the process - because it was open, or because it
+ just got established *)
let inchan_fd = in_channel_of_descr evfd in
match (pipe) with
| Process(out_channel) ->
let cont = ref true in
while (!cont) do
try
- printf "Reading...\n";flush Pervasives.stdout;
+ fprintf logfd "Reading...\n";flush logfd;
let curline = input_line inchan_fd in
fprintf out_channel "%s\n" curline;flush out_channel
with
(
match (evfname,fname_other) with
| Some(str1),Some(str2)->
+ fprintf logfd "Reopening entry\n";flush logfd;
reopenentry_int evfd str1 str2
| Some(str1),None ->
- printf "Bug, nameless pipe\n";flush Pervasives.stdout;raise Bug
+ fprintf logfd "Bug, nameless pipe\n";flush logfd;raise Bug
| None,_ ->
- printf "Race condition -> user deleted file before closing it. Clever ploy, but won't work.\n";
- flush Pervasives.stdout
+ fprintf logfd "Race condition -> user deleted file before closing it. Clever ploy, but won't work.\n";
+ flush logfd
);
cont:=false
- |Sys_blocked_io ->printf "Sysblockedio\n";flush Pervasives.stdout;
+ |Sys_blocked_io ->fprintf logfd "Sysblockedio\n";flush logfd;
cont:=false
- | _ ->printf "Bug: unhandled exception\n";flush Pervasives.stdout;raise Bug
- done
- | _ -> printf "BUG! received process event from fifo\n";raise Bug
+ | Unix_error(_,s1,s2) -> fprintf logfd "Unix error %s - %s\n" s1 s2;flush logfd;cont:=false
+ (*| _ ->fprintf logfd "Bug: unhandled exception\n";flush
+ * logfd;raise Bug*)
+ done;
+ ignore(sigprocmask SIG_UNBLOCK [Sys.sigchld])
+ | BrokenPipe -> ()
+ | Fifo(_) -> fprintf logfd "BUG! received process event from fifo\n";raise Bug
-let mkentry fqp abspath perm =
- printf "Making entry %s->%s\n" fqp abspath;flush Pervasives.stdout;
+(** Make a pair of fifo entries *)
+let mkentry fqp abspath perm uname =
+ fprintf logfd "Making entry %s->%s\n" fqp abspath;flush logfd;
let fifoin=sprintf "%s.in" fqp in
let fifoout=sprintf "%s.out" fqp in
(try Unix.unlink fifoin with _ -> ());
(try Unix.unlink fifoout with _ -> ());
(try
- Unix.mkfifo (sprintf "%s.in" fqp) 0o666
- with
- e->printf "Error creating FIFO: %s->%s. May be something wrong at the frontend.\n" fqp fifoin;flush Pervasives.stdout);
- (try
- Unix.mkfifo (sprintf "%s.out" fqp) 0o666
+ let infname =(sprintf "%s.in" fqp) in
+ let outfname =(sprintf "%s.out" fqp) in
+ 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
+ Unix.chown infname pwentry.pw_uid pwentry.pw_gid;
+ Unix.chown outfname pwentry.pw_uid pwentry.pw_gid
+ );
+ Success
with
- e->printf "Error creating FIFO: %s->%s. May be something wrong at the frontend.\n" fqp fifoout;flush Pervasives.stdout)
+ e->fprintf logfd "Error creating FIFO: %s->%s. May be something wrong at the frontend.\n" fqp fifoout;flush logfd;Failed)
-(** Open fifos for a session *)
+(** Open fifos for a session. Will shutdown vsys if the fifos don't exist *)
let openentry fqp abspath perm =
let fifoin = String.concat "." [fqp;"in"] in
let fifoout = String.concat "." [fqp;"out"] in
let sigchld_handle s =
let pid,_=Unix.waitpid [Unix.WNOHANG] 0 in
try
- let value = Hashtbl.find pidmap pid in
- match value with
- | (Infd(ifd),Outfd(ofd),fd) ->
- close(ifd);close(ofd);
- Hashtbl.remove open_fds fd;
- Fdwatcher.del_fd ifd;
- Hashtbl.remove pidmap pid
- | _ -> printf "BUG! Got fds in the wrong order\n";
- flush Pervasives.stdout;
- raise Bug
+ let sfd_list = Hashtbl.find pidmap pid in
+ let handle_sfd sfd =
+ match sfd with
+ | Infd(fd) ->
+ close fd;
+ Fdwatcher.del_fd fd
+ | Outfd(fd)->
+ close fd
+ | Eventfd(fd)->
+ Hashtbl.remove open_fds fd (* Disconnect pipe *)
+ in
+ List.iter handle_sfd sfd_list;
+ Hashtbl.remove pidmap pid
with
Not_found-> (* Do nothing, probably a grandchild *)
()
git://git.onelab.eu / vsys.git / blobdiff