fix nasty timer bug

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 181e3054c77d83611a97ba20d9aea4736ae5ef47..6ac7a3fb907265f6bb92dbedd29d599d9d2c1662 100755 (executable)
--- 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
-       my $lockfn = "$root/perl/cluster.lock";       # lock file name
+       $lockfn = "$root/perl/cluster.lck";       # lock file name
        if (-e $lockfn) {
                open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
                my $pid = <CLLOCK>;
@@ -36,11 +36,15 @@ BEGIN {
        open(CLLOCK, ">$lockfn") or die "Can't open Lockfile ($lockfn) $!";
        print CLLOCK "$$\n";
        close CLLOCK;
+
+       $is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
+       $systime = time;
 }
 
 use Msg;
 use IntMsg;
 use ExtMsg;
+use AGWMsg;
 use DXVars;
 use DXDebug;
 use DXLog;
@@ -67,6 +71,7 @@ use DXDupe;
 use BadWords;
 
 use Data::Dumper;
+use IO::File;
 use Fcntl ':flock'; 
 use POSIX ":sys_wait_h";
 
@@ -75,14 +80,15 @@ use Local;
 package main;
 
 use strict;
-use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects $zombies $root
-                  @listeners $lang $myalias @debug $userfn $clusteraddr $clusterport $mycall $decease );
+use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects 
+                       $zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr 
+                       $clusterport $mycall $decease $build $is_win
+                  );
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
 $version = "1.47";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
-$lockfn = "cluster.lock";       # lock file name
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();                               # list of listeners
 
@@ -102,7 +108,7 @@ sub error_handler
 {
        my $dxchan = shift;
        $dxchan->{conn}->set_error(undef) if exists $dxchan->{conn};
-       $dxchan->disconnect;
+       $dxchan->disconnect(1);
 }
 
 # handle incoming messages
@@ -211,6 +217,10 @@ sub cease
                next if $dxchan->is_node;
                $dxchan->disconnect unless $dxchan == $DXProt::me;
        }
+
+       # disconnect AGW
+       AGWMsg::finish();
+       
        Msg->event_loop(1, 0.05);
        Msg->event_loop(1, 0.05);
        Msg->event_loop(1, 0.05);
@@ -228,8 +238,8 @@ sub cease
                $_->close_server;
        }
 
-       dbg('chan', "DXSpider version $version ended");
-       Log('cluster', "DXSpider V$version stopped");
+       dbg('chan', "DXSpider version $version, build $build ended");
+       Log('cluster', "DXSpider V$version, build $build ended");
        dbgclose();
        Logclose();
        unlink $lockfn;
@@ -293,6 +303,12 @@ sub uptime
        my $mins = int $t / 60;
        return sprintf "%d %02d:%02d", $days, $hours, $mins;
 }
+
+sub AGWrestart
+{
+       AGWMsg::init(\&new_channel);
+}
+
 #############################################################
 #
 # The start of the main line of code 
@@ -309,10 +325,30 @@ foreach (@debug) {
 }
 STDOUT->autoflush(1);
 
-Log('cluster', "DXSpider V$version started");
+# calculate build number
+$build = $main::version;
+
+if (opendir(DIR, "$main::root/perl")) {
+       my @d = readdir(DIR);
+       closedir(DIR);
+       foreach my $fn (@d) {
+               if ($fn =~ /^cluster\.pl$/ || $fn =~ /\.pm$/) {
+                       my $f = new IO::File "$main::root/perl/$fn" or next;
+                       while (<$f>) {
+                               if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)/ ) {
+                                       $build += $1;
+                                       last;
+                               }
+                       }
+                       $f->close;
+               }
+       }
+}
+
+Log('cluster', "DXSpider V$version, build $build started");
 
 # banner
-dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-2001 Dirk Koopman G1TLH");
+dbg('err', "DXSpider Version $version, build $build started", "Copyright (c) 1998-2001 Dirk Koopman G1TLH");
 
 # load Prefixes
 dbg('err', "loading prefixes ...");
@@ -340,12 +376,13 @@ for (@main::listen) {
        push @listeners, $conn;
        dbg('err', "External Port: $_->[0] $_->[1]");
 }
+AGWrestart();
 
 # load bad words
 dbg('err', "load badwords: " . (BadWords::load or "Ok"));
 
 # prime some signals
-unless ($^O =~ /^MS/) {
+unless ($is_win) {
        unless ($DB::VERSION) {
                $SIG{INT} = \&cease;
                $SIG{TERM} = \&cease;
@@ -421,7 +458,7 @@ dbg('err', "orft we jolly well go ...");
 for (;;) {
 #      $DB::trace = 1;
        
-       Msg->event_loop(10, 0.001);
+       Msg->event_loop(10, 0.010);
        my $timenow = time;
        process_inqueue();                      # read in lines from the input queue and despatch them
 #      $DB::trace = 0;
@@ -438,7 +475,8 @@ for (;;) {
                DXDb::process();
                DXUser::process();
                DXDupe::process();
-               
+               AGWMsg::process();
+                               
                eval { 
                        Local::process();       # do any localised processing
                };