From: Martin Mares <mj@ucw.cz>
Date: Mon, 17 Jun 2013 16:35:21 +0000 (+0200)
Subject: Updated postprocessors for new HTTP log format
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=45daed9f2ea4e331f34ea2a446e4740f703bc7ed;p=netgrind.git

Updated postprocessors for new HTTP log format
---

diff --git a/post/http-extract b/post/http-extract
index aa82168..e50817a 100755
--- a/post/http-extract
+++ b/post/http-extract
@@ -11,7 +11,7 @@ eval '
 while (<STDIN>) {
 	chomp;
 	/^#/ && next;
-	my ($t1, $t2, $src, $dst, $ffor, $result, $cache, $queue, $length, $totaltime, $waittime, $ctype, $method, $url) = split /\s+/;
+	my ($id, $t1, $t2, $src, $dst, $ffor, $result, $cache, $queue, $length, $totaltime, $waittime, $ctype, $method, $url) = split /\s+/;
 	print ' . $ARGV[0] . ', "\n";
 }
 ';
diff --git a/post/http-filter b/post/http-filter
index c2baf11..9982912 100755
--- a/post/http-filter
+++ b/post/http-filter
@@ -11,7 +11,7 @@ eval '
 while (<STDIN>) {
 	chomp;
 	/^#/ && next;
-	my ($t1, $t2, $src, $dst, $ffor, $result, $cache, $queue, $length, $totaltime, $waittime, $ctype, $method, $url) = split /\s+/;
+	my ($id, $t1, $t2, $src, $dst, $ffor, $result, $cache, $queue, $length, $totaltime, $waittime, $ctype, $method, $url) = split /\s+/;
 	if (' . $ARGV[0] . ') {
 		print $_, "\n";
 	}
diff --git a/post/http-stats b/post/http-stats
index a1a88fd..3d9b461 100755
--- a/post/http-stats
+++ b/post/http-stats
@@ -6,13 +6,13 @@ use strict;
 use warnings;
 use POSIX;
 
-print "# time	width	Total	TCPErr	Nocache	CacheHit	CacheMiss	LenTotal	NTimings	TimeTotal	TimeTMin	TimeTMax	TimeWait	TimeWMin	TimeWMax	NGETs	NPOSTs\n";
+print "# id   time	width	Total	TCPErr	Nocache	CacheHit	CacheMiss	LenTotal	NTimings	TimeTotal	TimeTMin	TimeTMax	TimeWait	TimeWMin	TimeWMax	NGETs	NPOSTs\n";
 my $histogran = 60;
 my %hist = ();
 while (<>) {
 	chomp;
 	/^#/ && next;
-	my ($t1, $t2, $src, $dst, $ffor, $result, $cache, $queue, $length, $totaltime, $waittime, $ctype, $method, $url) = split /\s+/;
+	my ($id, $t1, $t2, $src, $dst, $ffor, $result, $cache, $queue, $length, $totaltime, $waittime, $ctype, $method, $url) = split /\s+/;
 	my ($tY, $tm, $td) = split (/-/, $t1);
 	my ($tH, $tM, $tS) = split (/:/, $t2);
 	my $tt = POSIX::mktime($tS, $tM, $tH, $td, $tm-1, $tY-1900);