summaryrefslogtreecommitdiffstats
path: root/src/stateless/cp
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/stateless/cp
parentcc352e04fd45913132f3e1ddc86d88571c926879 (diff)
parente9c6fde1c28b2c51ea164b0df929c9c44ee6f444 (diff)
Merge first stateless test
Diffstat (limited to 'src/stateless/cp')
-rw-r--r--src/stateless/cp/trex_stateless_port.cpp4
-rw-r--r--src/stateless/cp/trex_streams_compiler.cpp6
2 files changed, 8 insertions, 2 deletions
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;
}