X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=e8858a0df531f2e8709e7d865b22bd4f2cfb8cd7;hb=3e062e2c8696ad7b1e2a8bd37c2a3c4ad8f460b6;hp=a645da33f7325483e66bb348192595e3b9e99fc1;hpb=6a7585fe8df540f3dba6e0d09d115ce70d8b1aff;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index a645da33..e8858a0d 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -25,7 +25,7 @@ BEGIN {
 
 	# try to create and lock a lockfile (this isn't atomic but 
 	# should do for now
-	$lockfn = "$root/perl/cluster.lock";       # lock file name
+	my $lockfn = "$root/perl/cluster.lock";       # lock file name
 	if (-e $lockfn) {
 		open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 		my $pid = <CLLOCK>;
@@ -38,6 +38,7 @@ BEGIN {
 	close CLLOCK;
 }
 
+
 use Msg;
 use DXVars;
 use DXDebug;
@@ -66,11 +67,16 @@ use BadWords;
 
 use Data::Dumper;
 use Fcntl ':flock'; 
+use POSIX ":sys_wait_h";
 
 use Local;
 
 package main;
 
+#use strict;
+#use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects $zombies $root
+#		   $lang $myalias @debug $userfn $clusteraddr $clusterport $mycall $decease );
+
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
 $version = "1.45";				# the version no of the software
@@ -238,9 +244,13 @@ sub cease
 # the reaper of children
 sub reap
 {
-	$SIG{'CHLD'} = \&reap;
-	my $cpid = wait;
-	@outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
+	my $cpid;
+	while (($cpid = waitpid(-1, WNOHANG)) > 0) {
+		dbg('reap', "cpid: $cpid");
+		@outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
+		$zombies-- if $zombies > 0;
+	}
+	dbg('reap', "cpid: $cpid");
 }
 
 # this is where the input queue is dealt with and things are dispatched off to other parts of
@@ -295,6 +305,7 @@ sub uptime
 #############################################################
 
 $starttime = $systime = time;
+$lang = 'en' unless $lang;
 
 # open the debug file, set various FHs to be unbuffered
 dbginit();
@@ -331,7 +342,7 @@ dbg('err', "load badwords: " . (BadWords::load or "Ok"));
 $SIG{INT} = \&cease;
 $SIG{TERM} = \&cease;
 $SIG{HUP} = 'IGNORE';
-$SIG{CHLD} = \&reap;
+$SIG{CHLD} = sub { $zombies++ };
 
 $SIG{PIPE} = sub { 	dbg('err', "Broken PIPE signal received"); };
 $SIG{IO} = sub { 	dbg('err', "SIGIO received"); };
@@ -399,19 +410,17 @@ dbg('err', "orft we jolly well go ...");
 #open(DB::OUT, "|tee /tmp/aa");
 
 for (;;) {
-	my $timenow;
 #	$DB::trace = 1;
 	
 	Msg->event_loop(1, 0.1);
-	$timenow = time;
+	my $timenow = time;
 	process_inqueue();			# read in lines from the input queue and despatch them
 #	$DB::trace = 0;
 	
 	# do timed stuff, ongoing processing happens one a second
 	if ($timenow != $systime) {
+		reap if $zombies;
 		$systime = $timenow;
-		$cldate = &cldate();
-		$ztime = &ztime();
 		DXCron::process();      # do cron jobs
 		DXCommandmode::process(); # process ongoing command mode stuff
 		DXProt::process();		# process ongoing ak1a pcxx stuff