summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimarom <imarom@cisco.com>2015-11-08 16:37:44 +0200
committerimarom <imarom@cisco.com>2015-11-08 16:37:44 +0200
commit5021dd5d8338e24557038d6c4ddc2f666d677903 (patch)
tree62669917feaa7c1d3ae677b75c79dec6ef04ecde
parent38dc2db83370ee9d2483a09f4451a5c0f1167cee (diff)
tests golden were updated because main loop
exit model has changed (sometimes one more packet was written to the dump file)
-rwxr-xr-xscripts/exp/dns-0-ex.erfbin2080 -> 1872 bytes
-rw-r--r--scripts/exp/dns-0.erfbin2080 -> 1872 bytes
-rwxr-xr-xscripts/exp/dns_e-0-ex.erfbin2080 -> 1872 bytes
-rw-r--r--scripts/exp/dns_e-0.erfbin2080 -> 1872 bytes
-rwxr-xr-xscripts/exp/dns_flip-0-ex.erfbin2080 -> 1872 bytes
-rw-r--r--scripts/exp/dns_flip-0.erfbin2080 -> 1872 bytes
-rwxr-xr-xscripts/exp/dns_ipv6-0-ex.erfbin2560 -> 2304 bytes
-rw-r--r--scripts/exp/dns_ipv6-0.erfbin2560 -> 2304 bytes
-rwxr-xr-xscripts/exp/dns_one_server-0-ex.erfbin4160 -> 3952 bytes
-rw-r--r--scripts/exp/dns_one_server-0.erfbin4160 -> 3952 bytes
-rwxr-xr-xscripts/exp/dns_p-0-ex.erfbin2080 -> 1872 bytes
-rw-r--r--scripts/exp/dns_p-0.erfbin2080 -> 1872 bytes
-rwxr-xr-xscripts/exp/dyn_pyld1-0-ex.erfbin2080 -> 1872 bytes
-rw-r--r--scripts/exp/dyn_pyld1-0.erfbin2080 -> 1872 bytes
-rwxr-xr-xscripts/exp/imix-0-ex.erfbin62872 -> 62784 bytes
-rw-r--r--scripts/exp/imix-0.erfbin62872 -> 62784 bytes
-rwxr-xr-xscripts/exp/imix_v6-0-ex.erfbin65480 -> 65376 bytes
-rw-r--r--scripts/exp/imix_v6-0.erfbin65480 -> 65376 bytes
-rwxr-xr-xscripts/exp/limit_single_pkt-0-ex.erfbin5368 -> 5192 bytes
-rw-r--r--scripts/exp/limit_single_pkt-0.erfbin5368 -> 5192 bytes
-rwxr-xr-xscripts/exp/sfr2-0-ex.erfbin1830944 -> 1731712 bytes
-rw-r--r--scripts/exp/sfr2-0.erfbin1830944 -> 1731712 bytes
-rwxr-xr-xsrc/bp_sim.cpp11
-rw-r--r--src/stateless/dp/trex_stateless_dp_core.cpp1
24 files changed, 6 insertions, 6 deletions
diff --git a/scripts/exp/dns-0-ex.erf b/scripts/exp/dns-0-ex.erf
index 5ffffcb3..fdb19009 100755
--- a/scripts/exp/dns-0-ex.erf
+++ b/scripts/exp/dns-0-ex.erf
Binary files differ
diff --git a/scripts/exp/dns-0.erf b/scripts/exp/dns-0.erf
index d8d601b7..fdb19009 100644
--- a/scripts/exp/dns-0.erf
+++ b/scripts/exp/dns-0.erf
Binary files differ
diff --git a/scripts/exp/dns_e-0-ex.erf b/scripts/exp/dns_e-0-ex.erf
index 7ebfd69a..e0de09fc 100755
--- a/scripts/exp/dns_e-0-ex.erf
+++ b/scripts/exp/dns_e-0-ex.erf
Binary files differ
diff --git a/scripts/exp/dns_e-0.erf b/scripts/exp/dns_e-0.erf
index 7ebfd69a..e0de09fc 100644
--- a/scripts/exp/dns_e-0.erf
+++ b/scripts/exp/dns_e-0.erf
Binary files differ
diff --git a/scripts/exp/dns_flip-0-ex.erf b/scripts/exp/dns_flip-0-ex.erf
index f6074ad7..774f0fdf 100755
--- a/scripts/exp/dns_flip-0-ex.erf
+++ b/scripts/exp/dns_flip-0-ex.erf
Binary files differ
diff --git a/scripts/exp/dns_flip-0.erf b/scripts/exp/dns_flip-0.erf
index f6074ad7..774f0fdf 100644
--- a/scripts/exp/dns_flip-0.erf
+++ b/scripts/exp/dns_flip-0.erf
Binary files differ
diff --git a/scripts/exp/dns_ipv6-0-ex.erf b/scripts/exp/dns_ipv6-0-ex.erf
index c47a6496..e0d33efc 100755
--- a/scripts/exp/dns_ipv6-0-ex.erf
+++ b/scripts/exp/dns_ipv6-0-ex.erf
Binary files differ
diff --git a/scripts/exp/dns_ipv6-0.erf b/scripts/exp/dns_ipv6-0.erf
index 53dee235..e0d33efc 100644
--- a/scripts/exp/dns_ipv6-0.erf
+++ b/scripts/exp/dns_ipv6-0.erf
Binary files differ
diff --git a/scripts/exp/dns_one_server-0-ex.erf b/scripts/exp/dns_one_server-0-ex.erf
index 0d3d447b..15323016 100755
--- a/scripts/exp/dns_one_server-0-ex.erf
+++ b/scripts/exp/dns_one_server-0-ex.erf
Binary files differ
diff --git a/scripts/exp/dns_one_server-0.erf b/scripts/exp/dns_one_server-0.erf
index ef76a69b..15323016 100644
--- a/scripts/exp/dns_one_server-0.erf
+++ b/scripts/exp/dns_one_server-0.erf
Binary files differ
diff --git a/scripts/exp/dns_p-0-ex.erf b/scripts/exp/dns_p-0-ex.erf
index ec313584..7d93c1d3 100755
--- a/scripts/exp/dns_p-0-ex.erf
+++ b/scripts/exp/dns_p-0-ex.erf
Binary files differ
diff --git a/scripts/exp/dns_p-0.erf b/scripts/exp/dns_p-0.erf
index ec313584..7d93c1d3 100644
--- a/scripts/exp/dns_p-0.erf
+++ b/scripts/exp/dns_p-0.erf
Binary files differ
diff --git a/scripts/exp/dyn_pyld1-0-ex.erf b/scripts/exp/dyn_pyld1-0-ex.erf
index 7d2089db..6a0028dc 100755
--- a/scripts/exp/dyn_pyld1-0-ex.erf
+++ b/scripts/exp/dyn_pyld1-0-ex.erf
Binary files differ
diff --git a/scripts/exp/dyn_pyld1-0.erf b/scripts/exp/dyn_pyld1-0.erf
index 175a810c..6a0028dc 100644
--- a/scripts/exp/dyn_pyld1-0.erf
+++ b/scripts/exp/dyn_pyld1-0.erf
Binary files differ
diff --git a/scripts/exp/imix-0-ex.erf b/scripts/exp/imix-0-ex.erf
index 233e6b31..07fb2ace 100755
--- a/scripts/exp/imix-0-ex.erf
+++ b/scripts/exp/imix-0-ex.erf
Binary files differ
diff --git a/scripts/exp/imix-0.erf b/scripts/exp/imix-0.erf
index c41a3006..07fb2ace 100644
--- a/scripts/exp/imix-0.erf
+++ b/scripts/exp/imix-0.erf
Binary files differ
diff --git a/scripts/exp/imix_v6-0-ex.erf b/scripts/exp/imix_v6-0-ex.erf
index 56412091..c5f247d1 100755
--- a/scripts/exp/imix_v6-0-ex.erf
+++ b/scripts/exp/imix_v6-0-ex.erf
Binary files differ
diff --git a/scripts/exp/imix_v6-0.erf b/scripts/exp/imix_v6-0.erf
index a85ed2b9..c5f247d1 100644
--- a/scripts/exp/imix_v6-0.erf
+++ b/scripts/exp/imix_v6-0.erf
Binary files differ
diff --git a/scripts/exp/limit_single_pkt-0-ex.erf b/scripts/exp/limit_single_pkt-0-ex.erf
index 3f7f0ff2..adc6fd46 100755
--- a/scripts/exp/limit_single_pkt-0-ex.erf
+++ b/scripts/exp/limit_single_pkt-0-ex.erf
Binary files differ
diff --git a/scripts/exp/limit_single_pkt-0.erf b/scripts/exp/limit_single_pkt-0.erf
index 548d2e3f..adc6fd46 100644
--- a/scripts/exp/limit_single_pkt-0.erf
+++ b/scripts/exp/limit_single_pkt-0.erf
Binary files differ
diff --git a/scripts/exp/sfr2-0-ex.erf b/scripts/exp/sfr2-0-ex.erf
index 5e2b791f..e5dfc4c3 100755
--- a/scripts/exp/sfr2-0-ex.erf
+++ b/scripts/exp/sfr2-0-ex.erf
Binary files differ
diff --git a/scripts/exp/sfr2-0.erf b/scripts/exp/sfr2-0.erf
index bf5ff3ef..e5dfc4c3 100644
--- a/scripts/exp/sfr2-0.erf
+++ b/scripts/exp/sfr2-0.erf
Binary files differ
diff --git a/src/bp_sim.cpp b/src/bp_sim.cpp
index 65dba06d..479f0982 100755
--- a/src/bp_sim.cpp
+++ b/src/bp_sim.cpp
@@ -3412,7 +3412,7 @@ int CNodeGenerator::flush_file(dsec_t max_time,
* if a positive value was given to max time
* schedule an exit node
*/
- if (max_time > 0) {
+ if ( (max_time > 0) && (!always) ) {
CGenNode *exit_node = thread->create_node();
exit_node->m_type = CGenNode::EXIT_SCHED;
@@ -3420,7 +3420,7 @@ int CNodeGenerator::flush_file(dsec_t max_time,
add_node(exit_node);
}
- while (true) {
+ while (!m_p_queue.empty()) {
node = m_p_queue.top();
n_time = node->m_time + offset;
@@ -3532,9 +3532,6 @@ int CNodeGenerator::flush_file(dsec_t max_time,
}
- /* cleanup */
- remove_all(thread);
-
if (!always) {
old_offset =offset;
}else{
@@ -3611,8 +3608,10 @@ CNodeGenerator::handle_slow_messages(uint8_t type,
}
} else if ( type == CGenNode::EXIT_SCHED ) {
+ m_p_queue.pop();
+ thread->free_node(node);
exit_scheduler = true;
-
+
} else {
printf(" ERROR type is not valid %d \n",type);
assert(0);
diff --git a/src/stateless/dp/trex_stateless_dp_core.cpp b/src/stateless/dp/trex_stateless_dp_core.cpp
index 35ce43a8..b2bd0152 100644
--- a/src/stateless/dp/trex_stateless_dp_core.cpp
+++ b/src/stateless/dp/trex_stateless_dp_core.cpp
@@ -76,6 +76,7 @@ TrexStatelessDpCore::start_scheduler() {
double old_offset = 0.0;
m_core->m_node_gen.flush_file(-1, 0.0, false, m_core, old_offset);
+ m_core->m_node_gen.close_file(m_core);
}
void