summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHanoh Haim <hhaim@cisco.com>2015-11-11 15:38:28 +0200
committerHanoh Haim <hhaim@cisco.com>2015-11-11 15:38:28 +0200
commit04cdbe5e0342c2c725bef5f2ddaf5406e3e0f673 (patch)
treebd6db2fe28c7bc2ea90b03fc8ed66ccb6cacb8c6 /src
parentcc352e04fd45913132f3e1ddc86d88571c926879 (diff)
parente9c6fde1c28b2c51ea164b0df929c9c44ee6f444 (diff)
Merge first stateless test
Diffstat (limited to 'src')
-rw-r--r--src/rpc-server/commands/trex_rpc_cmds.h2
-rw-r--r--src/rpc-server/trex_rpc_cmds_table.cpp1
-rw-r--r--src/rpc-server/trex_rpc_req_resp_server.h2
-rw-r--r--src/stateless/cp/trex_stateless_port.cpp4
-rw-r--r--src/stateless/cp/trex_streams_compiler.cpp6
5 files changed, 11 insertions, 4 deletions
diff --git a/src/rpc-server/commands/trex_rpc_cmds.h b/src/rpc-server/commands/trex_rpc_cmds.h
index 8b173cb9..d7265ff2 100644
--- a/src/rpc-server/commands/trex_rpc_cmds.h
+++ b/src/rpc-server/commands/trex_rpc_cmds.h
@@ -110,7 +110,7 @@ TREX_RPC_CMD_DEFINE(TrexRpcCmdStopTraffic, "stop_traffic", 1, true);
TREX_RPC_CMD_DEFINE(TrexRpcCmdPauseTraffic, "pause_traffic", 1, true);
TREX_RPC_CMD_DEFINE(TrexRpcCmdResumeTraffic, "resume_traffic", 1, true);
-TREX_RPC_CMD_DEFINE(TrexRpcCmdUpdateTraffic, "update_traffic", 1, true);
+TREX_RPC_CMD_DEFINE(TrexRpcCmdUpdateTraffic, "update_traffic", 2, true);
TREX_RPC_CMD_DEFINE(TrexRpcCmdSyncUser, "sync_user", 2, false);
diff --git a/src/rpc-server/trex_rpc_cmds_table.cpp b/src/rpc-server/trex_rpc_cmds_table.cpp
index f38b4df4..a65bbccf 100644
--- a/src/rpc-server/trex_rpc_cmds_table.cpp
+++ b/src/rpc-server/trex_rpc_cmds_table.cpp
@@ -56,6 +56,7 @@ TrexRpcCommandsTable::TrexRpcCommandsTable() {
register_command(new TrexRpcCmdStopTraffic());
register_command(new TrexRpcCmdPauseTraffic());
register_command(new TrexRpcCmdResumeTraffic());
+ register_command(new TrexRpcCmdUpdateTraffic());
}
TrexRpcCommandsTable::~TrexRpcCommandsTable() {
diff --git a/src/rpc-server/trex_rpc_req_resp_server.h b/src/rpc-server/trex_rpc_req_resp_server.h
index 1f638adf..bc38c0ef 100644
--- a/src/rpc-server/trex_rpc_req_resp_server.h
+++ b/src/rpc-server/trex_rpc_req_resp_server.h
@@ -43,7 +43,7 @@ private:
void handle_request(const std::string &request);
void handle_server_error(const std::string &specific_err);
- static const int RPC_MAX_MSG_SIZE = (20 * 1024);
+ static const int RPC_MAX_MSG_SIZE = (200 * 1024);
void *m_context;
void *m_socket;
uint8_t m_msg_buffer[RPC_MAX_MSG_SIZE];
diff --git a/src/stateless/cp/trex_stateless_port.cpp b/src/stateless/cp/trex_stateless_port.cpp
index b9206775..907b9cf4 100644
--- a/src/stateless/cp/trex_stateless_port.cpp
+++ b/src/stateless/cp/trex_stateless_port.cpp
@@ -122,7 +122,9 @@ TrexStatelessPort::start_traffic(double mul) {
void
TrexStatelessPort::stop_traffic(void) {
- verify_state(PORT_STATE_TX);
+ if (m_port_state != PORT_STATE_TX) {
+ return;
+ }
/* generate a message to all the relevant DP cores to start transmitting */
TrexStatelessCpToDpMsgBase *stop_msg = new TrexStatelessDpStop(m_port_id);
diff --git a/src/stateless/cp/trex_streams_compiler.cpp b/src/stateless/cp/trex_streams_compiler.cpp
index 667da158..8238bac7 100644
--- a/src/stateless/cp/trex_streams_compiler.cpp
+++ b/src/stateless/cp/trex_streams_compiler.cpp
@@ -54,7 +54,8 @@ TrexStreamsCompiledObj::add_compiled_stream(double isg_usec, double pps, uint8_t
TrexStreamsCompiledObj *
TrexStreamsCompiledObj::clone() {
- TrexStreamsCompiledObj *new_compiled_obj = new TrexStreamsCompiledObj(m_port_id, m_mul);
+ /* use multiplier of 1 to avoid double mult */
+ TrexStreamsCompiledObj *new_compiled_obj = new TrexStreamsCompiledObj(m_port_id, 1);
/**
* clone each element
@@ -66,6 +67,9 @@ TrexStreamsCompiledObj::clone() {
obj.m_pkt_len);
}
+ /* fix the multiplier */
+ new_compiled_obj->m_mul = m_mul;
+
return new_compiled_obj;
}