From: Carter Waxman <cwaxman@cisco.com>
Date: Mon, 4 Apr 2016 19:25:19 +0000 (-0400)
Subject: fixed param orders in perf_module.h. moved perf file macros to respective class defin... 
X-Git-Tag: 3.0.0-233~485^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bee4bdad8e220cd70b01b61772b60e37628fdeb3;p=thirdparty%2Fsnort3.git

fixed param orders in perf_module.h. moved perf file macros to respective class definition files
---

diff --git a/src/network_inspectors/perf_monitor/base_tracker.cc b/src/network_inspectors/perf_monitor/base_tracker.cc
index fba2ebb57..60ed0b0dd 100644
--- a/src/network_inspectors/perf_monitor/base_tracker.cc
+++ b/src/network_inspectors/perf_monitor/base_tracker.cc
@@ -27,6 +27,8 @@
 #include "managers/plugin_manager.h"
 #include "utils/stats.h"
 
+#define BASE_FILE (PERF_NAME ".csv")
+
 using namespace std;
 
 BaseTracker::BaseTracker(PerfConfig* perf) : PerfTracker(perf,
diff --git a/src/network_inspectors/perf_monitor/cpu_tracker.cc b/src/network_inspectors/perf_monitor/cpu_tracker.cc
index 41cb8ce6f..6d3083f28 100644
--- a/src/network_inspectors/perf_monitor/cpu_tracker.cc
+++ b/src/network_inspectors/perf_monitor/cpu_tracker.cc
@@ -25,6 +25,8 @@
 
 #include <sys/resource.h>
 
+#define CPU_FILE (PERF_NAME "_cpu.csv")
+
 #ifdef UNIT_TEST
 #include "catch/catch.hpp"
 #endif
@@ -37,6 +39,10 @@ static inline uint64_t get_microseconds(struct timeval t)
     return (uint64_t)t.tv_sec * 1000000 + t.tv_usec;
 }
 
