Log reading factored out.

[slotcarman.git] / annotate_log

diff --git a/annotate_log b/annotate_log
index 50d3683a7acb079a04965faa322ddd66362b70d4..3444e1bb2c87e6c577eb6ab3bc13146af8a5e9a3 100755 (executable)
--- 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);
 }