Merge pull request #131 in SNORT/snort3 from ~JOCORNET/snort3:rearrange_time_dir...

Squashed commit of the following:

commit 9a2fb92580e29b331a85a1ad97a117f134b54c80
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 17:23:46 2015 -0500

    added include

commit b4e5a52f19c70958223919c6aa18e8d533b60305
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 17:05:20 2015 -0500

    further cleanup

commit 9069e256c3d50c4e3dfa95d288bc7a95d3dc333f
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 16:53:13 2015 -0500

    added forward declarations for profilestats

commit 86a6864733ff5fd1a40931b6a7ae92619b6f292d
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 16:38:14 2015 -0500

    moved profiler to its own directory

commit 3660246db180aa0048ac9a55fe43e05947857c9f
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 16:13:32 2015 -0500

    moved ppm to its own directory

diff --git a/configure.ac b/configure.ac
index 23b8af07056fc2da73f82ccc5295d46952e6ede1..bd8e73d205fc827c1e7ae9f86436221cc9e3bf3e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -343,7 +343,10 @@ AC_ARG_ENABLE(ppm,
     AC_HELP_STRING([--enable-ppm],[enable packet/rule performance monitor]),
     enable_ppm="$enableval", enable_ppm="no")
 
+AM_CONDITIONAL(PPM_MGR, test "x$enable_ppm" = "xyes")
+
 if test "x$enable_ppm" = "xyes"; then
+    CPPFLAGS="$CPPFLAGS -DPPM_MGR"
     AC_DEFINE(PPM_MGR, [1], [build ppm manager])
 fi
 
@@ -1031,6 +1034,8 @@ src/sfrt/Makefile \
 src/target_based/Makefile \
 src/catch/Makefile \
 src/time/Makefile \
+src/ppm/Makefile \
+src/profiler/Makefile \
 src/utils/Makefile \
 src/utils/test/Makefile \
 lua/Makefile \

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a5d45f22d81dc96a0685951cab01950e1cd74d13..aa0aae10b139f1a086cc42a33da33467387c396e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -74,6 +74,14 @@ if (BUILD_PIGLET)
     add_subdirectory(piglet_plugins)
 endif (BUILD_PIGLET)
 
