projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
all dxdebug to have other directories, add wsjtl.pl
[spider.git]
/
perl
/
watchdbg
diff --git
a/perl/watchdbg
b/perl/watchdbg
index 720904bfca013ec9d54224e26a637cef38bb7d1a..a497eff92957f5bb269c7c1ce062f08c9acb83cd 100755
(executable)
--- 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.
#
# 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
# 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
#
# watchdbg gb7baa gb7djk # watch the conversation between BAA and DJK
#
@@
-23,29
+27,40
@@
BEGIN {
}
use IO::File;
}
use IO::File;
-use
DXVars
;
+use
SysVar
;
use DXUtil;
use DXLog;
use strict;
my $fp = DXLog::new('debug', 'dat', 'd');
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;
my $nolines = 1;
-$nolines = shift if $ARGV[0] =~ /^\d+$/;
-my $exp = join '|', @ARGV;
+$nolines = shift if $ARGV[0] =~ /^-?\d+$/;
+$nolines = abs $nolines if $nolines < 0;
+my @patt = @ARGV;
my @prev;
# seek to end of file
$fh->seek(0, 2);
for (;;) {
my @prev;
# seek to end of file
$fh->seek(0, 2);
for (;;) {
- my $line =
<$fh>
;
+ my $line =
$fh->getline
;
if ($line) {
if ($line) {
- if (
$exp
) {
+ if (
@patt
) {
push @prev, $line;
shift @prev while @prev > $nolines;
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 = ();
}
printit(@prev);
@prev = ();
}
@@
-57,16
+72,16
@@
for (;;) {
# check that the debug hasn't rolled over to next day
# open it if it has
# 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++) {
$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;
sleep 5;
}
die $! if $i >= 20;
-
@today = @
now;
+
$today = $
now;
}
}
}
}
}
}
@@
-78,10
+93,8
@@
sub printit
chomp $line;
$line =~ s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%02X", ord($1))/eg;
my ($t, $l) = split /\^/, $line, 2;
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);
}
}
exit(0);