X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=b908af3c6751a1791ac6cf6d2785b13aaba035f2;hb=cc9bd946788545ef87a7a6d0541fa1c47b9b034a;hp=8fb0f4664489609be8a6f3f56c584d6b6956d1fd;hpb=261c75481017f32ca491df475b36e9600ca430a1;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 8fb0f466..b908af3c 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package DXCron;
@@ -13,12 +13,14 @@ use DXUtil;
 use DXM;
 use DXDebug;
 use IO::File;
+use DXLog;
+use Time::HiRes qw(gettimeofday tv_interval);
+use DXSubprocess;
 
 use strict;
 
-use vars qw{@crontab $mtime $lasttime $lastmin};
+use vars qw{@crontab @lcrontab @scrontab $mtime $lasttime $lastmin};
 
-@crontab = ();
 $mtime = 0;
 $lasttime = 0;
 $lastmin = 0;
@@ -33,13 +35,11 @@ sub init
 	if ((-e $localfn && -M $localfn < $mtime) || (-e $fn && -M $fn < $mtime) || $mtime == 0) {
 		my $t;
 		
-		@crontab = ();
-		
 		# first read in the standard one
 		if (-e $fn) {
 			$t = -M $fn;
 			
-			cread($fn);
+			@scrontab = cread($fn);
 			$mtime = $t if  !$mtime || $t <= $mtime;
 		}
 
@@ -47,9 +47,10 @@ sub init
 		if (-e $localfn) {
 			$t = -M $localfn;
 			
-			cread($localfn);
+			@lcrontab = cread($localfn);
 			$mtime = $t if $t <= $mtime;
 		}
+		@crontab = (@scrontab, @lcrontab);
 	}
 }
 
@@ -59,32 +60,42 @@ sub cread
 	my $fn = shift;
 	my $fh = new IO::File;
 	my $line = 0;
+	my @out;
 
-	dbg('cron', "cron: reading $fn\n");
+	dbg("DXCron::cread reading $fn\n") if isdbg('cron');
 	open($fh, $fn) or confess("cron: can't open $fn $!");
-	while (<$fh>) {
+	while (my $l = <$fh>) {
 		$line++;
-		chomp;
-		next if /^\s*#/o or /^\s*$/o;
-		my ($min, $hour, $mday, $month, $wday, $cmd) = /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/o;
-		next if !$min;
+		chomp $l;
+		next if $l =~ /^\s*#/o or $l =~ /^\s*$/o;
+		my ($min, $hour, $mday, $month, $wday, $cmd) = $l =~ /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/o;
+		next unless defined $min;
 		my $ref = bless {};
-		my $err;
-		
-		$err |= parse($ref, 'min', $min, 0, 60);
-		$err |= parse($ref, 'hour', $hour, 0, 23);
-		$err |= parse($ref, 'mday', $mday, 1, 31);
-		$err |= parse($ref, 'month', $month, 1, 12, "jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec");
-		$err |= parse($ref, 'wday', $wday, 0, 6, "sun", "mon", "tue", "wed", "thu", "fri", "sat");
-		if (!$err) {
-			$ref->{cmd} = $cmd;
-			push @crontab, $ref;
-			dbg('cron', "cron: adding $_\n");
+		my $err = '';
+
+		if (defined $min && defined $hour && defined $cmd) { # it isn't all of them, but should be enough to tell if this is a real line
+			$err .= parse($ref, 'min', $min, 0, 60);
+			$err .= parse($ref, 'hour', $hour, 0, 23);
+			$err .= parse($ref, 'mday', $mday, 1, 31);
+			$err .= parse($ref, 'month', $month, 1, 12, "jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec");
+			$err .= parse($ref, 'wday', $wday, 0, 6, "sun", "mon", "tue", "wed", "thu", "fri", "sat");
+			if (!$err) {
+				$ref->{cmd} = $cmd;
+				push @out, $ref;
+				dbg("DXCron::cread: adding $l\n") if isdbg('cron');
+			} else {
+				$err =~ s/^, //;
+				LogDbg('cron', "DXCron::cread: error $err on line $line '$l'");
+			}
 		} else {
-			dbg('cron', "cron: error on line $line '$_'\n");
+			LogDbg('cron', "DXCron::cread error on line $line '$l'");
+			my @s = ($min, $hour, $mday, $month, $wday, $cmd);
+			my $s = "line $line splits as " . join(', ', (map {defined $_ ? qq{$_} : q{'undef'}} @s));
+			LogDbg('cron', $s);
 		}
 	}
 	close($fh);
+	return @out;
 }
 
 sub parse
@@ -99,7 +110,7 @@ sub parse
 	# handle '*' values
 	if ($val eq '*') {
 		$ref->{$sort} = 0;
-		return 0;
+		return;
 	}
 
 	# handle comma delimited values
@@ -107,20 +118,20 @@ sub parse
 	for (@comma) {
 		my @minus = split /-/o;
 		if (@minus == 2) {
-			return 1 if $minus[0] < $low || $minus[0] > $high;
-			return 1 if $minus[1] < $low || $minus[1] > $high;
+			return  ", $sort should be $low >= $minus[0] <= $high" if $minus[0] < $low || $minus[0] > $high;
+			return  ", $sort should be $low >= $minus[1] <= $high" if $minus[1] < $low || $minus[1] > $high;
 			my $i;
 			for ($i = $minus[0]; $i <= $minus[1]; ++$i) {
 				push @req, 0 + $i; 
 			}
 		} else {
-			return 1 if $_ < $low || $_ > $high;
+			return ", $sort should be $low >= $val <= $high" if $_ < $low || $_ > $high;
 			push @req, 0 + $_;
 		}
 	}
 	$ref->{$sort} = \@req;
 	
-	return 0;
+	return;
 }
 
 # process the cronjobs
