1 files changed, 21 insertions, 8 deletions

diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp
index c4ba7fa5..c36c3eae 100644
--- a/src/main_dpdk.cpp
+++ b/src/main_dpdk.cpp
@@ -2452,6 +2452,7 @@ public:
     float m_active_flows;
     float m_open_flows;
     float m_cpu_util;
+    float m_cpu_util_raw;
     float m_rx_cpu_util;
     float m_bw_per_core;
     uint8_t m_threads;
@@ -2461,7 +2462,7 @@ public:
 public:
     void Dump(FILE *fd,DumpFormat mode);
     void DumpAllPorts(FILE *fd);
-    void dump_json(std::string & json, bool baseline,uint32_t stats_tick);
+    void dump_json(std::string & json, bool baseline);
 private:
     std::string get_field(std::string name,float &f);
     std::string get_field(std::string name,uint64_t &f);
@@ -2501,7 +2502,7 @@ std::string CGlobalStats::get_field_port(int port,std::string name,uint64_t &f){
 }
 
 
-void CGlobalStats::dump_json(std::string & json, bool baseline,uint32_t stats_tick){
+void CGlobalStats::dump_json(std::string & json, bool baseline){
     /* refactor this to JSON */
 
     json="{\"name\":\"trex-global\",\"type\":0,";
@@ -2519,6 +2520,7 @@ void CGlobalStats::dump_json(std::string & json, bool baseline,uint32_t stats_ti
 #define GET_FIELD_PORT(p,f) get_field_port(p,std::string(#f),lp->f)
 
     json+=GET_FIELD(m_cpu_util);
+    json+=GET_FIELD(m_cpu_util_raw);
     json+=GET_FIELD(m_bw_per_core);
     json+=GET_FIELD(m_rx_cpu_util);
     json+=GET_FIELD(m_platform_factor);
@@ -2568,10 +2570,6 @@ void CGlobalStats::dump_json(std::string & json, bool baseline,uint32_t stats_ti
         json+=GET_FIELD_PORT(i,m_total_rx_pps);
     }
     json+=m_template.dump_as_json("template");
-    if ( stats_tick %4==0){
-        json+=CGlobalInfo::dump_pool_as_json(); /* no need a feq update beacuse it trash the cores D cache, once in 2 sec */
-    }
-
     json+="\"unknown\":0}}"  ;
 }
 
@@ -3588,6 +3586,7 @@ void CGlobalTRex::get_stats(CGlobalStats & stats){
 
     stats.m_num_of_ports = m_max_ports;
     stats.m_cpu_util = m_fl.GetCpuUtil();
+    stats.m_cpu_util_raw = m_fl.GetCpuUtilRaw();
     if (get_is_stateless()) {
         stats.m_rx_cpu_util = m_rx_sl.get_cpu_util();
     }
@@ -3819,7 +3818,7 @@ CGlobalTRex::publish_async_data(bool sync_now, bool baseline) {
         get_stats(m_stats);
     }
 
-    m_stats.dump_json(json, baseline,m_stats_cnt);
+    m_stats.dump_json(json, baseline);
     m_zmq_publisher.publish_json(json);
 
     /* generator json , all cores are the same just sample the first one */
@@ -3913,7 +3912,7 @@ CGlobalTRex::handle_slow_path(bool &was_stopped) {
     if (m_io_modes.m_g_mode == CTrexGlobalIoMode::gMem) {
 
         if ( m_stats_cnt%4==0) {
-            fprintf (stdout," %s \n",CGlobalInfo::dump_pool_as_json().c_str());
+            fprintf (stdout," %s \n",CGlobalInfo::dump_pool_as_json_str().c_str());
         }
     }
 
@@ -5812,6 +5811,20 @@ int TrexDpdkPlatformApi::get_active_pgids(flow_stat_active_t &result) const {
     return g_trex.m_trex_stateless->m_rx_flow_stat.get_active_pgids(result);
 }
 
+int TrexDpdkPlatformApi::get_cpu_util_full(cpu_util_full_t &cpu_util_full) const {
+    cpu_util_full.resize((int)g_trex.m_fl.m_threads_info.size());
+    for (int thread_id=0; thread_id<(int)g_trex.m_fl.m_threads_info.size(); thread_id++) {
+        CFlowGenListPerThread * lp=g_trex.m_fl.m_threads_info[thread_id];
+        lp->m_cpu_cp_u.GetHistory(cpu_util_full[thread_id]);
+    }
+    return 0;
+}
+
+int TrexDpdkPlatformApi::get_mbuf_util(Json::Value &mbuf_pool) const {
+    CGlobalInfo::dump_pool_as_json(mbuf_pool);
+    return 0;
+}
+
 CFlowStatParser *TrexDpdkPlatformApi::get_flow_stat_parser() const {
     return CTRexExtendedDriverDb::Ins()->get_drv()->get_flow_stat_parser();
 }