From 08405b8b61f531dbb70f4ac7391309f3ac705375 Mon Sep 17 00:00:00 2001 From: hades Date: Sat, 11 Nov 2000 08:55:39 +0000 Subject: [PATCH] LynxOS is buggy, wait call does not wait for killed child --- hadaq/param.tcl | 4 ++-- hadaq/worker.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hadaq/param.tcl b/hadaq/param.tcl index 6c90db5..75af2ec 100644 --- a/hadaq/param.tcl +++ b/hadaq/param.tcl @@ -3,12 +3,12 @@ set evtbuild(stndln) 0 set evtbuild(nrofmsgs) 1 set netmem(file) ./daq_netmem set netmem(stndln) 0 -set netmem(inpath0) ATM:0:150 +set netmem(inpath0) ATM:0:60 set netmem(nrofmsgs) 1 set netmem(verb) debug set memnet(file) ./daq_memnet set memnet(stndln) 0 -set memnet(outpath) ATM:0:150 +set memnet(outpath) ATM:0:60 set memnet(bandwidth) 68000 set readout(file) ./daq_readout set readout(stndln) 0 diff --git a/hadaq/worker.c b/hadaq/worker.c index 6909118..3e37020 100644 --- a/hadaq/worker.c +++ b/hadaq/worker.c @@ -1,4 +1,4 @@ -static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/worker.c,v 6.2 2000-07-18 14:24:37 hades Exp $"; +static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/worker.c,v 6.3 2000-11-11 08:55:39 hades Exp $"; #define _POSIX_C_SOURCE 199309L #include @@ -231,6 +231,7 @@ int Worker_start(const char *path, char *const argv[]) sigsuspend(sigMask); /* child to initialize */ if (sigReceived == SIGCHLD) { + sleep(1); wait(NULL); msglog(LOG_DEBUG, "%s:%d: %s\n", __FILE__, __LINE__, strerror(errno)); @@ -285,6 +286,7 @@ void Worker_stop(const char *name, int timeout) my->pid = my->statistics[0].value; if (my->pid > 0) { if (0 == kill(my->pid, SIGTERM)) { + sleep(1); wait(NULL); } } -- 2.43.0