@@ -147,9 +158,9 @@ sub process
 				(!$cron->{wday} || grep $_ eq $wday, @{$cron->{wday}})	){
 				
 				if ($cron->{cmd}) {
-					dbg('cron', "cron: $min $hour $mday $mon $wday -> doing '$cron->{cmd}'");
-					eval "$cron->{cmd}";
-					dbg('cron', "cron: cmd error $@") if $@;
+					dbg("cron: $min $hour $mday $mon $wday -> doing '$cron->{cmd}'") if isdbg('cron');
+					eval $cron->{cmd};
+					dbg("cron: cmd error $@") if $@ && isdbg('cron');
 				}
 			}
 		}
@@ -168,124 +179,135 @@ sub process
 sub connected
 {
 	my $call = uc shift;
-	return DXChannel->get($call);
+	return DXChannel::get($call);
 }
 
 # is it remotely connected anywhere (with exact callsign)?
 sub present
 {
 	my $call = uc shift;
-	return DXCluster->get_exact($call);
+	return Route::get($call);
 }
 
 # is it remotely connected anywhere (ignoring SSIDS)?
 sub presentish
 {
 	my $call = uc shift;
-	return DXCluster->get($call);
+	my $c = Route::get($call);
+	unless ($c) {
+		for (1..15) {
+			$c = Route::get("$call-$_");
+			last if $c;
+		}
+	}
+	return $c;
 }
 
 # is it remotely connected anywhere (with exact callsign) and on node?
 sub present_on
 {
 	my $call = uc shift;
-	my $node = uc shift;
-	my $ref = DXCluster->get_exact($call);
-	return ($ref && $ref->mynode) ? $ref->mynode->call eq $node : undef;
+	my $ncall = uc shift;
+	my $node = Route::Node::get($ncall);
+	return ($node) ? grep $call eq $_, $node->users : undef;
 }
 
