From 30d3237eeb5b64c6ed9deaccc08e975791be858c Mon Sep 17 00:00:00 2001
From: Colin Surprenant <colin.surprenant@gmail.com>
Date: Wed, 22 Oct 2014 17:52:48 -0400
Subject: [PATCH] added apache logs, changed description and now computes top
 20%

---
 test/integration/run.rb                           |  4 ++--
 test/integration/suite/basic_performance_long.rb  | 11 ++++++-----
 test/integration/suite/basic_performance_quick.rb | 11 ++++++-----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/test/integration/run.rb b/test/integration/run.rb
index efa2cabef..8461ec70d 100644
--- a/test/integration/run.rb
+++ b/test/integration/run.rb
@@ -160,6 +160,6 @@ IO.popen(command.join(" "), "r+") do |io|
   end
 
   # the reader thread updates the @stats tps array
-  p = percentile(@stats, 0.70)
-  puts("elaspsed=#{"%.2f" % elaspsed}s, events=#{real_events_count}, avg tps=#{"%.0f" % (real_events_count / elaspsed)}, avg top 30% tps=#{"%.0f" % (p.reduce(:+) / p.size)}, best tps=#{p.last}")
+  p = percentile(@stats, 0.80)
+  puts("elaspsed=#{"%.2f" % elaspsed}s, events=#{real_events_count}, avg tps=#{"%.0f" % (real_events_count / elaspsed)}, best tps=#{p.last}, avg top 20% tps=#{"%.0f" % (p.reduce(:+) / p.size)}")
 end
diff --git a/test/integration/suite/basic_performance_long.rb b/test/integration/suite/basic_performance_long.rb
index c3218e044..ce7474b4d 100644
--- a/test/integration/suite/basic_performance_long.rb
+++ b/test/integration/suite/basic_performance_long.rb
@@ -8,9 +8,10 @@
 #]
 #
 [
-  {:name => "simple json out", :config => "config/simple_json_out.conf", :input => "input/simple_10.txt", :time => 120},
-  {:name => "simple line out", :config => "config/simple.conf", :input => "input/simple_10.txt", :time => 120},
-  {:name => "json codec", :config => "config/json_inout_codec.conf", :input => "input/json_medium.txt", :time => 120},
-  {:name => "json filter", :config => "config/json_inout_filter.conf", :input => "input/json_medium.txt", :time => 120},
-  {:name => "complex syslog", :config => "config/complex_syslog.conf", :input => "input/syslog_acl_10.txt", :time => 120},
+  {:name => "simple line in/out", :config => "config/simple.conf", :input => "input/simple_10.txt", :time => 120},
+  {:name => "simple line in/json out", :config => "config/simple_json_out.conf", :input => "input/simple_10.txt", :time => 120},
+  {:name => "json codec in/out", :config => "config/json_inout_codec.conf", :input => "input/json_medium.txt", :time => 120},
+  {:name => "line in/json filter/json out", :config => "config/json_inout_filter.conf", :input => "input/json_medium.txt", :time => 120},
+  {:name => "apache in/json out", :config => "config/standard_apache.conf", :input => "input/apache_log.txt", :time => 120},
+  {:name => "syslog in/json out", :config => "config/complex_syslog.conf", :input => "input/syslog_acl_10.txt", :time => 120},
 ]
\ No newline at end of file
diff --git a/test/integration/suite/basic_performance_quick.rb b/test/integration/suite/basic_performance_quick.rb
index 120a5169f..14b2a1215 100644
--- a/test/integration/suite/basic_performance_quick.rb
+++ b/test/integration/suite/basic_performance_quick.rb
@@ -8,9 +8,10 @@
 #]
 #
 [
-  {:name => "simple json out", :config => "config/simple_json_out.conf", :input => "input/simple_10.txt", :time => 30},
-  {:name => "simple line out", :config => "config/simple.conf", :input => "input/simple_10.txt", :time => 30},
-  {:name => "json codec", :config => "config/json_inout_codec.conf", :input => "input/json_medium.txt", :time => 30},
-  {:name => "json filter", :config => "config/json_inout_filter.conf", :input => "input/json_medium.txt", :time => 30},
-  {:name => "complex syslog", :config => "config/complex_syslog.conf", :input => "input/syslog_acl_10.txt", :time => 30},
+  {:name => "simple line in/out", :config => "config/simple.conf", :input => "input/simple_10.txt", :time => 30},
+  {:name => "simple line in/json out", :config => "config/simple_json_out.conf", :input => "input/simple_10.txt", :time => 30},
+  {:name => "json codec in/out", :config => "config/json_inout_codec.conf", :input => "input/json_medium.txt", :time => 30},
+  {:name => "line in/json filter/json out", :config => "config/json_inout_filter.conf", :input => "input/json_medium.txt", :time => 30},
+  {:name => "apache in/json out", :config => "config/standard_apache.conf", :input => "input/apache_log.txt", :time => 30},
+  {:name => "syslog in/json out", :config => "config/complex_syslog.conf", :input => "input/syslog_acl_10.txt", :time => 30},
 ]
\ No newline at end of file