merge fix for double barrier

3 files changed, 16 insertions, 9 deletions

diff --git a/scripts/automation/trex_control_plane/stl/examples/stl_flow_latency_stats.py b/scripts/automation/trex_control_plane/stl/examples/stl_flow_latency_stats.py
index df0605bf..86b91728 100644
--- a/scripts/automation/trex_control_plane/stl/examples/stl_flow_latency_stats.py
+++ b/scripts/automation/trex_control_plane/stl/examples/stl_flow_latency_stats.py
@@ -96,14 +96,15 @@ def rx_iteration (c, tx_port, rx_port, total_pkts, pkt_len, bw):
     print("  Average latency(usec): {0}".format(avg))
     print("  Jitter(usec): {0}".format(jitter))
     print("  Latency distribution histogram:")
-    hist.sort()
-    for sample in hist:
-        range_start = sample['key']
+    l = hist.keys()
+    l.sort()
+    for sample in l:
+        range_start = sample
         if range_start == 0:
             range_end = 10
         else:
             range_end  = range_start + pow(10, (len(str(range_start))-1))
-        val = sample['val']
+        val = hist[sample]
         print ("    Packets with latency between {0} and {1}:{2} ".format(range_start, range_end, val))
     
     if tx_pkts != total_pkts:
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py
index 0f68d4a3..464869aa 100755
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py
@@ -1529,11 +1529,11 @@ def get_TOS(user_kwargs, kwargs):
     TOS1 = set(['ip_precedence', 'ip_delay', 'ip_throughput', 'ip_reliability', 'ip_cost', 'ip_reserved'])
     TOS2 = set(['ip_dscp', 'ip_cu'])
     user_args = set(user_kwargs.keys())
-    if user_args & TOS0.symmetric_difference(TOS1):
+    if user_args & (TOS1 - TOS0) and user_args & (TOS0 - TOS1):
         raise STLError('You have mixed %s and %s TOS parameters' % (TOS0, TOS1))
-    if user_args & TOS0.symmetric_difference(TOS2):
+    if user_args & (TOS2 - TOS0) and user_args & (TOS0 - TOS2):
         raise STLError('You have mixed %s and %s TOS parameters' % (TOS0, TOS2))
-    if user_args & TOS1.symmetric_difference(TOS2):
+    if user_args & (TOS2 - TOS1) and user_args & (TOS1 - TOS2):
         raise STLError('You have mixed %s and %s TOS parameters' % (TOS1, TOS2))
     if user_args & (TOS0 - TOS1 - TOS2):
         return (kwargs['ip_precedence'] << 5) + (kwargs['ip_tos_field'] << 2) + kwargs['ip_mbz']
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py
index 6b34b11a..ee4bd1f9 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py
@@ -1026,9 +1026,15 @@ class CLatencyStats(CTRexStats):
             if current_pg['latency']['h'] != "":
                 output[int_pg_id]['latency']['average'] = current_pg['latency']['h']['s_avg']
                 output[int_pg_id]['latency']['total_max'] = current_pg['latency']['h']['max_usec']
-                output[int_pg_id]['latency']['histogram'] = {elem['key']: elem['val'] for elem in current_pg['latency']['h']['histogram']}
+                output[int_pg_id]['latency']['histogram'] = {elem['key']: elem['val']
+                                                             for elem in current_pg['latency']['h']['histogram']}
                 zero_count = current_pg['latency']['h']['cnt'] - current_pg['latency']['h']['high_cnt']
-                output[int_pg_id]['latency']['histogram'][0] = zero_count
+                if zero_count != 0:
+                    output[int_pg_id]['latency']['total_min'] = 1
+                    output[int_pg_id]['latency']['histogram'][0] = zero_count
+                else:
+                    output[int_pg_id]['latency']['total_min'] = min(output[int_pg_id]['latency']['histogram'].keys())
+
         self.latest_stats = output
         return True