cpu utilization per thread + mbufs per socket + add in tui

4 files changed, 148 insertions, 9 deletions

diff --git a/scripts/automation/trex_control_plane/stl/console/trex_tui.py b/scripts/automation/trex_control_plane/stl/console/trex_tui.py
index d3be4435..a2ffcad6 100644
--- a/scripts/automation/trex_control_plane/stl/console/trex_tui.py
+++ b/scripts/automation/trex_control_plane/stl/console/trex_tui.py
@@ -210,7 +210,7 @@ class TrexTUILatencyStats(TrexTUIPanel):
         super(TrexTUILatencyStats, self).__init__(mng, "lstats")
         self.key_actions = OrderedDict()
         self.key_actions['c'] = {'action': self.action_clear,  'legend': 'clear', 'show': True}
-        self.key_actions['t'] = {'action': self.action_toggle_histogram,  'legend': 'toggle histogram', 'show': True}
+        self.key_actions['h'] = {'action': self.action_toggle_histogram,  'legend': 'histogram toggle', 'show': True}
         self.is_histogram = False
 
 
@@ -238,6 +238,23 @@ class TrexTUILatencyStats(TrexTUIPanel):
          self.stateless_client.latency_stats.clear_stats()
          return ""
 
+
+# utilization stats
+class TrexTUIUtilizationStats(TrexTUIPanel):
+    def __init__ (self, mng):
+        super(TrexTUIUtilizationStats, self).__init__(mng, "ustats")
+        self.key_actions = {}
+
+    def show (self):
+        stats = self.stateless_client._get_formatted_stats(port_id_list = None, stats_mask = trex_stl_stats.UT_COMPAT)
+        # print stats to screen
+        for stat_type, stat_data in stats.items():
+            text_tables.print_table_with_header(stat_data.text_table, stat_type)
+
+    def get_key_actions (self):
+        return self.key_actions 
+
+
 # log
 class TrexTUILog():
     def __init__ (self):
@@ -270,12 +287,14 @@ class TrexTUIPanelManager():
         self.panels['dashboard'] = TrexTUIDashBoard(self)
         self.panels['sstats']    = TrexTUIStreamsStats(self)
         self.panels['lstats']    = TrexTUILatencyStats(self)
+        self.panels['ustats']    = TrexTUIUtilizationStats(self)
 
         self.key_actions = OrderedDict()
         self.key_actions['q'] = {'action': self.action_quit, 'legend': 'quit', 'show': True}
         self.key_actions['d'] = {'action': self.action_show_dash, 'legend': 'dashboard', 'show': True}
         self.key_actions['s'] = {'action': self.action_show_sstats, 'legend': 'streams', 'show': True}
         self.key_actions['l'] = {'action': self.action_show_lstats, 'legend': 'latency', 'show': True}
+        self.key_actions['u'] = {'action': self.action_show_ustats, 'legend': 'util', 'show': True}
 
         # start with dashboard
         self.main_panel = self.panels['dashboard']
@@ -392,6 +411,11 @@ class TrexTUIPanelManager():
         self.init(self.show_log)
         return ""
 
+    def action_show_ustats(self):
+        self.main_panel = self.panels['ustats']
+        self.init(self.show_log)
+        return ""
+
 # shows a textual top style window
 class TrexTUI():
 
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
index 22895a75..70f38bb0 100755
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
@@ -555,14 +555,17 @@ class STLClient(object):
 
         self.latency_stats = trex_stl_stats.CLatencyStats(self.ports)
 
+        self.util_stats = trex_stl_stats.CUtilStats(self)
+
         self.stats_generator = trex_stl_stats.CTRexInfoGenerator(self.global_stats,
                                                                  self.ports,
                                                                  self.flow_stats,
                                                                  self.latency_stats,
+                                                                 self.util_stats,
                                                                  self.async_client.monitor)
 
 
-       
+
 
     ############# private functions - used by the class itself ###########
 
@@ -1519,6 +1522,23 @@ class STLClient(object):
         if not rc:
             raise STLError(rc)
 
+    @__api_check(True)
+    def get_util_stats(self):
+        """
+            Get utilization stats:
+            History of TRex CPU utilization per thread (list of lists)
+            MBUFs memory consumption per CPU socket.
+
+            :parameters:
+                None
+
+            :raises:
+                + :exc:`STLError`
+
+        """
+        self.logger.pre_cmd('Getting Utilization stats')
+        return self.util_stats.get_stats()
+
 
     @__api_check(True)
     def reset(self, ports = None):
@@ -1739,8 +1759,6 @@ class STLClient(object):
             raise STLError(rc)
 
 
