]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1225 in SNORT/snort3 from perf3_edm to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 15 May 2018 23:29:45 +0000 (19:29 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 15 May 2018 23:29:45 +0000 (19:29 -0400)
commitd284ef2b36d143f5827cce053f7be74f05c78df9
tree0b99a270269f2fcb7f6a7fac1c38fe3251a15979
parentade9ca7a6ef25325d593ef4f6030e532e18eccb2
Merge pull request #1225 in SNORT/snort3 from perf3_edm to master

Squashed commit of the following:

commit aa397e563a5b295d13dd6066f5b3ad77c356ad5b
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Tue May 15 14:30:53 2018 -0400

    build: add cmake configure switches for NO_PROFILER, NO_MEM_MGR and DEEP_PROFILING

commit ddd1d15bee1d9b8f3365b21a441a99384f37a612
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Fri May 11 16:07:45 2018 -0400

    time: initialize Stopwatch::start_time member variable to 0 ticks when TSC clock is enabled

commit c5ba39de5479567d034491625bfd5223d7cd7744
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Thu May 10 16:24:51 2018 -0400

    build: propogate snort3 tsc build option to the extra build system

commit 9998d4b5c89c152600e9604e65948fbe0bc872aa
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Mon May 7 09:23:36 2018 -0400

    codecs: add config option to detection to enable check and alert for address anomalies

commit bf4f53352cfce206bf684c94f58bbe4f5d3de25b
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Wed May 9 16:27:31 2018 -0400

    profiler: add deep profiler option

commit 8181046b436d9a5fd53c460d712a2c012cca9a40
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Mon May 7 19:45:18 2018 -0400

    clock: use uint64_t with tsc clock instead of std::chrono for performance
26 files changed:
cmake/configure_options.cmake
cmake/create_options.cmake
cmake/create_pkg_config.cmake
config.cmake.h.in
configure_cmake.sh
snort.pc.in
src/codecs/ip/cd_ipv4.cc
src/codecs/ip/cd_tcp.cc
src/latency/latency_module.cc
src/latency/packet_latency.cc
src/latency/packet_latency_config.h
src/latency/rule_latency.cc
src/main/modules.cc
src/main/snort_config.h
src/profiler/profiler_defs.h
src/profiler/rule_profiler.cc
src/profiler/time_profiler.cc
src/stream/ip/ip_defrag.cc
src/stream/libtcp/tcp_stream_tracker.cc
src/stream/tcp/ips_stream_reassemble.cc
src/stream/tcp/ips_stream_size.cc
src/stream/tcp/tcp_reassembler.cc
src/stream/tcp/tcp_session.cc
src/time/clock_defs.h
src/time/stopwatch.h
src/time/tsc_clock.h