Re: timeout chpst -L

[Gerrit Pape <pape@smarden.org>]

[-- Attachment #1: Type: text/plain, Size: 633 bytes --]

On Tue, Feb 14, 2006 at 01:54:05PM +0200, Alex Efros wrote:
> On Tue, Feb 14, 2006 at 11:36:23AM +0000, Gerrit Pape wrote:
> > It's a bug, at the same place in the source as the other two problems
> > you discovered.  After looking at the recent patch I sent, do you have
> > an idea how to fix it ;-)?
> 
> Not fair! I don't know C, I'm a Perl programmer... but I'm also a
> sysadmin, so I've spend a lot of time patching other's C, C++, etc.
> programs without knowing these languages.

Fair enough ;-).  I suggest the patch below against tryto from socklog
2.0.2.  Can you please try it out?

Thanks for your bug reports, Gerrit.

[-- Attachment #2: diff --]
[-- Type: text/plain, Size: 1254 bytes --]

Index: src/tryto.c
===================================================================
RCS file: /var/lib/cvs/socklog/src/tryto.c,v
retrieving revision 1.8
diff -u -r1.8 tryto.c
--- src/tryto.c	6 Feb 2005 11:36:50 -0000	1.8
+++ src/tryto.c	14 Feb 2006 12:34:04 -0000
@@ -104,6 +104,7 @@
   taia_now(&now);
   taia_uint(&deadline, timeout);
   taia_add(&deadline, &now, &deadline);
+  timeout =0;
 
   for (;;) {
     int iopausefds;
@@ -163,16 +164,16 @@
       int i;
       char *s;
 
-      if (wait_nohang(&rc) == pid) break;
-      taia_now(&now);
-      if ((timeout =taia_less(&deadline, &now))) break;
-
       sig_unblock(sig_child);
       iopause(x, iopausefds, &deadline, &now);
       sig_block(sig_child);
       
       while (read(selfpipe[0], &ch, 1) == 1) {}
 
+      taia_now(&now);
+      if ((timeout =taia_less(&deadline, &now))) break;
+      if (wait_nohang(&rc) == pid) break;
+
       r = buffer_feed(&buffer_x);
       if (r < 0) {
 	if ((errno == error_intr) || (errno == error_again)) continue;
@@ -201,6 +202,7 @@
     close(cpipe[1]);
 
     if (timeout) {
+      if (wait_nohang(&rc) == pid) break;
       /* child not finished */
       strerr_warn4(WARNING,
 		   "child \"", *argv, "\" timed out. sending TERM...", 0);