-
-    
     @__api_check(True)
     def stop (self, ports = None, rx_delay_ms = 10):
         """
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 94a45577..06009ac3 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
@@ -11,7 +11,6 @@ import datetime
 import time
 import re
 import math
-import copy
 import threading
 import pprint
 
@@ -22,13 +21,16 @@ PORT_STATUS = 'ps'
 STREAMS_STATS = 's'
 LATENCY_STATS = 'ls'
 LATENCY_HISTOGRAM = 'lh'
+CPU_STATS = 'c'
+MBUF_STATS = 'm'
 
-ALL_STATS_OPTS = [GLOBAL_STATS, PORT_STATS, PORT_STATUS, STREAMS_STATS, LATENCY_STATS, PORT_GRAPH, LATENCY_HISTOGRAM]
+ALL_STATS_OPTS = [GLOBAL_STATS, PORT_STATS, PORT_STATUS, STREAMS_STATS, LATENCY_STATS, PORT_GRAPH, LATENCY_HISTOGRAM, CPU_STATS, MBUF_STATS]
 COMPACT = [GLOBAL_STATS, PORT_STATS]
 GRAPH_PORT_COMPACT = [GLOBAL_STATS, PORT_GRAPH]
 SS_COMPAT = [GLOBAL_STATS, STREAMS_STATS] # stream stats
 LS_COMPAT = [GLOBAL_STATS, LATENCY_STATS] # latency stats
 LH_COMPAT = [GLOBAL_STATS, LATENCY_HISTOGRAM] # latency histogram
+UT_COMPAT = [GLOBAL_STATS, CPU_STATS, MBUF_STATS] # utilization
 
 ExportableStats = namedtuple('ExportableStats', ['raw_data', 'text_table'])
 
@@ -104,6 +106,13 @@ def calculate_diff_raw (samples):
 
     return total
 
+# used to sort '64b', '9kb' etc.
+def key_cmp_bytes(val):
+    multiplier = 1
+    if 'kb' in val:
+        multiplier = 1000
+    return multiplier * int(val.replace('k', '').replace('b', ''))
+
 # a simple object to keep a watch over a field
 class WatchedField(object):
 
@@ -138,11 +147,12 @@ class CTRexInfoGenerator(object):
     STLClient and the ports.
     """
 
-    def __init__(self, global_stats_ref, ports_dict_ref, rx_stats_ref, latency_stats_ref, async_monitor):
+    def __init__(self, global_stats_ref, ports_dict_ref, rx_stats_ref, latency_stats_ref, util_stats_ref, async_monitor):
         self._global_stats = global_stats_ref
         self._ports_dict = ports_dict_ref
         self._rx_stats_ref = rx_stats_ref
         self._latency_stats_ref = latency_stats_ref
+        self._util_stats_ref = util_stats_ref
         self._async_monitor = async_monitor
 
     def generate_single_statistic(self, port_id_list, statistic_type):
@@ -167,6 +177,12 @@ class CTRexInfoGenerator(object):
         elif statistic_type == LATENCY_HISTOGRAM:
             return self._generate_latency_histogram()
 
+        elif statistic_type == CPU_STATS:
+            return self._generate_cpu_util_stats()
+
+        elif statistic_type == MBUF_STATS:
+            return self._generate_mbuf_util_stats()
+
         else:
             # ignore by returning empty object
             return {}
@@ -404,6 +420,59 @@ class CTRexInfoGenerator(object):
         stats_table.header(header)
         return {"latency_histogram": ExportableStats(None, stats_table)}
 
