]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #135 in SNORT/snort3 from ~JOCORNET/snort3:mem_profiler to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 17 Nov 2015 22:41:02 +0000 (17:41 -0500)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 17 Nov 2015 22:41:02 +0000 (17:41 -0500)
commitedc33d30a4d0b157c182dfb6d49bd171b4b86fdf
tree173d232b45263c89c0c9e043c105784adc244bcd
parentc4384a977e476e7081ea17aadeaa7c502434554f
Merge pull request #135 in SNORT/snort3 from ~JOCORNET/snort3:mem_profiler to master

Squashed commit of the following:

commit 3b843fdc2a341e22d63840d72900d90767df31c9
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Tue Nov 17 15:56:43 2015 -0500

    hardened PERF_PROFILING

commit 6eb3d6f8ab4d474344c5ff2143206f23e9c96aa4
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Tue Nov 17 13:47:30 2015 -0500

    fixed typo

commit 45c6d8816b00fdf793704e733f20c0f0d863708e
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Mon Nov 16 18:03:38 2015 -0500

    updated profiler unit tests

commit 6a6bb3900277062d25b2c06b9c5cd9b246e09b68
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Mon Nov 16 17:00:45 2015 -0500

    fluff

commit ef2a51bcff9e5f59bd6087ad4356c1f64c5fa23a
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Mon Nov 16 16:53:34 2015 -0500

    updates

commit 8f3563c3b3f2e6df894aa98d25390cd1f5c602d0
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Mon Nov 16 15:47:33 2015 -0500

    added clock type definitions

commit a426b1be454df278cefd65cf25f59af6247e57e2
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Mon Nov 16 15:43:53 2015 -0500

    partial commit converted ticks to use high_resolution_clock duration

commit ad22683e444641f954e57de6194174e5add8305f
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Mon Nov 16 15:40:25 2015 -0500

    partial commit, updated build system in preparation for memory profiling
42 files changed:
cmake/configure_options.cmake
cmake/create_options.cmake
config.cmake.h.in
configure.ac
configure_cmake.sh
src/CMakeLists.txt
src/Makefile.am
src/detection/detect.cc
src/detection/detect.h
src/detection/detection_options.cc
src/detection/detection_options.h
src/detection/fp_detect.cc
src/detection/fp_detect.h
src/detection/treenodes.h
src/framework/mpse.cc
src/framework/mpse.h
src/ips_options/ips_http.cc
src/main/modules.cc
src/main/snort.cc
src/main/snort_config.cc
src/main/snort_config.h
src/managers/codec_manager.h
src/managers/module_manager.cc
src/ppm/ppm.h
src/profiler/CMakeLists.txt
src/profiler/Makefile.am
src/profiler/profiler.cc
src/profiler/profiler.h
src/protocols/packet_manager.cc
src/service_inspectors/ftp_telnet/ft_main.cc
src/service_inspectors/ftp_telnet/ft_main.h
src/service_inspectors/ftp_telnet/ftp.cc
src/service_inspectors/ftp_telnet/telnet.cc
src/service_inspectors/http_inspect/hi_main.cc
src/service_inspectors/http_inspect/hi_main.h
src/service_inspectors/http_inspect/http_inspect.cc
src/time/CMakeLists.txt
src/time/Makefile.am
src/time/clock_defs.h [new file with mode: 0644]
src/time/dev_notes.txt
src/time/stopwatch.h [new file with mode: 0644]
src/utils/stats.cc