diff options
author | 2016-01-05 15:24:33 +0200 | |
---|---|---|
committer | 2016-01-05 15:24:33 +0200 | |
commit | 349d47374639465d58bac37f6e93045a1f9bb718 (patch) | |
tree | ba493401f9892105e51d3a3a6f3f7b561e2987b8 /src/bp_sim.cpp | |
parent | 823b8294539f2e55db09795a7fff03d7be6b6346 (diff) | |
parent | 857bdcf05a920b99e1cf180c700176b04801da00 (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/bp_sim.cpp')
-rwxr-xr-x | src/bp_sim.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/bp_sim.cpp b/src/bp_sim.cpp index 081553b5..6342b7f3 100755 --- a/src/bp_sim.cpp +++ b/src/bp_sim.cpp @@ -3146,7 +3146,7 @@ int CNodeGenerator::open_file(std::string file_name, /* ser preview mode */ m_v_if->set_review_mode(preview_mode); m_v_if->open_file(file_name); - m_cnt = 1; + m_cnt = 0; return (0); } @@ -3159,11 +3159,13 @@ int CNodeGenerator::close_file(CFlowGenListPerThread * thread){ } int CNodeGenerator::update_stl_stats(CGenNodeStateless *node_sl){ + m_cnt++; + if ( m_preview_mode.getVMode() >2 ){ fprintf(stdout," %4lu ,", (ulong)m_cnt); node_sl->Dump(stdout); - m_cnt++; } + return (0); } @@ -3199,7 +3201,9 @@ bool CFlowGenListPerThread::Create(uint32_t thread_id, char name[100]; sprintf(name,"nodes-%d",m_core_id); - printf(" create thread %d %s socket: %d \n",m_core_id,name,socket_id); + + //printf(" create thread %d %s socket: %d \n",m_core_id,name,socket_id); + m_node_pool = utl_rte_mempool_create_non_pkt(name, CGlobalInfo::m_memory_cfg.get_each_core_dp_flows(), sizeof(CGenNode), @@ -3207,7 +3211,8 @@ bool CFlowGenListPerThread::Create(uint32_t thread_id, 0 , socket_id); - printf(" pool %p \n",m_node_pool); + //printf(" pool %p \n",m_node_pool); + m_node_gen.Create(this); m_flow_id_to_node_lookup.Create(); |