Merge branch 'cpu_per_core'

1 files changed, 5 insertions, 6 deletions

diff --git a/src/bp_sim.h b/src/bp_sim.h
index bfccc817..23e9f8d5 100755
--- a/src/bp_sim.h
+++ b/src/bp_sim.h
@@ -1182,13 +1182,10 @@ public:
 
     void dump_in_case_of_error(FILE *fd);
 
-    std::string dump_as_json(uint8_t id,bool last);
+    void dump_as_json(Json::Value &json);
 
 private:
-        std::string add_to_json(std::string name,
-                                rte_mempool_t * pool,
-                                bool last=false);
-
+    void add_to_json(Json::Value &json, std::string name, rte_mempool_t * pool);
 
 public:
     rte_mempool_t *   m_small_mbuf_pool; /* pool for start packets */
@@ -1282,7 +1279,8 @@ public:
     }
 
 
-    static std::string dump_pool_as_json(void);
+    static void dump_pool_as_json(Json::Value &json);
+    static std::string dump_pool_as_json_str(void);
 
 
 public:
@@ -3881,6 +3879,7 @@ public:
     void DumpPktSize();
     void UpdateFast();
     double GetCpuUtil();
+    double GetCpuUtilRaw();
 
 public:
     double get_total_kcps();