+
+CPUTracker::CPUTracker(PerfConfig *perf) :
+    PerfTracker(perf, perf->output == PERF_FILE ? CPU_FILE : nullptr){}
+
 void CPUTracker::get_clocks(struct rusage& usage, struct timeval& wall_time)
 {
     getrusage(RUSAGE_THREAD, &usage);
diff --git a/src/network_inspectors/perf_monitor/cpu_tracker.h b/src/network_inspectors/perf_monitor/cpu_tracker.h
index 6d416b714..336f68cbe 100644
--- a/src/network_inspectors/perf_monitor/cpu_tracker.h
+++ b/src/network_inspectors/perf_monitor/cpu_tracker.h
@@ -29,9 +29,7 @@
 class CPUTracker : public PerfTracker
 {
 public:
-    CPUTracker(PerfConfig *perf):
-        PerfTracker(perf, perf->output == PERF_FILE ? CPU_FILE : nullptr)
-    {}
+    CPUTracker(PerfConfig*);
     void reset() override;
     void process(bool) override;
 
diff --git a/src/network_inspectors/perf_monitor/event_tracker.cc b/src/network_inspectors/perf_monitor/event_tracker.cc
index 126289b62..6d8eac981 100644
--- a/src/network_inspectors/perf_monitor/event_tracker.cc
+++ b/src/network_inspectors/perf_monitor/event_tracker.cc
@@ -23,11 +23,16 @@
 #include "utils/stats.h"
 #include "utils/util.h"
 
+#define EVENT_FILE (PERF_NAME "_event.csv")
+
 THREAD_LOCAL EventTracker* perf_event;
 
 static std::string csv_header =
     "#timestamp,qualified_events,non_qualified_events\n";
 
+EventTracker::EventTracker(PerfConfig *perf) :
+    PerfTracker(perf, perf->output == PERF_FILE ? EVENT_FILE : nullptr) {}
+
 void EventTracker::reset()
 {
     event_counts.NQEvents = 0;
diff --git a/src/network_inspectors/perf_monitor/event_tracker.h b/src/network_inspectors/perf_monitor/event_tracker.h
index a701debca..855526cd0 100644
--- a/src/network_inspectors/perf_monitor/event_tracker.h
+++ b/src/network_inspectors/perf_monitor/event_tracker.h
@@ -36,8 +36,7 @@ struct PerfEventCounts
 class EventTracker : public PerfTracker
 {
 public:
-    EventTracker(PerfConfig* perf) :
-        PerfTracker(perf, perf->output == PERF_FILE ? EVENT_FILE : nullptr) { }
+    EventTracker(PerfConfig*);
     void reset() override;
     void process(bool) override;
 
diff --git a/src/network_inspectors/perf_monitor/flow_ip_tracker.cc b/src/network_inspectors/perf_monitor/flow_ip_tracker.cc
index f50515474..89bdd7a59 100644
--- a/src/network_inspectors/perf_monitor/flow_ip_tracker.cc
+++ b/src/network_inspectors/perf_monitor/flow_ip_tracker.cc
@@ -25,6 +25,8 @@
 #include "sfip/sf_ip.h"
 #include "utils/util.h"
 
+#define FLIP_FILE (PERF_NAME "_flow_ip.csv")
+
 struct FlowStateKey
 {
     sfip_t ipA;
diff --git a/src/network_inspectors/perf_monitor/flow_tracker.cc b/src/network_inspectors/perf_monitor/flow_tracker.cc
index f05f6c5b7..29a8ca670 100644
--- a/src/network_inspectors/perf_monitor/flow_tracker.cc
+++ b/src/network_inspectors/perf_monitor/flow_tracker.cc
@@ -23,6 +23,8 @@
 
 #include "utils/util.h"
 
+#define FLOW_FILE (PERF_NAME "_flow.csv")
+
 THREAD_LOCAL FlowTracker* perf_flow;
 
 FlowTracker::FlowTracker(PerfConfig* perf) : PerfTracker(perf,
diff --git a/src/network_inspectors/perf_monitor/perf_module.cc b/src/network_inspectors/perf_monitor/perf_module.cc
index 1beceb9bb..5994c8a7c 100644
--- a/src/network_inspectors/perf_monitor/perf_module.cc
+++ b/src/network_inspectors/perf_monitor/perf_module.cc
@@ -112,6 +112,11 @@ bool PerfMonModule::set(const char*, Value& v, SnortConfig*)
         if ( v.get_bool() )
             config.perf_flags |= PERF_CPU;
     }
+    else if ( v.is("events") )
+    {
+        if ( v.get_bool() )
+            config.perf_flags |= PERF_EVENT;
+    }
     else if ( v.is("flow") )
     {
         if ( v.get_bool() )
@@ -122,11 +127,6 @@ bool PerfMonModule::set(const char*, Value& v, SnortConfig*)
         if ( v.get_bool() )
             config.perf_flags |= PERF_FLOWIP;
     }
-    else if ( v.is("events") )
-    {
-        if ( v.get_bool() )
-            config.perf_flags |= PERF_EVENT;
-    }
     else if ( v.is("packets") )
     {
         config.pkt_cnt = v.get_long();
diff --git a/src/network_inspectors/perf_monitor/perf_module.h b/src/network_inspectors/perf_monitor/perf_module.h
index f6db8f4de..b066a2d0d 100644
--- a/src/network_inspectors/perf_monitor/perf_module.h
+++ b/src/network_inspectors/perf_monitor/perf_module.h
@@ -35,12 +35,6 @@
 #define PERF_FLOWIP     0x00000020
 #define PERF_SUMMARY    0x00000040
 
-#define BASE_FILE "perf_monitor.csv"
-#define FLOW_FILE "perf_monitor_flow.csv"
-#define FLIP_FILE "perf_monitor_flow_ip.csv"
-#define EVENT_FILE "perf_monitor_event.csv"
-#define CPU_FILE "perf_monitor_cpu.csv"
-
 #define ROLLOVER_THRESH     512
 #define MAX_PERF_FILE_SIZE  UINT64_MAX
 #define MIN_PERF_FILE_SIZE  4096