From: Jan Maria Matejka <mq@ucw.cz>
Date: Wed, 31 Oct 2018 11:02:16 +0000 (+0100)
Subject: Perf: Nicer output
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07d82fb52a2e7b1e5a6fc31bd0c8f46daab3244a;p=thirdparty%2Fbird.git

Perf: Nicer output
---

diff --git a/doc/bird.sgml b/doc/bird.sgml
index b9e2d4f29..0d8d6b154 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -3783,7 +3783,11 @@ any instance of Perf in production configs.
 	<tag><label id="perf-to">exp to <m/number/</tag>
 	Stop benchmarking on this exponent. Default: 20
 
-	<tag><label id="perf-threshold">threshold <m/time/</tag>
+	<tag><label id="perf-threshold-min">threshold min <m/time/</tag>
+	If a run for the given exponent took less than this time for route import,
+	increase the exponent immediately. Default: 1 ms
+
+	<tag><label id="perf-threshold-max">threshold max <m/time/</tag>
 	If every run for the given exponent took at least this time for route import,
 	stop benchmarking. Default: 500 ms
 </descrip>
diff --git a/proto/perf/config.Y b/proto/perf/config.Y
index c31b34275..52f509a65 100644
--- a/proto/perf/config.Y
+++ b/proto/perf/config.Y
@@ -17,7 +17,7 @@ CF_DEFINES
 
 CF_DECLS
 
-CF_KEYWORDS(PERF, EXP, FROM, TO, REPEAT, THRESHOLD, KEEP)
+CF_KEYWORDS(PERF, EXP, FROM, TO, REPEAT, THRESHOLD, MIN, MAX, KEEP)
 
 CF_GRAMMAR
 
@@ -29,7 +29,8 @@ perf_proto_start: proto_start PERF
   PERF_CFG->from = 10;
   PERF_CFG->to = 20;
   PERF_CFG->repeat = 4;
-  PERF_CFG->threshold = 500 MS_;
+  PERF_CFG->threshold_max = 500 MS_;
+  PERF_CFG->threshold_min = 1 MS_;
   PERF_CFG->keep = 0;
 };
 
@@ -43,7 +44,8 @@ perf_proto_item:
  | EXP FROM NUM { PERF_CFG->from = $3; }
  | EXP TO NUM { PERF_CFG->to = $3; }
  | REPEAT NUM { PERF_CFG->repeat = $2; }
- | THRESHOLD expr_us { PERF_CFG->threshold = $2; }
+ | THRESHOLD MIN expr_us { PERF_CFG->threshold_min = $3; }
+ | THRESHOLD MAX expr_us { PERF_CFG->threshold_max = $3; }
  | KEEP bool { PERF_CFG->keep = $2; }
 ;
 
diff --git a/proto/perf/parse.pl b/proto/perf/parse.pl
index a24106ddb..d91c56544 100755
--- a/proto/perf/parse.pl
+++ b/proto/perf/parse.pl
@@ -120,11 +120,15 @@ sub draw {
   my $csv = $self->dump();
   my $svg = $self->stub . ".svg";
 
+  my $title = $self->name;
+  $title =~ s/_/ /g;
+
   open PLOT, "|-", "gnuplot -p";
   print PLOT "set terminal svg;\n";
   print PLOT "set output '$svg';\n";
-  print PLOT "set title '" . $self->name . "';\n";
+  print PLOT "set title '$title';\n";
   print PLOT "set datafile separator ',';\n";
+  print PLOT "set jitter over 0.3 spread 0.3;\n";
   print PLOT "plot '$csv' using 1:2 title 'gen', '$csv' using 1:3 title 'temp', '$csv' using 1:4 title 'update', '$csv' using 1:5 title 'withdraw';\n";
   close PLOT;
 }
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index 7cf26a8f7..733eeb880 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -186,13 +186,14 @@ perf_loop(void *data)
   s64 updatetime = timediff(&ts_rte, &ts_update);
   s64 withdrawtime = timediff(&ts_update, &ts_withdraw);
 
-  PLOG("exp=%u times: gen=%lu temp=%lu update=%lu withdraw=%lu",
-      p->exp, gentime, temptime, updatetime, withdrawtime);
+  if (updatetime NS >= p->threshold_min)
+    PLOG("exp=%u times: gen=%lu temp=%lu update=%lu withdraw=%lu",
+	p->exp, gentime, temptime, updatetime, withdrawtime);
 
-  if (updatetime NS < p->threshold)
+  if (updatetime NS < p->threshold_max)
     p->stop = 0;
 
-  if (++p->run == p->repeat) {
+  if ((updatetime NS < p->threshold_min) || (++p->run == p->repeat)) {
     xfree(p->data);
     p->data = NULL;
 
@@ -222,7 +223,8 @@ perf_init(struct proto_config *CF)
 
   struct perf_config *cf = (struct perf_config *) CF;
 
-  p->threshold = cf->threshold;
+  p->threshold_min = cf->threshold_min;
+  p->threshold_max = cf->threshold_max;
   p->from = cf->from;
   p->to = cf->to;
   p->repeat = cf->repeat;
diff --git a/proto/perf/perf.h b/proto/perf/perf.h
index 0e36a1587..f31becddc 100644
--- a/proto/perf/perf.h
+++ b/proto/perf/perf.h
@@ -11,7 +11,8 @@
 
 struct perf_config {
   struct proto_config p;
-  btime threshold;
+  btime threshold_min;
+  btime threshold_max;
   uint from;
   uint to;
   uint repeat;
@@ -23,7 +24,8 @@ struct perf_proto {
   struct ifa *ifa;
   void *data;
   event *loop;
-  btime threshold;
+  btime threshold_min;
+  btime threshold_max;
   uint from;
   uint to;
   uint repeat;