X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fwatchdbg;h=2b1986a738bd4e4236b582ac4d1957ce6d2f4696;hb=2fc6c64fec914c8f6b739beee9f0f8a180ea6123;hp=720904bfca013ec9d54224e26a637cef38bb7d1a;hpb=c876cb33f90144dd899169954ffeb3285302897f;p=spider.git

diff --git a/perl/watchdbg b/perl/watchdbg
index 720904bf..2b1986a7 100755
--- a/perl/watchdbg
+++ b/perl/watchdbg
@@ -3,10 +3,14 @@
 # watch the end of the current debug file (like tail -f) applying
 # any regexes supplied on the command line.
 #
+# There can be more than one <regexp>. a <regexp> preceeded by a '!' is
+# treated as NOT <regexp>. Each <regexp> is implcitly ANDed together.
+# All <regexp> are caseless.
+#
 # examples:-
 # 
 #   watchdbg g1tlh       # watch everything g1tlh does
-#   watchdbg 2 PCPROT       # watch all PCPROT messages + up to 2 lines before
+#   watchdbg -2 PCPROT       # watch all PCPROT messages + up to 2 lines before
 #   watchdbg gb7baa gb7djk   # watch the conversation between BAA and DJK 
 #
 
@@ -23,29 +27,49 @@ BEGIN {
 }
 
 use IO::File;
-use DXVars;
+use SysVar;
 use DXUtil;
 use DXLog;
 
 use strict;
 
 my $fp = DXLog::new('debug', 'dat', 'd');
-my @today = Julian::unixtoj(time()); 
-my $fh = $fp->open(@today) or die $!; 
+my $today = $fp->unixtoj(time()); 
+my $fh = $fp->open($today) or die $!; 
 my $nolines = 1;
-$nolines = shift if $ARGV[0] =~ /^\d+$/;
-my $exp = join '|', @ARGV;
+my @patt;
 my @prev;
 
+while (@ARGV) {
+	my $arg = shift;
+	if ($arg =~ /^-+(\d+)/) {
+		$nolines += $1;
+		next;
+	}
+	usage(), exit(0) if $arg =~ /^-+[h\?]/i;
+	push @patt, $arg;
+}
+
+
 # seek to end of file
 $fh->seek(0, 2);
 for (;;) {
-	my $line = <$fh>;
+	my $line = $fh->getline;
 	if ($line) {
-		if ($exp) {
+		if (@patt) {
 			push @prev, $line;
 			shift @prev while @prev > $nolines; 
-			if ($line =~ m{(?:$exp)}oi) {
+			my $flag = 0;
+			foreach my $p (@patt) {
+				if ($p =~ /^!/) {
+					my $r = substr $p, 1;
+					last if $line =~ m{$r}i;
+				} else {
+					last unless $line =~ m{$p}i;
+				}
+				++$flag;
+			}		
+			if ($flag == @patt) {
 				printit(@prev);	
 				@prev = ();
 			}
@@ -57,16 +81,16 @@ for (;;) {
 		
 		# check that the debug hasn't rolled over to next day
 		# open it if it has
-		my @now = Julian::unixtoj(time()); 
-		if ($today[1] != $now[1]) {
+		my $now = $fp->unixtoj(time()); 
+		if ($today->cmp($now)) {
 			$fp->close;
 			my $i;
 			for ($i = 0; $i < 20; $i++) {
-				last if $fh = $fp->open(@now);
+				last if $fh = $fp->open($now);
 				sleep 5;
 			}
 		 	die $! if $i >= 20; 
-			@today = @now;
+			$today = $now;
 		}
 	}
 }
@@ -78,10 +102,26 @@ sub printit
 		chomp $line;
 		$line =~ s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%02X", ord($1))/eg; 
 		my ($t, $l) =  split /\^/, $line, 2;
-		my ($sec,$min,$hour) = gmtime((defined $t) ? $t : time);
-		my $buf = sprintf "%02d:%02d:%02d", $hour, $min, $sec;
-		
-		print $buf, ' ', $l, "\n"; 
+		$t = time unless defined $t;
+		printf "%02d:%02d:%02d %s\n", (gmtime($t))[2,1,0], $l;
 	}
 }
 exit(0);
+
+sub usage
+{
+	print << "XXX";
+
+ usage: watchdbg [-nnn lines before] [<regexp>|!<regexp>]...
+
+        You can have more than one <regexp> with an implicit 'and' between them. All 
+        <regexes> are caseless. It's recommended to put 'not' (!<regex>) first in any list.
+        Don't forget that you are doing this in a shell and you may need to quote your
+        <regex>s.
+ 
+          watchdbg -2 progress
+
+        will display any line containing 'progress' and also the two lines before that.
+
+XXX
+}