# try to create and lock a lockfile (this isn't atomic but
# should do for now
$lockfn = "$root/local/cluster.lck"; # lock file name
- if (-e $lockfn) {
+ if (-w $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
- chomp $pid;
- die "Lockfile ($lockfn) and process $pid exist, another cluster running?" if kill 0, $pid;
+ if ($pid) {
+ chomp $pid;
+ die "Lockfile ($lockfn) and process $pid exist, another cluster running?" if kill 0, $pid;
+ }
+ unlink $lockfn;
close CLLOCK;
}
open(CLLOCK, ">$lockfn") or die "Can't open Lockfile ($lockfn) $!";
$systime = time;
}
+use AnyEvent;
+
use DXVars;
use Msg;
use IntMsg;
foreach $dxchan (DXChannel::get_all_nodes) {
$dxchan->disconnect(2) unless $dxchan == $main::me;
}
- Msg->event_loop(100, 0.01);
# disconnect users
foreach $dxchan (DXChannel::get_all_users) {
UDPMsg::finish();
# end everything else
- Msg->event_loop(100, 0.01);
DXUser::finish();
DXDupe::finish();
$l->close_server;
}
- LogDbg('cluster', "DXSpider V$version, build $subversion.$build ended");
+ LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitversion) ended");
dbgclose();
Logclose();
AGWMsg::init(\&new_channel);
}
+sub idle_loop
+{
+ my $timenow = time;
+
+ DXChannel::process();
+
+# $DB::trace = 0;
+
+ # do timed stuff, ongoing processing happens one a second
+ if ($timenow != $systime) {
+ reap() if $zombies;
+ $systime = $timenow;
+ my $days = int ($systime / 86400);
+ if ($systime_days != $days) {
+ $systime_days = $days;
+ $systime_daystart = $days * 86400;
+ }
+ IsoTime::update($systime);
+ DXCron::process(); # do cron jobs
+ DXCommandmode::process(); # process ongoing command mode stuff
+ DXXml::process();
+ DXProt::process(); # process ongoing ak1a pcxx stuff
+ DXConnect::process();
+ DXMsg::process();
+ DXDb::process();
+ DXUser::process();
+ DXDupe::process();
+ AGWMsg::process();
+ BPQMsg::process();
+
+ if (defined &Local::process) {
+ eval {
+ Local::process(); # do any localised processing
+ };
+ dbg("Local::process error $@") if $@;
+ }
+ }
+}
+
#############################################################
#
# The start of the main line of code
# banner
my ($year) = (gmtime)[5];
$year += 1900;
-LogDbg('cluster', "DXSpider V$version, build $subversion.$build started");
+LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitversion) started");
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
# load Prefixes
# load bad words
dbg("load badwords: " . (BadWords::load or "Ok"));
+# create end condvar
+$decease = AnyEvent->condvar;
+
# prime some signals
+my ($sigint, $sigterm);
unless ($DB::VERSION) {
- $SIG{INT} = $SIG{TERM} = sub { $decease = 1 };
+ $sigint = AnyEvent->signal(signal=>'INT', cb=> sub{$decease->send});
+ $sigterm = AnyEvent->signal(signal=>'TERM', cb=> sub{$decease->send});
}
unless ($is_win) {
#open(DB::OUT, "|tee /tmp/aa");
-for (;;) {
-# $DB::trace = 1;
-
- Msg->event_loop(10, 0.010);
- my $timenow = time;
-
- DXChannel::process();
+my $idle_loop = AnyEvent->idle(cb => &idle_loop);
-# $DB::trace = 0;
- # do timed stuff, ongoing processing happens one a second
- if ($timenow != $systime) {
- reap() if $zombies;
- $systime = $timenow;
- my $days = int ($systime / 86400);
- if ($systime_days != $days) {
- $systime_days = $days;
- $systime_daystart = $days * 86400;
- }
- IsoTime::update($systime);
- DXCron::process(); # do cron jobs
- DXCommandmode::process(); # process ongoing command mode stuff
- DXXml::process();
- DXProt::process(); # process ongoing ak1a pcxx stuff
- DXConnect::process();
- DXMsg::process();
- DXDb::process();
- DXUser::process();
- DXDupe::process();
- AGWMsg::process();
- BPQMsg::process();
+# main loop
+$decease->recv;
- if (defined &Local::process) {
- eval {
- Local::process(); # do any localised processing
- };
- dbg("Local::process error $@") if $@;
- }
- }
- if ($decease) {
- last if --$decease <= 0;
- }
-}
+idle_loop() for (1..25);
cease(0);
exit(0);