-# is it remotely connected anywhere (ignoring SSIDS) and on node?
+# is it remotely connected (ignoring SSIDS) and on node?
 sub presentish_on
 {
 	my $call = uc shift;
-	my $node = uc shift;
-	my $ref = DXCluster->get($call);
-	return ($ref && $ref->mynode) ? $ref->mynode->call eq $node : undef;
+	my $ncall = uc shift;
+	my $node = Route::Node::get($ncall);
+	my $present;
+	if ($node) {
+		$present = grep {/^$call/ } $node->users;
+	}
+	return $present;
 }
 
 # last time this thing was connected
 sub last_connect
 {
 	my $call = uc shift;
-	return $main::systime if DXChannel->get($call);
-	my $user = DXUser->get($call);
+	return $main::systime if DXChannel::get($call);
+	my $user = DXUser::get($call);
 	return $user ? $user->lastin : 0;
 }
 
 # disconnect a locally connected thing
 sub disconnect
 {
-	my $call = uc shift;
-	my $dxchan = DXChannel->get($call);
-	if ($dxchan) {
-		if ($dxchan->is_ak1a) {
-			$dxchan->send_now("D", DXProt::pc39($main::mycall, "$main::mycall DXCron"));
-		} else {
-			$dxchan->send_now('D', "");
-		} 
-		$dxchan->disconnect;
-	}
+	my $call =  shift;
+	run_cmd("disconnect $call");
 }
 
 # start a connect process off
 sub start_connect
 {
-	my $call = uc shift;
-	my $lccall = lc $call;
-
-	if (grep {$_->{call} eq $call} @main::outstanding_connects) {
-		dbg('cron', "Connect not started, outstanding connect to $call");
-		return;
-	}
-	
-	my $prog = "$main::root/local/client.pl";
-	$prog = "$main::root/perl/client.pl" if ! -e $prog;
-	
-	my $pid = fork();
-	if (defined $pid) {
-		if (!$pid) {
-			# in child, unset warnings, disable debugging and general clean up from us
-			$^W = 0;
-			eval "{ package DB; sub DB {} }";
-			$SIG{HUP} = 'IGNORE';
-			alarm(0);
-			DXChannel::closeall();
-			$SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
-			exec $prog, $call, 'connect' or dbg('cron', "exec '$prog' failed $!");
-		}
-		dbg('cron', "connect to $call started");
-	} else {
-		dbg('cron', "can't fork for $prog $!");
-	}
-
-	# coordinate
-	sleep(1);
+	my $call = shift;
+	# connecting is now done in one place - Yeah!
+	run_cmd("connect $call");
 }
 
 # spawn any old job off
 sub spawn
 {
 	my $line = shift;
-	
-	my $pid = fork();
-	if (defined $pid) {
-		if (!$pid) {
-			# in child, unset warnings, disable debugging and general clean up from us
-			$^W = 0;
-			eval "{ package DB; sub DB {} }";
-			$SIG{HUP} = 'IGNORE';
-			alarm(0);
-			DXChannel::closeall();
-			$SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
-			exec "$line" or dbg('cron', "exec '$line' failed $!");
-		}
-		dbg('cron', "spawn of $line started");
-	} else {
-		dbg('cron', "can't fork for $line $!");
-	}
+	my $t0 = [gettimeofday];
+
+	dbg("DXCron::spawn: $line") if isdbg("cron");
+	my $fc = DXSubprocess->new();
+	$fc->run(
+			 sub {
+				 my @res = `$line`;
+#				 diffms("DXCron spawn 1", $line, $t0, scalar @res) if isdbg('chan');
+				 return @res
+			 },
+			 sub {
+				 my ($fc, $err, @res) = @_; 
+				 if ($err) {
+					 my $s = "DXCron::spawn: error $err";
+					 dbg($s);
+					 return;
+				 }
+				 for (@res) {
+					 chomp;
+					 dbg("DXCron::spawn: $_") if isdbg("cron");
+				 }
+				 diffms("by DXCron::spawn", $line, $t0, scalar @res) if isdbg('progress');
+			 }
+			);
+}
 
-	# coordinate
-	sleep(1);
+sub spawn_cmd
+{
+	my $line = shift;
+	my $t0 = [gettimeofday];
+
+	dbg("DXCron::spawn_cmd run: $line") if isdbg('cron');
+	my $fc = DXSubprocess->new();
+	$fc->run(
+			 sub {
+				 ++$main::me->{_nospawn};
+				 my @res = $main::me->run_cmd($line);
+#				 diffms("DXCron spawn_cmd 1", $line, $t0, scalar @res) if isdbg('chan');
+				 return @res;
+			 },
+			 sub {
+				 my ($fc, $err, @res) = @_; 
+				 --$main::me->{_nospawn};
+				 delete $main::me->{_nospawn} if exists $main::me->{_nospawn} && $main::me->{_nospawn} <= 0;
+				 if ($err) {
+					 my $s = "DXCron::spawn_cmd: error $err";
+					 dbg($s);
+				 }
+				 for (@res) {
+					 chomp;
+					 dbg("DXCron::spawn_cmd: $_") if isdbg("cron");
+				 }
+				 diffms("by DXCron::spawn_cmd", $line, $t0, scalar @res) if isdbg('progress');
+			 }
+			);
 }
 
 # do an rcmd to another cluster from the crontab
@@ -295,11 +317,23 @@ sub rcmd
 	my $line = shift;
 
 	# can we see it? Is it a node?
-	my $noderef = DXCluster->get_exact($call);
-	return  if !$noderef || !$noderef->pcversion;
+	my $noderef = Route::Node::get($call);
+	return  unless $noderef && $noderef->version;
 
 	# send it 
-	DXProt::addrcmd($DXProt::me, $call, $line);
+	DXProt::addrcmd($main::me, $call, $line);
+}
+
+sub run_cmd
+{
+	my $line = shift;
+	dbg("DXCron::run_cmd: $line") if isdbg('cron');
+	my @in = $main::me->run_cmd($line);
+	for (@in) {
+		s/\s*$//;
+		dbg("DXCron::cmd out: $_") if isdbg('cron');
+	}
 }
+
 1;
 __END__