+    def _generate_cpu_util_stats(self):
+        util_stats = self._util_stats_ref.get_stats()
+        if not util_stats or 'cpu' not in util_stats:
+            raise Exception("Excepting 'cpu' section in stats %s" % util_stats)
+        cpu_stats = util_stats['cpu']
+        hist_len = len(cpu_stats[0])
+        avg_len = min(5, hist_len)
+        show_len = min(15, hist_len)
+        stats_table = text_tables.TRexTextTable()
+        stats_table.header(['Thread', 'Avg', 'Latest'] + list(range(-1, 0 - show_len, -1)))
+        stats_table.set_cols_align(['l'] + ['r'] * (show_len + 1))
+        stats_table.set_cols_width([8, 3, 6] + [3] * (show_len - 1))
+        stats_table.set_cols_dtype(['t'] * (show_len + 2))
+        for i in range(min(14, len(cpu_stats))):
+            avg = int(round(sum(cpu_stats[i][:avg_len]) / avg_len))
+            stats_table.add_row([i, avg] + cpu_stats[i][:show_len])
+        return {'cpu_util(%)': ExportableStats(None, stats_table)}
+
+    def _generate_mbuf_util_stats(self):
+        util_stats = self._util_stats_ref.get_stats()
+        if not util_stats or 'mbuf_stats' not in util_stats:
+            raise Exception("Excepting 'mbuf_stats' section in stats %s" % util_stats)
+        mbuf_stats = util_stats['mbuf_stats']
+        for mbufs_per_socket in mbuf_stats.values():
+            first_socket_mbufs = mbufs_per_socket
+            break
+        if not self._util_stats_ref.mbuf_types_list:
+            mbuf_keys = list(first_socket_mbufs.keys())
+            mbuf_keys.sort(key = key_cmp_bytes)
+            self._util_stats_ref.mbuf_types_list = mbuf_keys
+        types_len = len(self._util_stats_ref.mbuf_types_list)
+        stats_table = text_tables.TRexTextTable()
+        stats_table.set_cols_align(['l'] + ['r'] * types_len)
+        stats_table.set_cols_width([10] + [7] * types_len)
+        stats_table.set_cols_dtype(['t'] * (types_len + 1))
+        stats_table.header([''] + self._util_stats_ref.mbuf_types_list)
+        total_list = []
+        for mbuf_type in self._util_stats_ref.mbuf_types_list:
+            total_list.append(first_socket_mbufs[mbuf_type][1])
+        stats_table.add_row(['Total:'] + total_list)
+        stats_table.add_row(['Used:'] + [''] * types_len)
+        for socket_name, mbufs in mbuf_stats.items():
+            socket_show_name = socket_name.replace('cpu-', '').replace('-', ' ').capitalize() + ':'
+            used_list = []
+            percentage_list = []
+            for mbuf_type in self._util_stats_ref.mbuf_types_list:
+                used = mbufs[mbuf_type][1] - mbufs[mbuf_type][0]
+                used_list.append(used)
+                percentage_list.append('%s%%' % int(100 * used / mbufs[mbuf_type][1]))
+            stats_table.add_row([socket_show_name] + used_list)
+            stats_table.add_row(['Percent:'] + percentage_list)
+        return {'mbuf_util': ExportableStats(None, stats_table)}
+
     @staticmethod
     def _get_rational_block_char(value, range_start, interval):
         # in Konsole, utf-8 is sometimes printed with artifacts, return ascii for now
@@ -1280,7 +1349,23 @@ class CRxStats(CTRexStats):
 
         return stats
 
-
+class CUtilStats(CTRexStats):
+
+    def __init__(self, client):
+        super(CUtilStats, self).__init__()
+        self.client = client
+        self.history = deque(maxlen = 1)
+        self.mbuf_types_list = None
+
+    def get_stats(self, force = False):
+        time_now = time.time()
+        if self.last_update_ts + 1 < time_now or not self.history or force:
+            rc = self.client._transmit('get_utilization')
+            if not rc:
+                raise Exception(rc)
+            self.last_update_ts = time_now
+            self.history.append(rc.data())
+        return self.history[-1]
 
 if __name__ == "__main__":
     pass
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
index 98e3ca6a..a435e54e 100755
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
@@ -39,6 +39,8 @@ PORT_STATS = 51
 PORT_STATUS = 52
 STREAMS_STATS = 53
 STATS_MASK = 54
+CPU_STATS = 55
+MBUF_STATS = 56
 
 STREAMS_MASK = 60
 # ALL_STREAMS = 61
@@ -346,6 +348,14 @@ OPTIONS_DB = {MULTIPLIER: ArgumentPack(['-m', '--multiplier'],
                                           {'action': 'store_true',
                                            'help': "Fetch only streams stats"}),
 
+              CPU_STATS: ArgumentPack(['-c'],
+                                      {'action': 'store_true',
+                                       'help': "Fetch only CPU utilization stats"}),
+
+              MBUF_STATS: ArgumentPack(['-m'],
+                                       {'action': 'store_true',
+                                        'help': "Fetch only MBUF utilization stats"}),
+
               STREAMS_MASK: ArgumentPack(['--streams'],
                                          {"nargs": '+',
                                           'dest':'streams',
@@ -371,7 +381,9 @@ OPTIONS_DB = {MULTIPLIER: ArgumentPack(['-m', '--multiplier'],
               STATS_MASK: ArgumentGroup(MUTEX, [GLOBAL_STATS,
                                                 PORT_STATS,
                                                 PORT_STATUS,
-                                                STREAMS_STATS],
+                                                STREAMS_STATS,
+                                                CPU_STATS,
+                                                MBUF_STATS],
                                         {})
               }