X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=db130fa9b79a14889692782e58ba58be1201228b;hp=815f45884f8e6c90b05de9aea5f5237f546591ab;hb=d4f12e6931c7fdf84043d8fb2f71e2f38965f26b;hpb=98a94315dae63bd19c7bc16ce50b3219386aa34c

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 815f45884f..db130fa9b7 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -61,6 +61,9 @@ COLORS = (
 
 REGEX_NIC = re.compile(r'(\d*ge\dp\d\D*\d*[a-z]*)-')
 
+# This value depends on latency stream rate (9001 pps) and duration (5s).
+PERCENTILE_MAX = 99.9995
+
 
 def generate_plots(spec, data):
     """Generate all plots specified in the specification file.
@@ -77,7 +80,8 @@ def generate_plots(spec, data):
         u"plot_tsa_name": plot_tsa_name,
         u"plot_http_server_perf_box": plot_http_server_perf_box,
         u"plot_nf_heatmap": plot_nf_heatmap,
-        u"plot_hdrh_lat_by_percentile": plot_hdrh_lat_by_percentile
+        u"plot_hdrh_lat_by_percentile": plot_hdrh_lat_by_percentile,
+        u"plot_hdrh_lat_by_percentile_x_log": plot_hdrh_lat_by_percentile_x_log
     }
 
     logging.info(u"Generating the plots ...")
@@ -172,14 +176,10 @@ def plot_hdrh_lat_by_percentile(plot, input_data):
 
             for color, graph in enumerate(graphs):
                 for idx, direction in enumerate((u"direction1", u"direction2")):
-                    xaxis = [0.0, ]
-                    yaxis = [0.0, ]
-                    hovertext = [
-                        f"<b>{desc[graph]}</b><br>"
-                        f"Direction: {(u'W-E', u'E-W')[idx % 2]}<br>"
-                        f"Percentile: 0.0%<br>"
-                        f"Latency: 0.0uSec"
-                    ]
+                    previous_x = 0.0
+                    xaxis = list()
+                    yaxis = list()
+                    hovertext = list()
                     try:
                         decoded = hdrh.histogram.HdrHistogram.decode(
                             test[u"latency"][graph][direction][u"hdrh"]
@@ -192,16 +192,23 @@ def plot_hdrh_lat_by_percentile(plot, input_data):
 
                     for item in decoded.get_recorded_iterator():
                         percentile = item.percentile_level_iterated_to
-                        if percentile > 99.9:
-                            continue
+                        xaxis.append(previous_x)
+                        yaxis.append(item.value_iterated_to)
+                        hovertext.append(
+                            f"<b>{desc[graph]}</b><br>"
+                            f"Direction: {(u'W-E', u'E-W')[idx % 2]}<br>"
+                            f"Percentile: {previous_x:.5f}-{percentile:.5f}%<br>"
+                            f"Latency: {item.value_iterated_to}uSec"
+                        )
                         xaxis.append(percentile)
                         yaxis.append(item.value_iterated_to)
                         hovertext.append(
                             f"<b>{desc[graph]}</b><br>"
                             f"Direction: {(u'W-E', u'E-W')[idx % 2]}<br>"
-                            f"Percentile: {percentile:.5f}%<br>"
+                            f"Percentile: {previous_x:.5f}-{percentile:.5f}%<br>"
                             f"Latency: {item.value_iterated_to}uSec"
                         )
+                        previous_x = percentile
                     fig.add_trace(
                         plgo.Scatter(
                             x=xaxis,
@@ -212,7 +219,8 @@ def plot_hdrh_lat_by_percentile(plot, input_data):
                             showlegend=bool(idx),
                             line=dict(
                                 color=COLORS[color],
-                                dash=u"dash" if idx % 2 else u"solid"
+                                dash=u"solid",
+                                width=1 if idx % 2 else 2
                             ),
                             hovertext=hovertext,
                             hoverinfo=u"text"
@@ -332,6 +340,8 @@ def plot_hdrh_lat_by_percentile_x_log(plot, input_data):
 
             for color, graph in enumerate(graphs):
                 for idx, direction in enumerate((u"direction1", u"direction2")):
+                    previous_x = 0.0
+                    prev_perc = 0.0
                     xaxis = list()
                     yaxis = list()
                     hovertext = list()
@@ -346,17 +356,29 @@ def plot_hdrh_lat_by_percentile_x_log(plot, input_data):
                         continue
 
                     for item in decoded.get_recorded_iterator():
+                        # The real value is "percentile".
+                        # For 100%, we cut that down to "x_perc" to avoid infinity.
                         percentile = item.percentile_level_iterated_to
-                        if percentile > 99.9999999:
-                            continue
-                        xaxis.append(100.0 / (100.0 - percentile))
+                        x_perc = min(percentile, PERCENTILE_MAX)
+                        xaxis.append(previous_x)
+                        yaxis.append(item.value_iterated_to)
+                        hovertext.append(
+                            f"<b>{desc[graph]}</b><br>"
+                            f"Direction: {(u'W-E', u'E-W')[idx % 2]}<br>"
+                            f"Percentile: {prev_perc:.5f}-{percentile:.5f}%<br>"
+                            f"Latency: {item.value_iterated_to}uSec"
+                        )
+                        next_x = 100.0 / (100.0 - x_perc)
+                        xaxis.append(next_x)
                         yaxis.append(item.value_iterated_to)
                         hovertext.append(
                             f"<b>{desc[graph]}</b><br>"
                             f"Direction: {(u'W-E', u'E-W')[idx % 2]}<br>"
-                            f"Percentile: {percentile:.5f}%<br>"
+                            f"Percentile: {prev_perc:.5f}-{percentile:.5f}%<br>"
                             f"Latency: {item.value_iterated_to}uSec"
                         )
+                        previous_x = next_x
+                        prev_perc = percentile
                     fig.add_trace(
                         plgo.Scatter(
                             x=xaxis,
@@ -367,7 +389,8 @@ def plot_hdrh_lat_by_percentile_x_log(plot, input_data):
                             showlegend=not(bool(idx)),
                             line=dict(
                                 color=COLORS[color],
-                                dash=u"dash" if idx % 2 else u"solid"
+                                dash=u"solid",
+                                width=1 if idx % 2 else 2
                             ),
                             hovertext=hovertext,
                             hoverinfo=u"text"