X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=annotate_log;h=3444e1bb2c87e6c577eb6ab3bc13146af8a5e9a3;hb=5341c13d51c282a68cb9fdeb92b15711630d33e7;hp=50d3683a7acb079a04965faa322ddd66362b70d4;hpb=b9f1c359e3bfb41a95a1d0e4d011fe60981a72b2;p=slotcarman.git

diff --git a/annotate_log b/annotate_log
index 50d3683..3444e1b 100755
--- a/annotate_log
+++ b/annotate_log
@@ -3,6 +3,7 @@
 use strict;
 
 use Getopt::Std;
+use SCX::LogReader;
 use SCX::LogPrinter;
 
 my %opt;
@@ -17,8 +18,9 @@ if (!getopts('abi:su', \%opt) || !$ARGV[0]) {
 
 my $logfile = shift @ARGV;
 
-open my $logfh, '<', $logfile
-	or die "Can't open $logfile: $!";
+my $reader = SCX::LogReader->new({
+	filename => $logfile,
+});
 
 my %args;
 
@@ -37,11 +39,7 @@ $args{skip_types} = \%skip_types;
 
 my $printer = SCX::LogPrinter->new(\%args);
 
-while (my $line = <$logfh>) {
-	chomp $line;
-	$line =~ s/\A\s+//xms;
-        my ($l_time, @data) = split(/\s+/, $line);
-
-	$printer->add_data($l_time, map { hex $_ } @data);
+while (my ($l_time, @data) = $reader->get_data()) {
+	$printer->add_data($l_time, @data);
 }