diff options
Diffstat (limited to 'src/gtest')
-rw-r--r-- | src/gtest/trex_stateless_gtest.cpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/gtest/trex_stateless_gtest.cpp b/src/gtest/trex_stateless_gtest.cpp index 90dea72e..1626ac25 100644 --- a/src/gtest/trex_stateless_gtest.cpp +++ b/src/gtest/trex_stateless_gtest.cpp @@ -183,7 +183,7 @@ TEST_F(basic_vm, vm1) { vm.set_packet_size(128); - vm.compile_next(); + vm.compile(); uint32_t program_size=vm.get_dp_instruction_buffer()->get_program_size(); @@ -208,7 +208,7 @@ TEST_F(basic_vm, vm2) { vm.set_packet_size(128); - vm.compile_next(); + vm.compile(); uint32_t program_size=vm.get_dp_instruction_buffer()->get_program_size(); @@ -286,7 +286,7 @@ TEST_F(basic_vm, vm3) { vm.set_packet_size(128); - vm.compile_next(); + vm.compile(); uint32_t program_size=vm.get_dp_instruction_buffer()->get_program_size(); @@ -371,7 +371,7 @@ TEST_F(basic_vm, vm4) { vm.set_packet_size(128); - vm.compile_next(); + vm.compile(); uint32_t program_size=vm.get_dp_instruction_buffer()->get_program_size(); @@ -468,7 +468,7 @@ TEST_F(basic_vm, vm5) { vm.set_packet_size(128); - vm.compile_next(); + vm.compile(); uint32_t program_size=vm.get_dp_instruction_buffer()->get_program_size(); @@ -610,7 +610,7 @@ TEST_F(basic_vm, vm6) { vm.set_packet_size(128); - vm.compile_next(); + vm.compile(); uint32_t program_size=vm.get_dp_instruction_buffer()->get_program_size(); @@ -678,7 +678,7 @@ TEST_F(basic_vm, vm7) { vm.set_packet_size(128); - vm.compile_next(); + vm.compile(); uint32_t program_size=vm.get_dp_instruction_buffer()->get_program_size(); @@ -744,7 +744,7 @@ TEST_F(basic_vm, vm8) { vm.set_packet_size(128); - vm.compile_next(); + vm.compile(); uint32_t program_size=vm.get_dp_instruction_buffer()->get_program_size(); @@ -784,7 +784,8 @@ TEST_F(basic_vm, vm8) { } static void vm_build_program_seq(StreamVm & vm, - uint16_t packet_size ){ + uint16_t packet_size, + bool should_compile){ vm.add_instruction( new StreamVmInstructionFlowClient( "tuple_gen", 0x10000001, @@ -807,7 +808,9 @@ static void vm_build_program_seq(StreamVm & vm, vm.set_packet_size(packet_size); - vm.compile_next(); + if (should_compile) { + vm.compile(); + } } @@ -816,7 +819,7 @@ TEST_F(basic_vm, vm9) { StreamVm vm; - vm_build_program_seq(vm,128); + vm_build_program_seq(vm,128, true); printf(" max packet update %lu \n",(ulong)vm.get_max_packet_update_offset()); @@ -864,7 +867,7 @@ TEST_F(basic_vm, vm10) { StreamVm vm; - vm_build_program_seq(vm,128); + vm_build_program_seq(vm,128, true); printf(" max packet update %lu \n",(ulong)vm.get_max_packet_update_offset()); @@ -2047,16 +2050,14 @@ void CEnableVm::run(bool full_packet,double duration=10.0){ uint16_t pkt_size=pcap.m_raw.pkt_len; - stream1->m_has_vm = true; - vm_build_program_seq(stream1->m_vm,pkt_size); - stream1->post_vm_compile(); - + vm_build_program_seq(stream1->m_vm,pkt_size, false); + #if 0 if ( full_packet ){ EXPECT_EQ(stream1->m_vm_prefix_size,pkt_size); }else{ EXPECT_EQ(stream1->m_vm_prefix_size,35); } - + #endif streams.push_back(stream1); |