diff options
Diffstat (limited to 'src/rpc-server/commands')
| -rw-r--r-- | src/rpc-server/commands/trex_rpc_cmd_general.cpp | 13 | ||||
| -rw-r--r-- | src/rpc-server/commands/trex_rpc_cmds.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/rpc-server/commands/trex_rpc_cmd_general.cpp b/src/rpc-server/commands/trex_rpc_cmd_general.cpp index 541ff099..37eafef8 100644 --- a/src/rpc-server/commands/trex_rpc_cmd_general.cpp +++ b/src/rpc-server/commands/trex_rpc_cmd_general.cpp @@ -156,22 +156,23 @@ TrexRpcCmdGetActivePGIds::_run(const Json::Value ¶ms, Json::Value &result) { return (TREX_RPC_CMD_OK); } -/* - Get cpu utilization per thread with up to 20 latest values, Latest value will be first in array. - */ + +// get utilization of CPU per thread with up to 20 latest values + mbufs per socket trex_rpc_cmd_rc_e -TrexRpcCmdGetCpuUtilFull::_run(const Json::Value ¶ms, Json::Value &result) { +TrexRpcCmdGetUtilization::_run(const Json::Value ¶ms, Json::Value &result) { cpu_util_full_t cpu_util_full; Json::Value §ion = result["result"]; - section = Json::arrayValue; + + if (get_stateless_obj()->get_platform_api()->get_mbuf_util(section) != 0) + return TREX_RPC_CMD_INTERNAL_ERR; if (get_stateless_obj()->get_platform_api()->get_cpu_util_full(cpu_util_full) != 0) return TREX_RPC_CMD_INTERNAL_ERR; for (int thread_id = 0; thread_id < cpu_util_full.size(); thread_id++) { for (int history_id = 0; history_id < cpu_util_full[thread_id].size(); history_id++) { - section[thread_id].append(cpu_util_full.at(thread_id).at(history_id)); + section["cpu"][thread_id].append(cpu_util_full.at(thread_id).at(history_id)); } } return (TREX_RPC_CMD_OK); diff --git a/src/rpc-server/commands/trex_rpc_cmds.h b/src/rpc-server/commands/trex_rpc_cmds.h index 0df9fd2b..2776727d 100644 --- a/src/rpc-server/commands/trex_rpc_cmds.h +++ b/src/rpc-server/commands/trex_rpc_cmds.h @@ -67,7 +67,7 @@ TREX_RPC_CMD_DEFINE(TrexRpcPublishNow, "publish_now", 2, false, TREX_RPC_CMD_DEFINE(TrexRpcCmdGetCmds, "get_supported_cmds", 0, false, APIClass::API_CLASS_TYPE_CORE); TREX_RPC_CMD_DEFINE(TrexRpcCmdGetVersion, "get_version", 0, false, APIClass::API_CLASS_TYPE_CORE); TREX_RPC_CMD_DEFINE(TrexRpcCmdGetActivePGIds, "get_active_pgids", 0, false, APIClass::API_CLASS_TYPE_CORE); -TREX_RPC_CMD_DEFINE(TrexRpcCmdGetCpuUtilFull, "get_cpu_util_full", 0, false, APIClass::API_CLASS_TYPE_CORE); +TREX_RPC_CMD_DEFINE(TrexRpcCmdGetUtilization, "get_utilization", 0, false, APIClass::API_CLASS_TYPE_CORE); TREX_RPC_CMD_DEFINE_EXTENDED(TrexRpcCmdGetSysInfo, "get_system_info", 0, false, APIClass::API_CLASS_TYPE_CORE, |