]> git.ipfire.org Git - thirdparty/snort3.git/commit
Pull request #3859: perf_mon: fix dump_stats collision with perf mon
authorARUNKUMAR KAYAMBU -X (akayambu - XORIANT CORPORATION at Cisco) <akayambu@cisco.com>
Thu, 6 Jul 2023 18:27:43 +0000 (18:27 +0000)
committerSteve Chew (stechew) <stechew@cisco.com>
Thu, 6 Jul 2023 18:27:43 +0000 (18:27 +0000)
commitee7f6600936a82e8e7cdf481d61e39e6ec67e311
treed589d0f438df335d30159f207efd2be8bce0ef06
parent152da5914587499ae973d3fa70580b9de3190642
Pull request #3859: perf_mon: fix dump_stats collision with perf mon

Merge in SNORT/snort3 from ~AKAYAMBU/snort3:dump_stats_fix to master

Squashed commit of the following:

commit 78bdb137f619179005aebbadf9548e1121f90fce
Author: Arunkumar Kayambu <akayambu@cisco.com>
Date:   Tue May 23 10:56:21 2023 -0400

    perf_mon: fix dump_stats collision with perf mon
15 files changed:
src/file_api/file_module.cc
src/framework/module.cc
src/framework/module.h
src/host_tracker/host_cache_module.cc
src/managers/module_manager.cc
src/network_inspectors/appid/appid_module.cc
src/network_inspectors/perf_monitor/base_tracker.cc
src/packet_io/sfdaq_module.cc
src/packet_io/sfdaq_module.h
src/stream/base/stream_base.cc
src/stream/base/stream_module.cc
src/stream/base/stream_module.h
src/trace/trace.cc
src/utils/stats.cc
src/utils/stats.h