X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FTimer.pm;h=e0f760b857a576708c60a01d9fe74a6a58b0a73f;hb=4e91a71498653a4033c42440b225245387d7f5da;hp=168dd3f5fcb5490fe65e7d636b7ba401d32c34eb;hpb=2a7a2a84545e6e3f987bef9f55da82943343a434;p=spider.git

diff --git a/perl/Timer.pm b/perl/Timer.pm
index 168dd3f5..e0f760b8 100644
--- a/perl/Timer.pm
+++ b/perl/Timer.pm
@@ -3,7 +3,7 @@
 #
 # This uses callbacks. BE CAREFUL!!!!
 #
-# $Id$
+#
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
@@ -16,12 +16,6 @@ use DXDebug;
 @timerchain = ();
 $notimers = 0;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 $lasttime = 0;
 
 sub new
@@ -29,11 +23,11 @@ sub new
     my ($pkg, $time, $proc, $recur) = @_;
 	my $obj = ref($pkg);
 	my $class = $obj || $pkg;
-	my $self = bless { t=>$time + time, proc=>$proc }, $class;
+	my $self = bless { t=>$time + $main::systime, proc=>$proc }, $class;
 	$self->{interval} = $time if $recur;
 	push @timerchain, $self;
-	$notimers++;
-	dbg("Timer created ($notimers)") if isdbg('connll');
+	$notimers = @timerchain;
+	dbg("Timer created (notimers: $notimers)") if isdbg('connll');
 	return $self;
 }
 
@@ -42,11 +36,13 @@ sub del
 	my $self = shift;
 	delete $self->{proc};
 	@timerchain = grep {$_ != $self} @timerchain;
+	$notimers = @timerchain;
+	dbg("Timer deleted (notimers: $notimers)") if isdbg('connll');
 }
 
 sub handler
 {
-	my $now = time;
+	my $now = $main::systime;
 
 	return unless $now != $lasttime;
 
@@ -65,6 +61,5 @@ sub handler
 sub DESTROY
 {
 	dbg("timer destroyed ($Timer::notimers)") if isdbg('connll');
-	$Timer::notimers--;
 }
 1;