svn commit: samba r7431 - in branches/SAMBA_4_0/source/torture/nbench: .

tridge at samba.org tridge at samba.org
Thu Jun 9 08:58:13 GMT 2005


Author: tridge
Date: 2005-06-09 08:58:12 +0000 (Thu, 09 Jun 2005)
New Revision: 7431

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7431

Log:
this should fix the bug that mkaplan and I noticed which is that
BENCH-NBENCH sometimes incorrectly reports that it failed.


Modified:
   branches/SAMBA_4_0/source/torture/nbench/nbench.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/nbench/nbench.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbench/nbench.c	2005-06-09 08:45:01 UTC (rev 7430)
+++ branches/SAMBA_4_0/source/torture/nbench/nbench.c	2005-06-09 08:58:12 UTC (rev 7431)
@@ -198,6 +198,14 @@
 	printf("Running for %d seconds with load '%s' and warmup %d secs\n", 
 	       timelimit, loadfile, warmup);
 
+	/* we need to reset SIGCHLD here as the name resolution
+	   library may have changed it. We rely on correct signals
+	   from childs in the main torture code which reaps
+	   children. This is why smbtorture BENCH-NBENCH was sometimes
+	   failing */
+	signal(SIGCHLD, SIG_DFL);
+
+
 	signal(SIGALRM, nb_alarm);
 	alarm(1);
 	torture_create_procs(run_netbench, &correct);



More information about the samba-cvs mailing list