X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fhfstats.pl;h=5cee6593e5e758702fb27e9d0df755f856162432;hb=c257925981b8321543a376c4cf34a412397f1652;hp=fdbd8efdf506d84fde1040ad09a67215510ca080;hpb=c3505bcfc922cd712bad2c20b3479cf8d1dc54fe;p=spider.git diff --git a/cmd/show/hfstats.pl b/cmd/show/hfstats.pl index fdbd8efd..5cee6593 100644 --- a/cmd/show/hfstats.pl +++ b/cmd/show/hfstats.pl @@ -28,8 +28,6 @@ use Date::Parse; my ($self, $line) = @_; my @f = split /\s+/, $line; my $days = 31; -my $i; -my @in; my $now; my $date = cldate($main::systime); my $utime = $main::systime; @@ -55,40 +53,48 @@ $now = Julian::Day->new($utime); $now = $now->sub($days); $date = cldate($utime); -# generate the spot list -for ($i = 0; $i < $days; $i++) { - my $fh = $Spot::statp->open($now); # get the next file - unless ($fh) { - Spot::genstats($now); - $fh = $Spot::statp->open($now); - } - while (<$fh>) { - chomp; - my @l = split /\^/; - next unless $l[0] eq 'TOTALS'; - next unless $l[1]; - $l[0] = $now; - push @in, \@l; - last; - } - $now = $now->add(1); -} - -my @tot; - -push @out, $self->msg('stathf', $date, $days); -push @out, sprintf "%6s|%6s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Date Total 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m); -foreach my $ref (@in) { - my $linetot = 0; - foreach my $j (4..13) { - $tot[$j] += $ref->[$j]; - $tot[0] += $ref->[$j]; - $linetot += $ref->[$j]; - } - my $date = $ref->[0]->as_string; - $date =~ s/-\d+$//; - push @out, join '|', sprintf("%6s|%6d", $date, $linetot), map {$_ ? sprintf("%5d", $_) : ' '} @$ref[4..13], ""; -} -push @out, join '|', sprintf("%6s|%6d", 'Total', $tot[0]), map {$_ ? sprintf("%5d", $_) : ' '} @tot[4..13], ""; +@out = $self->spawn_cmd("show/hfstats $line", sub { + my %list; + my @out; + my @in; + my $i; + # generate the spot list + for ($i = 0; $i < $days; $i++) { + my $fh = $Spot::statp->open($now); # get the next file + unless ($fh) { + Spot::genstats($now); + $fh = $Spot::statp->open($now); + } + while (<$fh>) { + chomp; + my @l = split /\^/; + next unless $l[0] eq 'TOTALS'; + next unless $l[1]; + $l[0] = $now; + push @in, \@l; + last; + } + $now = $now->add(1); + } + + my @tot; + + push @out, $self->msg('stathf', $date, $days); + push @out, sprintf "%6s|%6s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Date Total 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m); + foreach my $ref (@in) { + my $linetot = 0; + foreach my $j (4..13) { + $tot[$j] += $ref->[$j]; + $tot[0] += $ref->[$j]; + $linetot += $ref->[$j]; + } + my $date = $ref->[0]->as_string; + $date =~ s/-\d+$//; + push @out, join '|', sprintf("%6s|%6d", $date, $linetot), map {$_ ? sprintf("%5d", $_) : ' '} @$ref[4..13], ""; + } + push @out, join '|', sprintf("%6s|%6d", 'Total', $tot[0]), map {$_ ? sprintf("%5d", $_) : ' '} @tot[4..13], ""; + return @out + }); + return (1, @out);