+if (ENABLE_PPM)
+    set(PPM_LIBRARIES ppm)
+    add_subdirectory(ppm)
+endif (ENABLE_PPM)
+
+if (ENABLE_PERFPROFILING)
+    set(PERFPROFILING_LIBRARIES profiler)
+endif (ENABLE_PERFPROFILING)
 
 #  The main Snort executableRA
 add_executable( snort
@@ -124,6 +132,8 @@ target_link_libraries( snort
     detection
     framework
     time
+    ${PPM_LIBRARIES}
+    ${PERFPROFILING_LIBRARIES}
     ips_actions
     events
     hash
@@ -164,6 +174,7 @@ add_subdirectory(service_inspectors)
 add_subdirectory(stream)
 add_subdirectory(target_based)
 add_subdirectory(time)
+add_subdirectory(profiler)
 add_subdirectory(utils)
 add_subdirectory(helpers)
 add_subdirectory(lua)

diff --git a/src/Makefile.am b/src/Makefile.am
index 91bc097c416ecec1c8f3642594393f825da09a5b..468d65d12b154e617e0eb84bcb709e204b0a1d4b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,6 +36,14 @@ piglet/libpiglet.a \
 piglet_plugins/libpiglet_plugins.a
 endif
 
+if PPM_MGR
+ppm_list = ppm/libppm.a
+endif
+
+if PERF_PROFILING
+profiler_list = profiler/libprofiler.a
+endif
+
 snort_LDFLAGS = -export-dynamic
 
 # order libs to avoid undefined symbols
@@ -85,6 +93,8 @@ filters/libfilter.a \
 detection/libdetection.a \
 framework/libframework.a \
 time/libtime.a \
+$(ppm_list) \
+$(profiler_list) \
 actions/libips_actions.a \
 events/libevents.a \
 hash/libhash.a \
@@ -131,6 +141,7 @@ sfrt \
 stream \
 target_based \
 time \
+profiler \
 utils
 
 if BUILD_UNIT_TESTS
@@ -141,3 +152,6 @@ if BUILD_PIGLET
 SUBDIRS += piglet piglet_plugins
 endif
 
+if PPM_MGR
+SUBDIRS += ppm
+endif

diff --git a/src/actions/act_react.cc b/src/actions/act_react.cc
index 8506c14d390c1f6cf14814f9a26d88c303262451..69d0fb2c3ec651ca99f299f0daa994fa736c7cb4 100644 (file)
--- a/src/actions/act_react.cc
+++ b/src/actions/act_react.cc
@@ -54,7 +54,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "packet_io/active.h"
 #include "parser/parser.h"
 #include "framework/ips_action.h"

diff --git a/src/actions/act_reject.cc b/src/actions/act_reject.cc
index e31eacf372b0ac5bef201a84c031bb7bfc71492a..33eb4e4cf97f3237161d829de24ab9a2e884c8f8 100644 (file)
--- a/src/actions/act_reject.cc
+++ b/src/actions/act_reject.cc
@@ -51,7 +51,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "packet_io/active.h"
 #include "utils/util.h"
 #include "framework/ips_action.h"

diff --git a/src/detection/detect.cc b/src/detection/detect.cc
index a720231728d072e61426ca781c3905e7f06f4828..734f7a7e979b881e48d2c433cf938586ba6b31e5 100644 (file)
--- a/src/detection/detect.cc
+++ b/src/detection/detect.cc
@@ -53,8 +53,8 @@
 #include "events/event_wrapper.h"
 #include "events/event_queue.h"
 #include "log/obfuscation.h"
-#include "time/profiler.h"
-#include "time/ppm.h"
+#include "profiler/profiler.h"
+#include "ppm/ppm.h"
 #include "stream/stream_api.h"
 #include "packet_io/active.h"
 #include "managers/inspector_manager.h"

diff --git a/src/detection/detect.h b/src/detection/detect.h
index c8056dfdf5deb6a50f8efdd3b6d253813e716a57..5b7a75ee0807d0fa63d31b7f52b2019faa9b76a8 100644 (file)
--- a/src/detection/detect.h
+++ b/src/detection/detect.h
@@ -31,7 +31,6 @@
 #include "detection/rules.h"
 #include "detection/treenodes.h"
 #include "parser/parser.h"
-#include "time/profiler.h"
 #include "log/log.h"
 #include "events/event.h"
 
@@ -39,6 +38,7 @@ extern SO_PUBLIC THREAD_LOCAL int do_detect;
 extern SO_PUBLIC THREAD_LOCAL int do_detect_content;
 
 #ifdef PERF_PROFILING
+struct ProfileStats;
 extern THREAD_LOCAL ProfileStats eventqPerfStats;
 extern THREAD_LOCAL ProfileStats detectPerfStats;
 extern THREAD_LOCAL ProfileStats rebuiltPacketPerfStats;

diff --git a/src/detection/detection_options.cc b/src/detection/detection_options.cc
index ca4d1d131209e0b1f4f6b1db47725ef915864df8..c1df6a9b96657c8d8b6f3c74ffc4dd61cf66e8f1 100644 (file)
--- a/src/detection/detection_options.cc
+++ b/src/detection/detection_options.cc
@@ -39,8 +39,8 @@
 #include "fp_detect.h"
 #include "rules.h"
 
-#include "time/ppm.h"
-#include "time/profiler.h"
+#include "ppm/ppm.h"
+#include "profiler/profiler.h"
 #include "utils/util.h"
 #include "hash/sfxhash.h"
 #include "hash/sfhashfcn.h"

diff --git a/src/detection/fp_detect.cc b/src/detection/fp_detect.cc
index 96136aeb4f99a4a38b130d4eff8174052b22374d..35b4c8aa95f91e7ecc582e5d07f1334404a0047e 100644 (file)
--- a/src/detection/fp_detect.cc
+++ b/src/detection/fp_detect.cc
@@ -67,7 +67,8 @@
 #include "stream/stream_api.h"
 #include "utils/sflsq.h"
 #include "utils/util.h"
-#include "time/ppm.h"
+#include "ppm/ppm.h"
+#include "profiler/profiler.h"
 #include "actions/actions.h"
 #include "sfip/sf_ip.h"
 #include "managers/action_manager.h"

diff --git a/src/detection/fp_detect.h b/src/detection/fp_detect.h
index e92a56b90ed5c6c813d59a1fbe4427be51ced4a3..477bee25e737381ced300df83004548a4cebef36 100644 (file)
--- a/src/detection/fp_detect.h
+++ b/src/detection/fp_detect.h
@@ -36,12 +36,12 @@
 #include "detection/fp_create.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
 #include "utils/sflsq.h"
 
 #define REBUILD_FLAGS (PKT_REBUILT_FRAG | PKT_REBUILT_STREAM)
 
 #ifdef PERF_PROFILING
+struct ProfileStats;
 extern THREAD_LOCAL ProfileStats rulePerfStats;
 extern THREAD_LOCAL ProfileStats ruleRTNEvalPerfStats;
 extern THREAD_LOCAL ProfileStats ruleOTNEvalPerfStats;

diff --git a/src/framework/mpse.cc b/src/framework/mpse.cc
index a5bf4696555cea68083c5a6e935799eba4bdda43..c506f98f35e7584acf36045b11080457c740caa5 100644 (file)
--- a/src/framework/mpse.cc
+++ b/src/framework/mpse.cc
@@ -26,6 +26,7 @@ using namespace std;
 
 #include "main/snort_debug.h"
 #include "main/snort_types.h"
+#include "profiler/profiler.h"
 
 // this is accumulated only for fast pattern
 // searches for the detection engine

diff --git a/src/framework/mpse.h b/src/framework/mpse.h
index 7faddf7aae55b2cffa8ece88860eb9defc29d0cf..cfd44b52fa96f6a451d6cef047558b06086ffa46 100644 (file)
--- a/src/framework/mpse.h
+++ b/src/framework/mpse.h
@@ -33,7 +33,6 @@
 #include "main/snort_types.h"
 #include "main/thread.h"
 #include "framework/base_api.h"
-#include "time/profiler.h"
 
 /*
 *   Move these defines to a generic Win32/Unix compatability file,
@@ -101,6 +100,7 @@ private:
 };
 
 #ifdef PERF_PROFILING
+struct ProfileStats;
 extern THREAD_LOCAL ProfileStats mpsePerfStats;
 #endif
 

diff --git a/src/helpers/chunk.cc b/src/helpers/chunk.cc
index 344044ee780b75846b60b1f90dce7c8e45c9ab26..db8b7598bae6ed33eafa051f5658f5a11acf4da2 100644 (file)
--- a/src/helpers/chunk.cc
+++ b/src/helpers/chunk.cc
@@ -25,7 +25,7 @@
 #include "hash/sfhashfcn.h"
 #include "parser/parser.h"
 #include "framework/cursor.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "lua/lua.h"
 
 #ifdef UNIT_TEST

diff --git a/src/ips_options/ips_ack.cc b/src/ips_options/ips_ack.cc
index e7b00b392671e16b5aabcd1ad58b4c71e45ef97e..e9025567f37d9693b8b9ba2661e51a95570d4a7a 100644 (file)
--- a/src/ips_options/ips_ack.cc
+++ b/src/ips_options/ips_ack.cc
@@ -31,7 +31,7 @@
 #include "protocols/packet.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/ips_options/ips_asn1.cc b/src/ips_options/ips_asn1.cc
index 43b9838f2229ed6519df503752d82dd36ec38502..cb184add14d268404739569443c6064c30691cf5 100644 (file)
--- a/src/ips_options/ips_asn1.cc
+++ b/src/ips_options/ips_asn1.cc
@@ -71,7 +71,7 @@
 #include "detection/treenodes.h"
 #include "detection/detection_util.h"
 #include "detection/detection_defines.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/cursor.h"
 #include "framework/ips_option.h"
 #include "framework/parameter.h"

diff --git a/src/ips_options/ips_base64.cc b/src/ips_options/ips_base64.cc
index 46030762b7091d893a7516ce76e30ef3012f0932..7f43485c5189c8c62ee2eec8687cecc3f1fd68e7 100644 (file)
--- a/src/ips_options/ips_base64.cc
+++ b/src/ips_options/ips_base64.cc
@@ -32,7 +32,7 @@
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
 #include "parser/parser.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "utils/util.h"
 #include "mime/decode_b64.h"
 #include "utils/util_unfold.h"

diff --git a/src/ips_options/ips_bufferlen.cc b/src/ips_options/ips_bufferlen.cc
index 81e055b13930c49578f176e388692b96f06c186e..4e31d4ecc34b69503aa7edd0644171736573a9d6 100644 (file)
--- a/src/ips_options/ips_bufferlen.cc
+++ b/src/ips_options/ips_bufferlen.cc
@@ -27,7 +27,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "framework/range.h"
 #include "framework/ips_option.h"

diff --git a/src/ips_options/ips_byte_extract.cc b/src/ips_options/ips_byte_extract.cc
index 8558a992b6b574005bdf5f31538de4028538711f..d210102c21a87e6288a0270e4ae958e1fe336892 100644 (file)
--- a/src/ips_options/ips_byte_extract.cc
+++ b/src/ips_options/ips_byte_extract.cc
@@ -30,7 +30,7 @@
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/ips_option.h"
 #include "framework/cursor.h"
 #include "framework/parameter.h"

diff --git a/src/ips_options/ips_byte_jump.cc b/src/ips_options/ips_byte_jump.cc
index b4450c20dd028790b4a79f5e95413ce484778518..727f63c8c957dd927362cd4b7328fc0f1846714a 100644 (file)
--- a/src/ips_options/ips_byte_jump.cc
+++ b/src/ips_options/ips_byte_jump.cc
@@ -82,7 +82,7 @@
 #include "utils/util.h"
 #include "utils/snort_bounds.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"

diff --git a/src/ips_options/ips_byte_test.cc b/src/ips_options/ips_byte_test.cc
index 673a850797032253a16b0aa1c948eb4dd32baadf..f8c64301fdfbe686c0500de690af4e9cd4c7dfa1 100644 (file)
--- a/src/ips_options/ips_byte_test.cc
+++ b/src/ips_options/ips_byte_test.cc
@@ -102,7 +102,7 @@ using namespace std;
 #include "parser/parser.h"
 #include "utils/util.h"
 #include "utils/snort_bounds.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"

diff --git a/src/ips_options/ips_content.cc b/src/ips_options/ips_content.cc
index 1c51f618c9f80a8698794550df34999136faa97b..2b597ea509ca6ec14b9f76d944221e6beb9ae0cf 100644 (file)
--- a/src/ips_options/ips_content.cc
+++ b/src/ips_options/ips_content.cc
@@ -38,7 +38,7 @@
 #include "parser/parser.h"
 #include "parser/parse_utils.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"

diff --git a/src/ips_options/ips_cvs.cc b/src/ips_options/ips_cvs.cc
index 314b12baf8ca8a4487c44c259110580bce453691..a3783b8628b1b99a89dab7d310d5cba738d8a563 100644 (file)
--- a/src/ips_options/ips_cvs.cc
+++ b/src/ips_options/ips_cvs.cc
@@ -51,7 +51,7 @@
 #include "parser/parser.h"
 #include "utils/util.h"
 #include "utils/snort_bounds.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"

diff --git a/src/ips_options/ips_dsize.cc b/src/ips_options/ips_dsize.cc
index 878b82cd6573de0a94839eb261fc4f3808062c47..9677eea0b25fe554b8449a3e703243d55ac49104 100644 (file)
--- a/src/ips_options/ips_dsize.cc
+++ b/src/ips_options/ips_dsize.cc
@@ -31,7 +31,7 @@
 #include "parser/parser.h"
 #include "utils/util.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/ips_options/ips_file_data.cc b/src/ips_options/ips_file_data.cc
index eb99ac6caa546dbe3e713df349d9facc552da745..9d83ae350ab7324ec0e67a092e3d189947420afb 100644 (file)
--- a/src/ips_options/ips_file_data.cc
+++ b/src/ips_options/ips_file_data.cc
@@ -29,7 +29,7 @@
 
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"
 #include "framework/cursor.h"

diff --git a/src/ips_options/ips_flags.cc b/src/ips_options/ips_flags.cc
index 454c2c89315117fe846c7d250ffcf4c0403c0ab6..ecd7d55bc60577b6ca8b67b9fdf80ac604ab4606 100644 (file)
--- a/src/ips_options/ips_flags.cc
+++ b/src/ips_options/ips_flags.cc
@@ -33,7 +33,7 @@
 #include "protocols/tcp.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"

diff --git a/src/ips_options/ips_flow.cc b/src/ips_options/ips_flow.cc
index 75e69750278896f73b1f8bc89796dfcaa76d4125..c134a7b6fdd764fbb9347b3fdac10f52d9baa0dc 100644 (file)
--- a/src/ips_options/ips_flow.cc
+++ b/src/ips_options/ips_flow.cc
@@ -35,7 +35,7 @@
 #include "utils/util.h"
 #include "hash/sfhashfcn.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
 #include "framework/parameter.h"

diff --git a/src/ips_options/ips_flowbits.cc b/src/ips_options/ips_flowbits.cc
index 1fd63b8e4f60ce4abf8f96400cd163725a2e6645..40255055c1f0eafe420f0163b8f6b10874d51b74 100644 (file)
--- a/src/ips_options/ips_flowbits.cc
+++ b/src/ips_options/ips_flowbits.cc
@@ -62,7 +62,7 @@ using namespace std;
 #include "hash/sfghash.h"
 #include "parser/mstring.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/ips_options/ips_fragbits.cc b/src/ips_options/ips_fragbits.cc
index e990b6de6b754a2c453c3b08e4f3dcd3062264f0..5c574cb1c1978aa740f8ce7cc8ebd79b520b0fdf 100644 (file)
--- a/src/ips_options/ips_fragbits.cc
+++ b/src/ips_options/ips_fragbits.cc
@@ -56,7 +56,7 @@
 #include "protocols/packet.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"

diff --git a/src/ips_options/ips_fragoffset.cc b/src/ips_options/ips_fragoffset.cc
index 9056ff27b024086452fc759d384fbcedf3a63d4f..5151779fca2bb2059cdb1af2bb00c4714fb0c2b4 100644 (file)
--- a/src/ips_options/ips_fragoffset.cc
+++ b/src/ips_options/ips_fragoffset.cc
@@ -29,7 +29,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/ips_options/ips_hash.cc b/src/ips_options/ips_hash.cc
index 302403857a10c229c9218488e5b4f7e4debbc53a..6c49953d6f3781bfeb13e534fd9092b12b474ac9 100644 (file)
--- a/src/ips_options/ips_hash.cc
+++ b/src/ips_options/ips_hash.cc
@@ -32,7 +32,7 @@
 #include "hash/hashes.h"
 #include "framework/cursor.h"
 #include "framework/ips_option.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"
 #include "framework/parameter.h"

diff --git a/src/ips_options/ips_http.cc b/src/ips_options/ips_http.cc
index dc368bbae454193a8851c63878e3bc1d5e477b16..4bbbd0177d177232c5ef4415a35ccadb89e58d65 100644 (file)
--- a/src/ips_options/ips_http.cc
+++ b/src/ips_options/ips_http.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "flow/flow.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/ips_options/ips_http_header.cc b/src/ips_options/ips_http_header.cc
index 0e19a0b5d4210e59c32e5e37c546549fe31cb0b7..5b2130ea0f50baa20bccd2d77cb0b35246e2a120 100644 (file)
--- a/src/ips_options/ips_http_header.cc
+++ b/src/ips_options/ips_http_header.cc
@@ -27,7 +27,7 @@ using namespace std;
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "parser/parser.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "flow/flow.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/ips_options/ips_icmp_id.cc b/src/ips_options/ips_icmp_id.cc
index 395b5357832ae875fe3fbffd6c6342f4847e798b..a0b009d6f2ea100fda190998a98a0ae3e441b192 100644 (file)
--- a/src/ips_options/ips_icmp_id.cc
+++ b/src/ips_options/ips_icmp_id.cc
@@ -48,7 +48,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/ips_options/ips_icmp_seq.cc b/src/ips_options/ips_icmp_seq.cc
index 3caede13e81e602cd55ab2c57cc31b1f21e752d8..1f1ca07e08d95d2d5cdae18c78b7cacdb0a97119 100644 (file)
--- a/src/ips_options/ips_icmp_seq.cc
+++ b/src/ips_options/ips_icmp_seq.cc
@@ -47,7 +47,7 @@
 
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/ips_options/ips_icode.cc b/src/ips_options/ips_icode.cc
index 00fb6035d0863241b7a134e2b9947bf5c26977c6..48948fd8f9c6c1b85e6641b2633f779a56a761ff 100644 (file)
--- a/src/ips_options/ips_icode.cc
+++ b/src/ips_options/ips_icode.cc
@@ -29,7 +29,7 @@
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
 #include "framework/parameter.h"

diff --git a/src/ips_options/ips_id.cc b/src/ips_options/ips_id.cc
index f8f795df5851144973c888143dc85da26f4bcdb9..6fb8de88002a15316f120d97bca6e5a37efac05e 100644 (file)
--- a/src/ips_options/ips_id.cc
+++ b/src/ips_options/ips_id.cc
@@ -26,7 +26,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/ips_options/ips_ip_proto.cc b/src/ips_options/ips_ip_proto.cc
index 43d6134884201d18a1c74145eab9db1c0bafabc4..34769a7608afba37b65832b991edb423e3b79268 100644 (file)
--- a/src/ips_options/ips_ip_proto.cc
+++ b/src/ips_options/ips_ip_proto.cc
@@ -31,7 +31,7 @@
 #include "protocols/packet.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"

diff --git a/src/ips_options/ips_ipopts.cc b/src/ips_options/ips_ipopts.cc
index 86301bb2980fab33716ac22aa1a657e6c83c1598..6d2d2fab3f95710d1febad618cd60cd2c01d85a5 100644 (file)
--- a/src/ips_options/ips_ipopts.cc
+++ b/src/ips_options/ips_ipopts.cc
@@ -34,7 +34,7 @@
 #include "protocols/ipv4_options.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"

diff --git a/src/ips_options/ips_isdataat.cc b/src/ips_options/ips_isdataat.cc
index 1b43ad3143629bed24855c99faea2d506b0475af..437d75cdc94bd3a82bd4308c38e7d53f6015ae4b 100644 (file)
--- a/src/ips_options/ips_isdataat.cc
+++ b/src/ips_options/ips_isdataat.cc
@@ -50,7 +50,7 @@
 #include "main/snort_types.h"
 #include "utils/snort_bounds.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"

diff --git a/src/ips_options/ips_itype.cc b/src/ips_options/ips_itype.cc
index 362a6f85a6e8418eb2109af57cb9a3b64ff829f3..4bba006c0cf6dd1915ccdc467fdc96b345a7158f 100644 (file)
--- a/src/ips_options/ips_itype.cc
+++ b/src/ips_options/ips_itype.cc
@@ -25,7 +25,7 @@
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
 #include "framework/parameter.h"

diff --git a/src/ips_options/ips_luajit.cc b/src/ips_options/ips_luajit.cc
index 96a34ee8dac7ab74910d968efd6b8024f67dd8ec..35fd91ca3feb68d61c0ae6fb2f3b88bbddb13e7e 100644 (file)
--- a/src/ips_options/ips_luajit.cc
+++ b/src/ips_options/ips_luajit.cc
@@ -33,7 +33,7 @@
 #include "framework/module.h"
 #include "framework/parameter.h"
 #include "log/messages.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 
 static THREAD_LOCAL ProfileStats luaIpsPerfStats;

diff --git a/src/ips_options/ips_pcre.cc b/src/ips_options/ips_pcre.cc
index 461d04759883161bbe8df0c5000a0d7d9625e831..67da20c6d50abd194560cd5d6c7517525f7ab1ce 100644 (file)
--- a/src/ips_options/ips_pcre.cc
+++ b/src/ips_options/ips_pcre.cc
@@ -36,7 +36,7 @@
 #include "utils/util.h"
 #include "utils/snort_bounds.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"

diff --git a/src/ips_options/ips_pkt_data.cc b/src/ips_options/ips_pkt_data.cc
index 9fb274f40639e0a4906899f626bd3d78c33fc539..97276f7891fb5f373147584b1be098aaf4a5cbc6 100644 (file)
--- a/src/ips_options/ips_pkt_data.cc
+++ b/src/ips_options/ips_pkt_data.cc
@@ -25,7 +25,7 @@
 #include "main/snort_debug.h"
 #include "utils/snort_bounds.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/cursor.h"
 #include "framework/ips_option.h"
 #include "framework/module.h"

diff --git a/src/ips_options/ips_raw_data.cc b/src/ips_options/ips_raw_data.cc
index b63133d3ad3c7f9b33afd4139762f6f93582ca91..ca806d011e7df28448db6bce6fb18a1e9c99bd03 100644 (file)
--- a/src/ips_options/ips_raw_data.cc
+++ b/src/ips_options/ips_raw_data.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"
 #include "framework/cursor.h"

diff --git a/src/ips_options/ips_regex.cc b/src/ips_options/ips_regex.cc
index 74fddab41e26f003eabcd2f5a64791a7f49e1ecd..d9140f759a74f63fafd145ebd20cd37c16120576 100644 (file)
--- a/src/ips_options/ips_regex.cc
+++ b/src/ips_options/ips_regex.cc
@@ -33,7 +33,7 @@
 #include "main/snort_config.h"
 #include "main/thread.h"
 #include "parser/parser.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #define s_name "regex"
 

diff --git a/src/ips_options/ips_replace.cc b/src/ips_options/ips_replace.cc
index d354519dc339081d7edfaf1f1b14687b1f7a9b4c..c4ac92dab9d9f91cb0faf60727d547d69dc6e987 100644 (file)
--- a/src/ips_options/ips_replace.cc
+++ b/src/ips_options/ips_replace.cc
@@ -42,7 +42,7 @@ using namespace std;
 #include "detection/detection_defines.h"
 #include "actions/act_replace.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 static void replace_parse(const char* args, string& s)
 {

diff --git a/src/ips_options/ips_rpc.cc b/src/ips_options/ips_rpc.cc
index ab5fc694735db8256497e7bf52bafe6a08a50110..9e4a349205134f8fa4a6dbb6bc99352eb4a43bc1 100644 (file)
--- a/src/ips_options/ips_rpc.cc
+++ b/src/ips_options/ips_rpc.cc
@@ -32,7 +32,7 @@
 #include "main/snort_debug.h"
 #include "utils/util.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/ips_options/ips_seq.cc b/src/ips_options/ips_seq.cc
index 5e6948dad4564baf5548270a7f9be6247d6c9e52..6814810cefcc8a7f6bdc07e0c638364e0c5add93 100644 (file)
--- a/src/ips_options/ips_seq.cc
+++ b/src/ips_options/ips_seq.cc
@@ -23,7 +23,7 @@
 
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/ips_options/ips_session.cc b/src/ips_options/ips_session.cc
index bc6f8dac38bd01b81b9b25240de4529109cb1572..c5f2f682d66d648ca39c4783357d6d1a47f64bc7 100644 (file)
--- a/src/ips_options/ips_session.cc
+++ b/src/ips_options/ips_session.cc
@@ -58,7 +58,7 @@
 #include "protocols/packet.h"
 #include "main/snort_debug.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "detection/treenodes.h"

diff --git a/src/ips_options/ips_so.cc b/src/ips_options/ips_so.cc
index 7a7f7db82a71f8671790ca70cc9644f66294f25d..ebf8eb146f37be30fbfceb4f80786cad78f0b036 100644 (file)
--- a/src/ips_options/ips_so.cc
+++ b/src/ips_options/ips_so.cc
@@ -31,7 +31,7 @@ using namespace std;
 #include "managers/so_manager.h"
 #include "hash/sfhashfcn.h"
 #include "parser/parser.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #define s_name "so"
 

diff --git a/src/ips_options/ips_tos.cc b/src/ips_options/ips_tos.cc
index 48459a116fe10a45c40dcf2e2b69d644cc010a14..4f289ad2694e4b218689512d2d9c20de7cacf100 100644 (file)
--- a/src/ips_options/ips_tos.cc
+++ b/src/ips_options/ips_tos.cc
@@ -23,7 +23,7 @@
 
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/ips_options/ips_ttl.cc b/src/ips_options/ips_ttl.cc
index 6a84005ab9113d17ede813f8df8939e6d93c4ffd..6a1fd1f6179d58f9baf8abe2461af1a680caea07 100644 (file)
--- a/src/ips_options/ips_ttl.cc
+++ b/src/ips_options/ips_ttl.cc
@@ -25,7 +25,7 @@
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
 #include "framework/parameter.h"

diff --git a/src/ips_options/ips_window.cc b/src/ips_options/ips_window.cc
index 51f043500a26af9d6d5ae6497a7c937bd7057246..1dafff676b76e240065f613a9dd2f2ed40df91bc 100644 (file)
--- a/src/ips_options/ips_window.cc
+++ b/src/ips_options/ips_window.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/loggers/alert_luajit.cc b/src/loggers/alert_luajit.cc
index d3e5417e5b75c1f12ab8dedeef3ac52546cb00d1..d931b4a045983c131a6d33625c57fcaacbbec940 100644 (file)
--- a/src/loggers/alert_luajit.cc
+++ b/src/loggers/alert_luajit.cc
@@ -35,7 +35,7 @@
 #include "framework/logger.h"
 #include "framework/module.h"
 #include "framework/parameter.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "utils/stats.h"
 
 static THREAD_LOCAL ProfileStats luaLogPerfStats;

diff --git a/src/main.cc b/src/main.cc
index 66e6939271d8aa394bc78ec42e92c80203bdfa97..efdba1f6013fb637b385c4ed966b21f44bdba4e6 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -61,7 +61,7 @@ using namespace std;
 #include "lua/lua.h"
 #include "helpers/process.h"
 #include "helpers/swapper.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "time/periodic.h"
 
 #ifdef UNIT_TEST

diff --git a/src/main/modules.cc b/src/main/modules.cc
index 2a493d3a4b6abc2a08f4bd1a6780adf8a66060b8..3472ad517aeb7bc76da8f0c2ddffbe724c51845f 100644 (file)
--- a/src/main/modules.cc
+++ b/src/main/modules.cc
@@ -49,8 +49,8 @@ using namespace std;
 #include "filters/sfrf.h"
 #include "filters/rate_filter.h"
 #include "codecs/codec_module.h"
-#include "time/ppm_module.h"
-#include "time/profiler.h"
+#include "ppm/ppm_module.h"
+#include "profiler/profiler.h"
 #include "target_based/sftarget_data.h"
 #include "detection/fp_config.h"
 #include "detection/signature.h"

diff --git a/src/main/snort.cc b/src/main/snort.cc
index 9b60ca4b7d2acb7656fb38a0c268298949f9fa48..60e5b0c64632792a92547b8eebb1d3497a58bb29 100644 (file)
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -81,8 +81,8 @@ using namespace std;
 #include "filters/rate_filter.h"
 #include "filters/detection_filter.h"
 #include "time/packet_time.h"
-#include "time/ppm.h"
-#include "time/profiler.h"
+#include "ppm/ppm.h"
+#include "profiler/profiler.h"
 #include "time/periodic.h"
 #include "perf_monitor/perf.h"
 #include "ips_options/ips_flowbits.h"

diff --git a/src/main/snort_config.cc b/src/main/snort_config.cc
index 1de0243b4c9e94f2d5d59a3a7b79153873403897..56d7da1fd3aaa4e54cdcd5dff7948def75898ce7 100644 (file)
--- a/src/main/snort_config.cc
+++ b/src/main/snort_config.cc
@@ -54,8 +54,8 @@
 #include "ips_options/ips_pcre.h"
 #include "ips_options/ips_regex.h"
 #include "protocols/udp.h"
-#include "time/ppm.h"
-#include "time/profiler.h"
+#include "ppm/ppm.h"
+#include "profiler/profiler.h"
 #include "sfip/sf_ip.h"
 
 THREAD_LOCAL SnortConfig* snort_conf = nullptr;

diff --git a/src/managers/inspector_manager.cc b/src/managers/inspector_manager.cc
index eb8fccf1f49a0c288a17f49e943f2c75965e0095..1c36224640d92609a40ad653eb66ef1d2d9de5ab 100644 (file)
--- a/src/managers/inspector_manager.cc
+++ b/src/managers/inspector_manager.cc
@@ -33,7 +33,7 @@
 #include "log/obfuscation.h"
 #include "log/messages.h"
 #include "packet_io/active.h"
-#include "time/ppm.h"
+#include "ppm/ppm.h"
 #include "target_based/snort_protocols.h"
 #include "binder/bind_module.h"
 

diff --git a/src/managers/module_manager.cc b/src/managers/module_manager.cc
index 44d95f727970398b26b0a13f688e99fd843d6320..b53ec2cc09d09a05b00c125f7748e123173921d3 100644 (file)
--- a/src/managers/module_manager.cc
+++ b/src/managers/module_manager.cc
@@ -39,7 +39,7 @@
 #include "parser/parser.h"
 #include "parser/parse_conf.h"
 #include "parser/vars.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "helpers/markup.h"
 #include "utils/stats.h"
 

diff --git a/src/network_inspectors/arp_spoof/arp_spoof.cc b/src/network_inspectors/arp_spoof/arp_spoof.cc
index da56605414c5356ded50ba07a3939e18b5bfa94e..6116440d7e972654221189d46276f1cf7d1ef830 100644 (file)
--- a/src/network_inspectors/arp_spoof/arp_spoof.cc
+++ b/src/network_inspectors/arp_spoof/arp_spoof.cc
@@ -85,7 +85,7 @@
 #include "events/event_queue.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/inspector.h"
 #include "protocols/packet.h"
 #include "protocols/layer.h"

diff --git a/src/network_inspectors/binder/binder.cc b/src/network_inspectors/binder/binder.cc
index c9b9c3d3399a30fc24cc131d3bd190a9ea714298..a1568b21cb5506200ec3ec382bd0c914283aea82 100644 (file)
--- a/src/network_inspectors/binder/binder.cc
+++ b/src/network_inspectors/binder/binder.cc
@@ -32,7 +32,7 @@ using namespace std;
 #include "protocols/layer.h"
 #include "stream/stream_api.h"
 #include "stream/stream_splitter.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "utils/stats.h"
 #include "log/messages.h"
 #include "main/snort_config.h"

diff --git a/src/network_inspectors/normalize/normalize.cc b/src/network_inspectors/normalize/normalize.cc
index 685493a8e1fed1e14a075e1c96d915dba402db9f..dfb9ab244181db3f6d6e4b518fbec1fe3c045c60 100644 (file)
--- a/src/network_inspectors/normalize/normalize.cc
+++ b/src/network_inspectors/normalize/normalize.cc
@@ -24,7 +24,7 @@
 #include "packet_io/active.h"
 #include "packet_io/sfdaq.h"
 #include "parser/parser.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "framework/inspector.h"

diff --git a/src/network_inspectors/perf_monitor/perf_monitor.cc b/src/network_inspectors/perf_monitor/perf_monitor.cc
index ef898ebc42f51bf28c78829a36a11d3313973afe..b1fc307c946d51c3f52356b1ddb211f5e50f410e 100644 (file)
--- a/src/network_inspectors/perf_monitor/perf_monitor.cc
+++ b/src/network_inspectors/perf_monitor/perf_monitor.cc
@@ -46,7 +46,7 @@
 #include "main/snort_debug.h"
 #include "parser/parser.h"
 #include "packet_io/sfdaq.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/inspector.h"
 #include "utils/stats.h"
 #include "utils/util.h"

diff --git a/src/network_inspectors/port_scan/port_scan.cc b/src/network_inspectors/port_scan/port_scan.cc
index 43ec3b1a73b856bc120c5ad5046a25ed97d92209..af1c31608107c4c2dbc1216551a93164eb7c6175 100644 (file)
--- a/src/network_inspectors/port_scan/port_scan.cc
+++ b/src/network_inspectors/port_scan/port_scan.cc
@@ -64,7 +64,7 @@
 #include "utils/util.h"
 #include "utils/sfsnprintfappend.h"
 #include "framework/inspector.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "time/packet_time.h"
 #include "detection/detect.h"
 

diff --git a/src/parser/parse_rule.cc b/src/parser/parse_rule.cc
index a35dd4d58aad3dd0dee60539e473fe900f9e1c45..f1ac3a47ff92eb031d3e1fd5d4e8e01481f17350 100644 (file)
--- a/src/parser/parse_rule.cc
+++ b/src/parser/parse_rule.cc
@@ -66,7 +66,7 @@
 #include "utils/sflsq.h"
 #include "utils/util.h"
 #include "utils/snort_bounds.h"
-#include "time/ppm.h"
+#include "ppm/ppm.h"
 #include "filters/rate_filter.h"
 #include "filters/detection_filter.h"
 #include "packet_io/active.h"

diff --git a/src/parser/parser.cc b/src/parser/parser.cc
index 53a765846e9ec97306185057e77672d0362f4f64..3af982b3e47b77c1869ab2cb0e6c6b13f852d5b1 100644 (file)
--- a/src/parser/parser.cc
+++ b/src/parser/parser.cc
@@ -74,7 +74,7 @@
 #include "sfip/sf_vartable.h"
 #include "sfip/sf_ip.h"
 #include "sfip/sf_ipvar.h"
-#include "time/ppm.h"
+#include "ppm/ppm.h"
 #include "packet_io/active.h"
 #include "file_api/libs/file_config.h"
 #include "actions/actions.h"

diff --git a/src/parser/vars.cc b/src/parser/vars.cc
index 28a2c373e4221fd478976ff34afe25fc7adc545e..47767331761ca8274830fdbaf4bc1ac8f64205c2 100644 (file)
--- a/src/parser/vars.cc
+++ b/src/parser/vars.cc
@@ -63,7 +63,7 @@
 #include "sfip/sf_vartable.h"
 #include "sfip/sf_ip.h"
 #include "sfip/sf_ipvar.h"
-#include "time/ppm.h"
+#include "ppm/ppm.h"
 #include "packet_io/active.h"
 #include "file_api/libs/file_config.h"
 #include "framework/ips_option.h"

diff --git a/src/ppm/CMakeLists.txt b/src/ppm/CMakeLists.txt
new file mode 100644 (file)
index 0000000..19b6e02
--- /dev/null
+++ b/src/ppm/CMakeLists.txt
@@ -0,0 +1,11 @@
+set ( PPM_SOURCES ppm.cc ppm_module.cc )
+set ( PPM_INCLUDES ppm.h )
+
+add_library ( ppm STATIC
+    ${PPM_SOURCES}
+    ${PPM_INCLUDES}
+)
+
+install (FILES ${PPM_INCLUDES}
+    DESTINATION "${INCLUDE_INSTALL_PATH}/ppm"
+)

diff --git a/src/ppm/Makefile.am b/src/ppm/Makefile.am
new file mode 100644 (file)
index 0000000..53faefb
--- /dev/null
+++ b/src/ppm/Makefile.am
@@ -0,0 +1,11 @@
+noinst_LIBRARIES = libppm.a
+
+x_includedir = $(pkgincludedir)/ppm
+
+x_include_HEADERS = ppm.h
+
+libppm_a_SOURCES = \
+ppm.cc \
+ppm.h \
+ppm_module.cc \
+ppm_module.h

diff --git a/src/time/ppm.cc b/src/ppm/ppm.cc
similarity index 97%
rename from src/time/ppm.cc
rename to src/ppm/ppm.cc
index e9a315cf1eac4c1eca65af4df131eb6d5e9074e7..cf2e8001e8b16ba43379302ff3b2396e7a93d540 100644 (file)
--- a/src/time/ppm.cc
+++ b/src/ppm/ppm.cc
@@ -45,30 +45,13 @@
 #include "config.h"
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <time.h>
-
 #include "ppm_module.h"
-#include "main/snort_types.h"
-#include "detection/rules.h"
-#include "detection/treenodes.h"
-#include "detection/rules.h"
 #include "detection/fp_create.h"
-#include "detection/detect.h"
 #include "parser/parser.h"
 #include "events/event_queue.h"
-#include "events/event_wrapper.h"
-#include "actions/actions.h"
-#include "protocols/packet.h"
 #include "utils/stats.h"
-#include "utils/util.h"
 #include "sfip/sf_ip.h"
-
-#ifdef PPM_MGR
+#include "time/cpuclock.h"
 
 #define PPM_BASE_SUSPEND_RULE_GID 1000
 #define PPM_BASE_CLEAR_RULE_GID   2000
@@ -526,6 +509,3 @@ void ppm_set_rule_threshold(ppm_cfg_t* ppm_cfg, unsigned int cnt)
 {
     ppm_cfg->rule_threshold = cnt;
 }
-
-#endif
-

diff --git a/src/time/ppm.h b/src/ppm/ppm.h
similarity index 98%
rename from src/time/ppm.h
rename to src/ppm/ppm.h
index 16354710ed1db18116233bae81027f77d54eea1b..2461506563642ce63d5282a3b60cbb70d0f4e174 100644 (file)
--- a/src/time/ppm.h
+++ b/src/ppm/ppm.h
@@ -27,12 +27,7 @@
 #include "config.h"
 #endif
 
-// FIXIT-M: Instead of an empty source file, use CMake/Make to enable/disable
-//          this compilation unit
-#ifdef PPM_MGR
-#include "main/snort_types.h"
 #include "main/thread.h"
-#include "time/cpuclock.h"
 #include "detection/detection_options.h"
 
 typedef uint64_t PPM_TICKS;
@@ -314,7 +309,5 @@ void ppm_set_rule(detection_option_tree_root_t*, PPM_TICKS);
 #define PPM_GET_TIME()
 #define PPM_SET_TIME()
 
-#endif // PPM_MGR
-
 #endif
 

diff --git a/src/time/ppm_module.cc b/src/ppm/ppm_module.cc
similarity index 99%
rename from src/time/ppm_module.cc
rename to src/ppm/ppm_module.cc
index ebc22a51d10c68b7f6fba27dda6eca34347097a7..d480e2415930c45f5cf1cc108e6fe56a454e1786 100644 (file)
--- a/src/time/ppm_module.cc
+++ b/src/ppm/ppm_module.cc
@@ -31,8 +31,6 @@
 // ppm attributes
 //-------------------------------------------------------------------------
 
-#ifdef PPM_MGR
-
 #define s_name "ppm"
 #define s_help \
     "packet and rule latency monitoring and control (requires --enable-ppm)"
@@ -140,6 +138,3 @@ bool PpmModule::set(const char*, Value& v, SnortConfig* sc)
 
     return true;
 }
-
-#endif
-

diff --git a/src/time/ppm_module.h b/src/ppm/ppm_module.h
similarity index 92%
rename from src/time/ppm_module.h
rename to src/ppm/ppm_module.h
index a2f759073e8d86982e9fbc619d20be8d37bf8986..cbcf9f7fb686439aac35f99085dc4ab33cf78dac 100644 (file)
--- a/src/time/ppm_module.h
+++ b/src/ppm/ppm_module.h
@@ -26,9 +26,6 @@
 #include "config.h"
 #endif
 
-// FIXIT-M: Instead of an empty source file, use CMake/Make to enable/disable
-//          this compilation unit
-#ifdef PPM_MGR
 #include "framework/module.h"
 
 #define GID_PPM 134
@@ -52,6 +49,5 @@ public:
     { return GID_PPM; }
 };
 
-#endif // PPM_MGR
 #endif
 

diff --git a/src/profiler/CMakeLists.txt b/src/profiler/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b53ced4
--- /dev/null
+++ b/src/profiler/CMakeLists.txt
@@ -0,0 +1,15 @@
+set ( PROFILER_SOURCES profiler.cc )
+set ( PROFILER_INCLUDES profiler.h )
+
+if ( ENABLE_PERFPROFILING )
+
+    add_library ( profiler STATIC
+        ${PROFILER_SOURCES}
+        ${PROFILER_INCLUDES}
+    )
+
+endif ( ENABLE_PERFPROFILING )
+
+install (FILES ${PROFILER_INCLUDES}
+    DESTINATION "${INCLUDE_INSTALL_PATH}/profiler"
+)

diff --git a/src/profiler/Makefile.am b/src/profiler/Makefile.am
new file mode 100644 (file)
index 0000000..d41d2f6
--- /dev/null
+++ b/src/profiler/Makefile.am
@@ -0,0 +1,13 @@
+if PERF_PROFILING
+noinst_LIBRARIES = libprofiler.a
+endif
+
+x_includedir = $(pkgincludedir)/profiler
+
+x_include_HEADERS = profiler.h
+
+if PERF_PROFILING
+libprofiler_a_SOURCES = \
+profiler.cc \
+profiler.h
+endif

diff --git a/src/time/profiler.cc b/src/profiler/profiler.cc
similarity index 100%
rename from src/time/profiler.cc
rename to src/profiler/profiler.cc

diff --git a/src/time/profiler.h b/src/profiler/profiler.h
similarity index 100%
rename from src/time/profiler.h
rename to src/profiler/profiler.h

diff --git a/src/protocols/packet_manager.cc b/src/protocols/packet_manager.cc
index 8441900095a3e03863130b437cfea639391d1f0f..cfb3c7c02eec64458f8405f6d24b84c43af064b5 100644 (file)
--- a/src/protocols/packet_manager.cc
+++ b/src/protocols/packet_manager.cc
@@ -38,7 +38,7 @@
 #include "protocols/eth.h"
 #include "protocols/icmp4.h"
 #include "protocols/icmp6.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "parser/parser.h"
 
 #include "codecs/codec_module.h"

diff --git a/src/search_engines/ac_banded.cc b/src/search_engines/ac_banded.cc
index e9ebf14896b32a1dba21141d2548a1a698c23ff3..17e57e4bbac39fd14ea23213f1ff08fe8a2f7549 100644 (file)
--- a/src/search_engines/ac_banded.cc
+++ b/src/search_engines/ac_banded.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------

diff --git a/src/search_engines/ac_bnfa.cc b/src/search_engines/ac_bnfa.cc
index 91be11bd70381b10a660e804b8343e9ac5a51623..88a853ddf4725425ad43d15cacccbd39a646a8f4 100644 (file)
--- a/src/search_engines/ac_bnfa.cc
+++ b/src/search_engines/ac_bnfa.cc
@@ -32,7 +32,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------

diff --git a/src/search_engines/ac_bnfa_q.cc b/src/search_engines/ac_bnfa_q.cc
index 1d26237afbbf09be2fbbf844adf8052bcb5a40eb..964622e7d16ea189fb437ae6e0f4ae8e649f8088 100644 (file)
--- a/src/search_engines/ac_bnfa_q.cc
+++ b/src/search_engines/ac_bnfa_q.cc
@@ -32,7 +32,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------

diff --git a/src/search_engines/ac_full.cc b/src/search_engines/ac_full.cc
index f8a6521657b64df9fe685eb83578205f13f0dade..78394fb94517a25fdd41f34864c0ab404b0f6088 100644 (file)
--- a/src/search_engines/ac_full.cc
+++ b/src/search_engines/ac_full.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------

diff --git a/src/search_engines/ac_full_q.cc b/src/search_engines/ac_full_q.cc
index c29cf45b2a4289c4d3fea710835e2ef417b235b7..6a34a0962d815771b5acd26575ff427049f7d68d 100644 (file)
--- a/src/search_engines/ac_full_q.cc
+++ b/src/search_engines/ac_full_q.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------

diff --git a/src/search_engines/ac_sparse.cc b/src/search_engines/ac_sparse.cc
index 37b74fbe900d5d155af07611c0800353e53a0b35..8e247434f748c2abff37f94192b0bc613034b073 100644 (file)
--- a/src/search_engines/ac_sparse.cc
+++ b/src/search_engines/ac_sparse.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------

diff --git a/src/search_engines/ac_sparse_bands.cc b/src/search_engines/ac_sparse_bands.cc
index f797940bb955f197dd382f266a4d7c459e85f7ef..6317a73eb8db88bfef73b29550650424678c635f 100644 (file)
--- a/src/search_engines/ac_sparse_bands.cc
+++ b/src/search_engines/ac_sparse_bands.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------

diff --git a/src/search_engines/ac_std.cc b/src/search_engines/ac_std.cc
index b7085c23b6d4938ee14086483a7c717c0d2db918..4cf66762fd6519183c9e0c3e7a0ca489a94b482f 100644 (file)
--- a/src/search_engines/ac_std.cc
+++ b/src/search_engines/ac_std.cc
@@ -28,7 +28,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------

diff --git a/src/search_engines/intel_cpm.cc b/src/search_engines/intel_cpm.cc
index d8ff050ad28209106c4577f6d51740b0bcbf272a..fb342bc5ede06692e46bba1dc109796a21dddec4 100644 (file)
--- a/src/search_engines/intel_cpm.cc
+++ b/src/search_engines/intel_cpm.cc
@@ -28,7 +28,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------

diff --git a/src/service_inspectors/back_orifice/back_orifice.cc b/src/service_inspectors/back_orifice/back_orifice.cc
index 17e35ee021435fe10b6efc8522c1e1127dcf87b5..c4553afaf48fb53632ed185c16526008af5f5e29 100644 (file)
--- a/src/service_inspectors/back_orifice/back_orifice.cc
+++ b/src/service_inspectors/back_orifice/back_orifice.cc
@@ -123,7 +123,7 @@
 #include "events/event_queue.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/inspector.h"
 #include "framework/module.h"
 #include "protocols/udp.h"

diff --git a/src/service_inspectors/dns/dns.cc b/src/service_inspectors/dns/dns.cc
index 9f4fffdf1b325ee6b2dc26a7dc56da18914a53f0..ba9a2fc687548575c2e985f10dff23396c3caddd 100644 (file)
--- a/src/service_inspectors/dns/dns.cc
+++ b/src/service_inspectors/dns/dns.cc
@@ -35,7 +35,7 @@
 #include "events/event_queue.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "parser/parser.h"
 #include "framework/inspector.h"

diff --git a/src/service_inspectors/dns/dns.h b/src/service_inspectors/dns/dns.h
index a8c0df9f63a89fab83b5633e99d70ef88a0e730d..f002cf84e8cc7aa387c79693f6df833776aba985 100644 (file)
--- a/src/service_inspectors/dns/dns.h
+++ b/src/service_inspectors/dns/dns.h
@@ -24,7 +24,6 @@
 
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
 
 // Implementation header with definitions, datatypes and flowdata class for
 // DNS service inspector.

diff --git a/src/service_inspectors/ftp_telnet/ft_main.cc b/src/service_inspectors/ftp_telnet/ft_main.cc
index c0d3d15e8c8c4177bd7221209c03649d9f38da07..bf3a5136b2af23382e8c5d73bdd3c30b4d141425 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ft_main.cc
+++ b/src/service_inspectors/ftp_telnet/ft_main.cc
@@ -61,7 +61,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_util.h"
 #include "parser/parser.h"
 #include "utils/sfsnprintfappend.h"

diff --git a/src/service_inspectors/ftp_telnet/ft_main.h b/src/service_inspectors/ftp_telnet/ft_main.h
index 3ac9e8c2d7d5ecdb68154c1a1e087e98bb648851..0f82c9b18beb5fa646755dff13a143e15e0212a3 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ft_main.h
+++ b/src/service_inspectors/ftp_telnet/ft_main.h
@@ -39,7 +39,6 @@
 #include "ftpp_ui_config.h"
 #include "protocols/packet.h"
 #include "framework/bits.h"
-#include "time/profiler.h"
 
 #define BUF_SIZE 1024
 
@@ -59,6 +58,7 @@ FTP_CLIENT_PROTO_CONF* get_ftp_client(Packet*);
 FTP_SERVER_PROTO_CONF* get_ftp_server(Packet*);
 
 #ifdef PERF_PROFILING
+struct ProfileStats;
 void ft_update_perf(ProfileStats&);
 #endif
 

diff --git a/src/service_inspectors/ftp_telnet/ftp.cc b/src/service_inspectors/ftp_telnet/ftp.cc
index 8454f1537e9d84734532eb670904e42f3e11d4b1..b3896fde7e5f064a5e48565569588e1e8f832402 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp.cc
+++ b/src/service_inspectors/ftp_telnet/ftp.cc
@@ -48,7 +48,7 @@
 #include "managers/inspector_manager.h"
 #include "detection/detection_util.h"
 #include "target_based/snort_protocols.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 int16_t ftp_data_app_id = SFTARGET_UNKNOWN_PROTOCOL;
 

diff --git a/src/service_inspectors/ftp_telnet/ftp_data.cc b/src/service_inspectors/ftp_telnet/ftp_data.cc
index 5b18658eddcc6fb2b3fa24a0b40db93af7e5c9d2..7bb0e8976e44dcb657b677675fcc7c2f65cc0f03 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_data.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_data.cc
@@ -49,7 +49,7 @@
 #include "framework/inspector.h"
 #include "detection/detection_util.h"
 #include "protocols/tcp.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #define s_name "ftp_data"
 

diff --git a/src/service_inspectors/ftp_telnet/ftp_parse.cc b/src/service_inspectors/ftp_telnet/ftp_parse.cc
index 2bad132b6aa69f0851a893b5305ffc66a3e9af69..20d6654cfae74b8505c5e35405ae291a53870142 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_parse.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_parse.cc
@@ -46,7 +46,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_util.h"
 #include "parser/parser.h"
 #include "parser/mstring.h"

diff --git a/src/service_inspectors/ftp_telnet/ftp_print.cc b/src/service_inspectors/ftp_telnet/ftp_print.cc
index baa69b71d194275d275e644e69eb6f438418466d..d4e9bed16b61a36bf997ace22a9d822cf24635f1 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_print.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_print.cc
@@ -48,7 +48,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_util.h"
 #include "parser/parser.h"
 #include "utils/sfsnprintfappend.h"

diff --git a/src/service_inspectors/ftp_telnet/telnet.cc b/src/service_inspectors/ftp_telnet/telnet.cc
index dda3f7fa17b8fafeadc205dfa051d1ccc0d5500b..a4dc5e00ce78f8bcfbd731ef06d87f19a7afe2e8 100644 (file)
--- a/src/service_inspectors/ftp_telnet/telnet.cc
+++ b/src/service_inspectors/ftp_telnet/telnet.cc
@@ -38,7 +38,7 @@
 
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "file_api/file_api.h"
 #include "parser/parser.h"

diff --git a/src/service_inspectors/gtp/gtp.cc b/src/service_inspectors/gtp/gtp.cc
index 06688b2e3b21337556e834673d2e100c41e594e6..231ea0b0233beb629709bbdf1bd4fae2431c2a00 100644 (file)
--- a/src/service_inspectors/gtp/gtp.cc
+++ b/src/service_inspectors/gtp/gtp.cc
@@ -41,7 +41,7 @@
 #include "main/snort_debug.h"
 #include "main/snort_types.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "gtp.h"
 #include "gtp_inspect.h"

diff --git a/src/service_inspectors/gtp/gtp_inspect.cc b/src/service_inspectors/gtp/gtp_inspect.cc
index 8bc74f45eada758dd1b61e45033371ca590e1b73..3c8f604a19808512f03e21aa9f1a9c97f9e78e3e 100644 (file)
--- a/src/service_inspectors/gtp/gtp_inspect.cc
+++ b/src/service_inspectors/gtp/gtp_inspect.cc
@@ -27,7 +27,7 @@
 
 #include "managers/inspector_manager.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "gtp.h"
 #include "gtp_module.h"

diff --git a/src/service_inspectors/gtp/gtp_module.cc b/src/service_inspectors/gtp/gtp_module.cc
index 024b9a742d7611900c3f3f505c07e177a6a5c2ce..77b6f6474887df46099ff0357c85f35ff26cc591 100644 (file)
--- a/src/service_inspectors/gtp/gtp_module.cc
+++ b/src/service_inspectors/gtp/gtp_module.cc
@@ -23,7 +23,7 @@
 #include <cassert>
 
 #include "gtp.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 THREAD_LOCAL ProfileStats gtp_inspect_prof;
 

diff --git a/src/service_inspectors/gtp/ips_gtp_info.cc b/src/service_inspectors/gtp/ips_gtp_info.cc
index 5119d6c5a75bec9ba7fee2ca97308f41d1b18230..07ec4c59833b1e5cd363be58bd61205cd0a2100f 100644 (file)
--- a/src/service_inspectors/gtp/ips_gtp_info.cc
+++ b/src/service_inspectors/gtp/ips_gtp_info.cc
@@ -32,7 +32,7 @@
 #include "framework/module.h"
 #include "hash/sfhashfcn.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "gtp.h"
 #include "gtp_inspect.h"

diff --git a/src/service_inspectors/gtp/ips_gtp_type.cc b/src/service_inspectors/gtp/ips_gtp_type.cc
index a021608305f770921d28f819a86572c6f226e297..29ee80470fbcf3aa890d0ecd0ac0a5a4a859bce4 100644 (file)
--- a/src/service_inspectors/gtp/ips_gtp_type.cc
+++ b/src/service_inspectors/gtp/ips_gtp_type.cc
@@ -32,7 +32,7 @@
 #include "framework/module.h"
 #include "hash/sfhashfcn.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "gtp.h"
 #include "gtp_inspect.h"

diff --git a/src/service_inspectors/gtp/ips_gtp_version.cc b/src/service_inspectors/gtp/ips_gtp_version.cc
index ea1547f9e19a78d7dcc99bde0ee949177d948f28..d81a12647c2118471b3465adba6a3c2208619bc0 100644 (file)
--- a/src/service_inspectors/gtp/ips_gtp_version.cc
+++ b/src/service_inspectors/gtp/ips_gtp_version.cc
@@ -31,7 +31,7 @@
 #include "framework/module.h"
 #include "hash/sfhashfcn.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "gtp_inspect.h"
 

diff --git a/src/service_inspectors/http_inspect/hi_main.cc b/src/service_inspectors/http_inspect/hi_main.cc
index 0a6f049812fc7a14aa3689379a2d4082d3e922e9..cb9e3ae78bcee53be9971a01f518c3b7953cb962 100644 (file)
--- a/src/service_inspectors/http_inspect/hi_main.cc
+++ b/src/service_inspectors/http_inspect/hi_main.cc
@@ -67,7 +67,7 @@
 #include "utils/sfsnprintfappend.h"
 #include <mime/decode_base.h>
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "loggers/unified2_common.h"
 #include "file_api/file_api.h"
 #include "file_api/file_flows.h"

diff --git a/src/service_inspectors/http_inspect/hi_main.h b/src/service_inspectors/http_inspect/hi_main.h
index f76684c867adbbf37a212ec0acc2f056f4dedd07..3e6ee4345026347bb1e5adb570c651cb4e8b0b5b 100644 (file)
--- a/src/service_inspectors/http_inspect/hi_main.h
+++ b/src/service_inspectors/http_inspect/hi_main.h
@@ -31,7 +31,6 @@
 #include "stream/stream_api.h"
 #include "detection/detection_util.h"
 #include "search_engines/search_tool.h"
-#include "time/profiler.h"
 #include "utils/util_jsnorm.h"
 #include "utils/util_utf.h"
 
@@ -78,6 +77,7 @@ extern SO_PUBLIC THREAD_LOCAL HttpBuffer http_buffer[HTTP_BUFFER_MAX];
 extern THREAD_LOCAL DataBuffer HttpDecodeBuf;
 
 #ifdef PERF_PROFILING
+struct ProfileStats;
 extern THREAD_LOCAL ProfileStats hiDetectPerfStats;
 extern THREAD_LOCAL int hiDetectCalled;
 #endif

diff --git a/src/service_inspectors/http_inspect/http_inspect.cc b/src/service_inspectors/http_inspect/http_inspect.cc
index 88c655acdca16a6ddc4c9286d6632c0b7ef18846..a97fa8bae71d044d1cab7047f474e972e8d23c4f 100644 (file)
--- a/src/service_inspectors/http_inspect/http_inspect.cc
+++ b/src/service_inspectors/http_inspect/http_inspect.cc
@@ -44,7 +44,7 @@
 #include "main/snort_debug.h"
 #include "parser/parser.h"
 #include "decompress/file_decomp.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_util.h"
 #include "stream/stream_api.h"
 #include "target_based/snort_protocols.h"

diff --git a/src/service_inspectors/imap/imap.cc b/src/service_inspectors/imap/imap.cc
index c9650934765cf864400d4ecff1b6f637833c23df..3e7a5017759eed6cb7c3fa5f76abb1216c3fe397 100644 (file)
--- a/src/service_inspectors/imap/imap.cc
+++ b/src/service_inspectors/imap/imap.cc
@@ -32,7 +32,7 @@
 #include "events/event_queue.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "file_api/file_api.h"
 #include "parser/parser.h"

diff --git a/src/service_inspectors/imap/imap.h b/src/service_inspectors/imap/imap.h
index c172662f83fa78e9dd48705ce248bebf02b74350..3cdb885ba02aaac34a69d074da6740cb5a2f59b9 100644 (file)
--- a/src/service_inspectors/imap/imap.h
+++ b/src/service_inspectors/imap/imap.h
@@ -26,7 +26,6 @@
 
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
 #include "imap_config.h"
 
 // Direction packet is coming from, if we can figure it out

diff --git a/src/service_inspectors/modbus/ips_modbus_data.cc b/src/service_inspectors/modbus/ips_modbus_data.cc
index ef9aacfc5b6d4f74aa3502486ed9661fc6d92789..4cebf97312c49827379ce733eb07e32c92312761 100644 (file)
--- a/src/service_inspectors/modbus/ips_modbus_data.cc
+++ b/src/service_inspectors/modbus/ips_modbus_data.cc
@@ -27,7 +27,7 @@
 #include "framework/module.h"
 #include "hash/sfhashfcn.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "modbus.h"
 #include "modbus_decode.h"

diff --git a/src/service_inspectors/modbus/ips_modbus_func.cc b/src/service_inspectors/modbus/ips_modbus_func.cc
index a2e278e8b201ecda54ea791048244b078270599c..b7a36d06efb6b0519c63e6faece925ac393bb690 100644 (file)
--- a/src/service_inspectors/modbus/ips_modbus_func.cc
+++ b/src/service_inspectors/modbus/ips_modbus_func.cc
@@ -26,7 +26,7 @@
 #include "framework/module.h"
 #include "hash/sfhashfcn.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "modbus.h"
 

diff --git a/src/service_inspectors/modbus/ips_modbus_unit.cc b/src/service_inspectors/modbus/ips_modbus_unit.cc
index f04642be217b8558f74f7a5e20a04953db0ba024..1e5f889c5aa7f1c507bb11dea41bc0220681dd9b 100644 (file)
--- a/src/service_inspectors/modbus/ips_modbus_unit.cc
+++ b/src/service_inspectors/modbus/ips_modbus_unit.cc
@@ -26,7 +26,7 @@
 #include "framework/module.h"
 #include "hash/sfhashfcn.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "modbus.h"
 

diff --git a/src/service_inspectors/modbus/modbus.cc b/src/service_inspectors/modbus/modbus.cc
index 97a87a2d02f5f4843d328dbe4cf021414175fea2..60416ea228851f229dbb82632ed23a5022822adc 100644 (file)
--- a/src/service_inspectors/modbus/modbus.cc
+++ b/src/service_inspectors/modbus/modbus.cc
@@ -26,7 +26,7 @@
 
 #include "events/event_queue.h"
 #include "managers/inspector_manager.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "modbus_decode.h"
 #include "modbus_module.h"

diff --git a/src/service_inspectors/modbus/modbus_module.cc b/src/service_inspectors/modbus/modbus_module.cc
index e9371daa1e2436dfc7df542442413ce5c2a52418..8fd46ffdfd5db6114cbfe2c1cbd940c1c61f63ca 100644 (file)
--- a/src/service_inspectors/modbus/modbus_module.cc
+++ b/src/service_inspectors/modbus/modbus_module.cc
@@ -21,7 +21,7 @@
 #include "modbus_module.h"
 
 #include "modbus.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 THREAD_LOCAL ProfileStats modbus_prof;
 

diff --git a/src/service_inspectors/pop/pop.cc b/src/service_inspectors/pop/pop.cc
index 9aa82f1b1f9d13f095b5d031b4ece6e25b8f923d..68ea49a0cafa8a2990ca503d150a4d294cbb3c60 100644 (file)
--- a/src/service_inspectors/pop/pop.cc
+++ b/src/service_inspectors/pop/pop.cc
@@ -30,7 +30,7 @@
 #include "events/event_queue.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "parser/parser.h"
 #include "framework/inspector.h"

diff --git a/src/service_inspectors/pop/pop.h b/src/service_inspectors/pop/pop.h
index f9a4e8124607a9a093bc3632cb52af3bd911c39d..257c4d1be2e3c94974f42ac545a6328764d787f2 100644 (file)
--- a/src/service_inspectors/pop/pop.h
+++ b/src/service_inspectors/pop/pop.h
@@ -26,7 +26,6 @@
 
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
 #include "pop_config.h"
 
 // Direction packet is coming from, if we can figure it out

diff --git a/src/service_inspectors/rpc_decode/rpc_decode.cc b/src/service_inspectors/rpc_decode/rpc_decode.cc
index c9aa53dbc2372c4ef34866bb827d6c2efc33eda3..e4fc332da8bc07718c7934a05c01a01f57e5f998 100644 (file)
--- a/src/service_inspectors/rpc_decode/rpc_decode.cc
+++ b/src/service_inspectors/rpc_decode/rpc_decode.cc
@@ -49,7 +49,7 @@
 #include "main/snort_debug.h"
 #include "detection/detect.h"
 #include "log/log.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "utils/snort_bounds.h"
 #include "utils/util.h"
 #include "detection/detection_util.h"

diff --git a/src/service_inspectors/sip/ips_sip.cc b/src/service_inspectors/sip/ips_sip.cc
index efb8d13b3c1b519eacf3ec7f9d9af65b1e11dac5..85ab019dbc694cfaaa5d2624d1c255d9c7319654 100644 (file)
--- a/src/service_inspectors/sip/ips_sip.cc
+++ b/src/service_inspectors/sip/ips_sip.cc
@@ -28,7 +28,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "flow/flow.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"

diff --git a/src/service_inspectors/sip/ips_sip_method.cc b/src/service_inspectors/sip/ips_sip_method.cc
index bb86b7095208583eb4d2e79c91bdcf3e2c160102..564485716fdc04d6da552df4128a421d2a66ad3c 100644 (file)
--- a/src/service_inspectors/sip/ips_sip_method.cc
+++ b/src/service_inspectors/sip/ips_sip_method.cc
@@ -34,7 +34,7 @@
 #include "detection/detect.h"
 #include "detection/detection_defines.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 //-------------------------------------------------------------------------
 // sip_method

diff --git a/src/service_inspectors/sip/ips_sip_stat_code.cc b/src/service_inspectors/sip/ips_sip_stat_code.cc
index 71b6ac6953396df2d7dfd33e662a1d31564e13f6..04ad8428dc92aa0a729acbad626c91a0f391f4ec 100644 (file)
--- a/src/service_inspectors/sip/ips_sip_stat_code.cc
+++ b/src/service_inspectors/sip/ips_sip_stat_code.cc
@@ -34,7 +34,7 @@
 #include "detection/detect.h"
 #include "detection/detection_defines.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 //-------------------------------------------------------------------------
 // sip_stat_code

diff --git a/src/service_inspectors/sip/sip.cc b/src/service_inspectors/sip/sip.cc
index f6d1babc866fd295f82a76ce8c8f4bb9b0c19d2f..1441a0674aff35d949e908c876a9814f033f2ab8 100644 (file)
--- a/src/service_inspectors/sip/sip.cc
+++ b/src/service_inspectors/sip/sip.cc
@@ -31,7 +31,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "file_api/file_api.h"
 #include "parser/parser.h"

diff --git a/src/service_inspectors/sip/sip.h b/src/service_inspectors/sip/sip.h
index d3927a9d43e09334d055dad1cb25821b8be86b09..20ccfa91aa334a6ef31ec357753833fa59b68894 100644 (file)
--- a/src/service_inspectors/sip/sip.h
+++ b/src/service_inspectors/sip/sip.h
@@ -23,7 +23,6 @@
 
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
 #include "sip_config.h"
 #include "sip_dialog.h"
 #include "sip_parser.h"

diff --git a/src/service_inspectors/smtp/smtp.cc b/src/service_inspectors/smtp/smtp.cc
index decd144958c1b041be77f3f4011b245c9a92f959..7924d1e330e00e269f3628994281ccaf9e73815d 100644 (file)
--- a/src/service_inspectors/smtp/smtp.cc
+++ b/src/service_inspectors/smtp/smtp.cc
@@ -29,7 +29,7 @@
 
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "file_api/file_api.h"
 #include "mime/file_mime_process.h"

diff --git a/src/service_inspectors/smtp/smtp.h b/src/service_inspectors/smtp/smtp.h
index 7d8f660a6b64ddb4e8db913f671b79f700678527..13cb8f02d06c77f78abe1163f9f69a1475f4b173 100644 (file)
--- a/src/service_inspectors/smtp/smtp.h
+++ b/src/service_inspectors/smtp/smtp.h
@@ -27,7 +27,6 @@
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
 #include "main/thread.h"
-#include "time/profiler.h"
 #include "smtp_config.h"
 
 // Direction packet is coming from, if we can figure it out

diff --git a/src/service_inspectors/ssh/ssh.cc b/src/service_inspectors/ssh/ssh.cc
index 87a6b3a5969c2c7cddc0d216c429989aef7ec3ff..1976f23c7bc96280fd3c07581dc467561352dd3e 100644 (file)
--- a/src/service_inspectors/ssh/ssh.cc
+++ b/src/service_inspectors/ssh/ssh.cc
@@ -34,7 +34,7 @@
 #include "events/event_queue.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "file_api/file_api.h"
 #include "parser/parser.h"

diff --git a/src/service_inspectors/ssh/ssh.h b/src/service_inspectors/ssh/ssh.h
index d5fbc2516a0c93f214e4086b7f9c047d3a1dcf3b..06bb6836efc209ac628d386749cd5d45a8dcc05d 100644 (file)
--- a/src/service_inspectors/ssh/ssh.h
+++ b/src/service_inspectors/ssh/ssh.h
@@ -32,7 +32,6 @@
 
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
 #include "ssh_config.h"
 
 // Per-session data block containing current state

diff --git a/src/service_inspectors/ssl/ips_ssl_state.cc b/src/service_inspectors/ssl/ips_ssl_state.cc
index b3c950de673f2831f58685c16e25adc1ebcb487b..eb888474ca024f25b025a29f8e95810292a379e1 100644 (file)
--- a/src/service_inspectors/ssl/ips_ssl_state.cc
+++ b/src/service_inspectors/ssl/ips_ssl_state.cc
@@ -28,7 +28,7 @@
 #include "detection/detect.h"
 #include "detection/detection_defines.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "ssl_inspector.h"
 

diff --git a/src/service_inspectors/ssl/ips_ssl_version.cc b/src/service_inspectors/ssl/ips_ssl_version.cc
index 156d5247cb3b6085bbadf5b8ec801450ff5513bc..f03bbbf34d9ef6978a0e677800f95d20a24cca5b 100644 (file)
--- a/src/service_inspectors/ssl/ips_ssl_version.cc
+++ b/src/service_inspectors/ssl/ips_ssl_version.cc
@@ -28,7 +28,7 @@
 #include "detection/detect.h"
 #include "detection/detection_defines.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "ssl_inspector.h"
 

diff --git a/src/service_inspectors/ssl/ssl_inspector.cc b/src/service_inspectors/ssl/ssl_inspector.cc
index 5f8e19c76b6b9bef961ae07d4c75bddb0ba0ca2d..0439c956c60811438938b8280ed89fd3c53adce5 100644 (file)
--- a/src/service_inspectors/ssl/ssl_inspector.cc
+++ b/src/service_inspectors/ssl/ssl_inspector.cc
@@ -36,7 +36,7 @@
 #include "events/event_queue.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "parser/parser.h"
 #include "framework/inspector.h"

diff --git a/src/service_inspectors/ssl/ssl_inspector.h b/src/service_inspectors/ssl/ssl_inspector.h
index ad6c47fec4b59b2dce6e60559c703ed57570e4b0..055dbdc375df6d6d1ee090ff0940ec839006a25c 100644 (file)
--- a/src/service_inspectors/ssl/ssl_inspector.h
+++ b/src/service_inspectors/ssl/ssl_inspector.h
@@ -23,7 +23,6 @@
 
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
 #include "ssl_config.h"
 
 #define SSLPP_ENCRYPTED_FLAGS \

diff --git a/src/service_inspectors/wizard/wizard.cc b/src/service_inspectors/wizard/wizard.cc
index 033400b4909047bdd239cc45b3f720db829215a0..212a60755c8d084154294584f51d1ba50bb0595c 100644 (file)
--- a/src/service_inspectors/wizard/wizard.cc
+++ b/src/service_inspectors/wizard/wizard.cc
@@ -25,7 +25,7 @@ using namespace std;
 #include "managers/inspector_manager.h"
 #include "protocols/packet.h"
 #include "stream/stream_splitter.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "utils/stats.h"
 #include "log/messages.h"
 

diff --git a/src/stream/base/stream_base.cc b/src/stream/base/stream_base.cc
index 344e9a365978edcdea749de6b5e03ff8e0e52a2f..8be1402b0345425eadf2477f4cf6e3a1e036ca3c 100644 (file)
--- a/src/stream/base/stream_base.cc
+++ b/src/stream/base/stream_base.cc
@@ -29,7 +29,7 @@
 #include "managers/inspector_manager.h"
 #include "flow/flow_control.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/tcp/tcp_session.h"
 
 //-------------------------------------------------------------------------

diff --git a/src/stream/file/file_session.cc b/src/stream/file/file_session.cc
index 891b09310d572a9f0328ef71ab0fc8154d5a2b9a..f932ad8c617e6978855269e450fa0cd738d333d9 100644 (file)
--- a/src/stream/file/file_session.cc
+++ b/src/stream/file/file_session.cc
@@ -26,7 +26,7 @@
 #include "file_api/file_api.h"
 #include "file_api/file_flows.h"
 #include "perf_monitor/perf.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "packet_io/sfdaq.h"
 #include "detection/detection_util.h"
 #include "target_based/snort_protocols.h"

diff --git a/src/stream/icmp/icmp_session.cc b/src/stream/icmp/icmp_session.cc
index 0b276e49ef059044b874a74b673ebe8852da0cd2..991e6332293df7bd49c46bf16cc09970ad006d63 100644 (file)
--- a/src/stream/icmp/icmp_session.cc
+++ b/src/stream/icmp/icmp_session.cc
@@ -32,7 +32,7 @@
 #include "flow/flow_control.h"
 #include "flow/session.h"
 #include "perf_monitor/perf.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "protocols/packet.h"
 #include "protocols/layer.h"
 #include "protocols/vlan.h"

diff --git a/src/stream/ip/ip_defrag.cc b/src/stream/ip/ip_defrag.cc
index 141a9d2d76fa5be67eb2ff59f22027f5b0421e13..4d1faf173460d18d8c09dd718312fb10c7556443 100644 (file)
--- a/src/stream/ip/ip_defrag.cc
+++ b/src/stream/ip/ip_defrag.cc
@@ -89,7 +89,7 @@
 #include "protocols/ipv4_options.h"
 #include "protocols/packet_manager.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "time/timersub.h"
 #include "perf_monitor/perf.h"
 #include "utils/stats.h"

diff --git a/src/stream/ip/ip_session.cc b/src/stream/ip/ip_session.cc
index ca78b21082c523d099c523331b348f9b04adce8b..a16cd9052ce87242dd803bead886d413b5c72c70 100644 (file)
--- a/src/stream/ip/ip_session.cc
+++ b/src/stream/ip/ip_session.cc
@@ -30,7 +30,7 @@
 #include "perf_monitor/perf.h"
 #include "flow/flow_control.h"
 #include "sfip/sf_ip.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 THREAD_LOCAL ProfileStats ip_perf_stats;
 

diff --git a/src/stream/tcp/ips_stream_reassemble.cc b/src/stream/tcp/ips_stream_reassemble.cc
index 003ca410c0ff32b2347525901738e3769c88c6d1..15ca79d1826112d21fb99a58ab5fceb76f2cb6d3 100644 (file)
--- a/src/stream/tcp/ips_stream_reassemble.cc
+++ b/src/stream/tcp/ips_stream_reassemble.cc
@@ -31,7 +31,7 @@
 #include "detection/detect.h"
 #include "detection/detection_defines.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #ifdef UNIT_TEST
 #include "catch/catch.hpp"

diff --git a/src/stream/tcp/ips_stream_size.cc b/src/stream/tcp/ips_stream_size.cc
index 77a7136910e35c6b8de31ad00ce2c5166d922250..708210f6b5d079f01e810150cd9fe48bfb827b25 100644 (file)
--- a/src/stream/tcp/ips_stream_size.cc
+++ b/src/stream/tcp/ips_stream_size.cc
@@ -29,7 +29,7 @@
 #include "detection/detect.h"
 #include "detection/detection_defines.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "sfip/sf_ip.h"
 
 //-------------------------------------------------------------------------

diff --git a/src/stream/tcp/tcp_module.cc b/src/stream/tcp/tcp_module.cc
index 84601a05be27945afde3ab84875d4dc4a66d587b..19fc335122211f7ffc287a8f124ff8330a473846 100644 (file)
--- a/src/stream/tcp/tcp_module.cc
+++ b/src/stream/tcp/tcp_module.cc
@@ -21,11 +21,13 @@
 #include "tcp_module.h"
 
 #include <string>
-using namespace std;
 
+#include "profiler/profiler.h"
 #include "stream_tcp.h"
 #include "stream/stream.h"
 
+using namespace std;
+
 //-------------------------------------------------------------------------
 // stream_tcp module
 //-------------------------------------------------------------------------

diff --git a/src/stream/tcp/tcp_module.h b/src/stream/tcp/tcp_module.h
index 2ca30f951da6137feb1032e31958a04b7f21f402..f7707cf284d72e8ad38d5d444c827413de079692 100644 (file)
--- a/src/stream/tcp/tcp_module.h
+++ b/src/stream/tcp/tcp_module.h
@@ -27,7 +27,6 @@
 #include "main/snort_types.h"
 #include "main/thread.h"
 #include "framework/module.h"
-#include "time/profiler.h"
 #include "stream/stream.h"
 
 #define GID_STREAM_TCP  129

diff --git a/src/stream/tcp/tcp_reassembler.cc b/src/stream/tcp/tcp_reassembler.cc
index 9e908b5512f3104893f97d7e4bfd2ed15cb4114b..e65437ac721fbdf8ce5390551de36dfb08f78abd 100644 (file)
--- a/src/stream/tcp/tcp_reassembler.cc
+++ b/src/stream/tcp/tcp_reassembler.cc
@@ -26,7 +26,7 @@
 #include "main/snort.h"
 #include "protocols/packet.h"
 #include "stream/stream.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "flow/flow_control.h"
 
 #include "tcp_module.h"

diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index 0502d641db63df2f2413766fac02bb063a6a5808..92b430a1a8a5ec2862366d8c834b592dca4d258b 100644 (file)
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -91,7 +91,7 @@
 #include "flow/flow_control.h"
 #include "flow/session.h"
 #include "flow/memcap.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "file_api/file_api.h"
 #include "sfip/sf_ip.h"
 #include "filters/sfrf.h"

diff --git a/src/stream/udp/udp_session.cc b/src/stream/udp/udp_session.cc
index 18a1ee7d403eb94218fb5caea77e787fbdab6fdb..cce10d5125b3f40f0525638cd6d218825fa0b338 100644 (file)
--- a/src/stream/udp/udp_session.cc
+++ b/src/stream/udp/udp_session.cc
@@ -39,7 +39,7 @@
 #include "flow/session.h"
 #include "packet_io/active.h"
 #include "perf_monitor/perf.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "sfip/sf_ip.h"
 
 // NOTE:  sender is assumed to be client

diff --git a/src/stream/user/user_session.cc b/src/stream/user/user_session.cc
index c10ba0273d3d6f1acea5121ee9ad675e202953bd..0b984e7a5e61fa50a87d2a7e03d9b0a977fc9d09 100644 (file)
--- a/src/stream/user/user_session.cc
+++ b/src/stream/user/user_session.cc
@@ -32,7 +32,7 @@
 #include "perf_monitor/perf.h"
 #include "flow/flow_control.h"
 #include "sfip/sf_ip.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "main/snort.h"
 
 THREAD_LOCAL ProfileStats user_perf_stats;

diff --git a/src/time/CMakeLists.txt b/src/time/CMakeLists.txt
index 45bc1d5b5cacea4e46501644f84458ce98333b01..ee7b71cfabdda3342d67c79d783c249c485e2737 100644 (file)
--- a/src/time/CMakeLists.txt
+++ b/src/time/CMakeLists.txt
@@ -1,12 +1,3 @@
-if ( ENABLE_PERFPROFILING )
-    set ( PROFILER_SOURCES profiler.cc )
-endif ( ENABLE_PERFPROFILING )
-set ( PROFILER_INCLUDES profiler.h )
-
-# FIXIT-L Should this be conditionally compiled as well?
-set ( PPM_SOURCES ppm.cc ppm_module.cc ppm_module.h )
-set ( PPM_INCLUDES ppm.h )
-
 set ( TIME_INTERNAL_SOURCES
     packet_time.cc
     packet_time.h
@@ -16,14 +7,10 @@ set ( TIME_INTERNAL_SOURCES
     )
 
 set ( TIME_INCLUDES
-    ${PROFILER_INCLUDES}
-    ${PPM_INCLUDES}
     cpuclock.h
     )
 
 add_library ( time STATIC
-    ${PROFILER_SOURCES}
-    ${PPM_SOURCES}
     ${TIME_INTERNAL_SOURCES}
     ${TIME_INCLUDES}
     )

diff --git a/src/time/Makefile.am b/src/time/Makefile.am
index 27c7aedb2748d7a9395aa974769a7ef7de62a676..84f17f391d0104299d2fd857025e75202fa9de73 100644 (file)
--- a/src/time/Makefile.am
+++ b/src/time/Makefile.am
@@ -1,23 +1,13 @@
-
 noinst_LIBRARIES = libtime.a
 
 x_includedir = $(pkgincludedir)/time
 
 x_include_HEADERS = \
-cpuclock.h \
-profiler.h \
-ppm.h
+cpuclock.h
 
 libtime_a_SOURCES = \
 packet_time.cc \
 packet_time.h \
-ppm.cc \
-ppm_module.cc \
-ppm_module.h \
 periodic.cc \
 periodic.h \
 timersub.h
-
-if PERF_PROFILING
-libtime_a_SOURCES += profiler.cc
-endif

diff --git a/src/utils/stats.cc b/src/utils/stats.cc
index 05e69f6f44f9a4fc347f8457bdb298804a0916a7..cbc82a31f7aa3ce613f2533bc107a65b2b31d81c 100644 (file)
--- a/src/utils/stats.cc
+++ b/src/utils/stats.cc
@@ -35,8 +35,8 @@
 #include "protocols/packet_manager.h"
 #include "detection/fp_create.h"
 #include "filters/sfthreshold.h"
-#include "time/ppm.h"
-#include "time/profiler.h"
+#include "ppm/ppm.h"
+#include "profiler/profiler.h"
 #include "time/timersub.h"
 #include "file_api/file_stats.h"
 

diff --git a/src/utils/util.cc b/src/utils/util.cc
index 1d1e9d270221090129067ca703203aef15851693..be54880029c299545633690ad96304a13ebe1a45 100644 (file)
--- a/src/utils/util.cc
+++ b/src/utils/util.cc
@@ -65,7 +65,7 @@
 #include "packet_io/sfdaq.h"
 #include "packet_io/active.h"
 #include "ips_options/ips_pcre.h"
-#include "time/ppm.h"
+#include "ppm/ppm.h"
 #include "time/packet_time.h"
 #include "time/timersub.h"
 #include "stream/stream.h"