Merge pull request #2794 in SNORT/snort3 from ~SMULKA/snort3:dtrace_style to master

Squashed commit of the following:

commit ecc98c4f141de36b9f334933c14247f0b95b2ea2
Author: smulka <smulka@cisco.com>
Date:   Thu Mar 11 23:14:21 2021 -0500

    packet_tracer: Remove unused pt_timer_start()

diff --git a/src/network_inspectors/packet_tracer/packet_tracer.cc b/src/network_inspectors/packet_tracer/packet_tracer.cc
index 5acb55be3ea23ae9628ecb355d9135530c328532..ab17725d97337fe70784d44932ac7bc8feeab6bf 100644 (file)
--- a/src/network_inspectors/packet_tracer/packet_tracer.cc
+++ b/src/network_inspectors/packet_tracer/packet_tracer.cc
@@ -257,12 +257,6 @@ void PacketTracer::activate(const Packet& p)
         s_pkt_trace->active = false;
 }
 
-void PacketTracer::pt_timer_start()
-{
-    pt_timer->reset();
-    pt_timer->start();
-}
-
 // -----------------------------------------------------------------------------
 // non-static functions
 // -----------------------------------------------------------------------------
@@ -562,7 +556,6 @@ TEST_CASE("basic daq log", "[PacketTracer]")
     char test_str[] = "1234567890";
     // instantiate a packet tracer
     TestPacketTracer::thread_init();
-    TestPacketTracer::pt_timer_start();
     TestPacketTracer::set_daq_enable(true);
     TestPacketTracer::daq_log("%s", test_str);
     CHECK(!(strcmp(TestPacketTracer::get_daq_buff(), test_str)));

diff --git a/src/network_inspectors/packet_tracer/packet_tracer.h b/src/network_inspectors/packet_tracer/packet_tracer.h
index 6890dd5dac441aa1ba94514b04f2ef3aa68c2232..354a58a4d69facbd67ad4a282ff2c22f56a7c690 100644 (file)
--- a/src/network_inspectors/packet_tracer/packet_tracer.h
+++ b/src/network_inspectors/packet_tracer/packet_tracer.h
@@ -77,7 +77,6 @@ public:
     static SO_PUBLIC void log(TracerMute, const char* format, ...) __attribute__((format (printf, 2, 3)));
 
     static SO_PUBLIC void daq_log(const char* format, ...) __attribute__((format (printf, 1, 2)));
-    static SO_PUBLIC void pt_timer_start();
 
 protected: