]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1539 in SNORT/snort3 from ~RUCOMBS/snort3:memory_misery to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Sun, 10 Mar 2019 00:47:51 +0000 (19:47 -0500)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Sun, 10 Mar 2019 00:47:51 +0000 (19:47 -0500)
commitfcebdc32f26cb89cbe74105c86a7e08cb810fa8f
treea6ba13fc5a68009bbf306f62cf98e9f81133068a
parentf961ce70d261a0694b6557cf88252f2d1b0fbc7a
Merge pull request #1539 in SNORT/snort3 from ~RUCOMBS/snort3:memory_misery to master

Squashed commit of the following:

commit 29f8a2c133f0aa5726c2d7a53f164bc840c069a5
Author: russ <rucombs@cisco.com>
Date:   Sat Mar 9 19:45:19 2019 -0500

    build: fix override warning

commit 322dac9242dc6b1a0c1c1cfd0289899fdca9e158
Author: russ <rucombs@cisco.com>
Date:   Sat Mar 9 12:52:28 2019 -0500

    memory: add configurable L3/L4 specific weights for better estimation against cap

commit 30826c6c6d425a24aedd49d7b1375580a449b027
Author: russ <rucombs@cisco.com>
Date:   Fri Mar 8 21:26:05 2019 -0500

    stream_tcp: patch around premature application of delayed actions that yoink the seglist

commit a6b3a0f313ad2f6911cc0167cca0e0179aedba4f
Author: russ <rucombs@cisco.com>
Date:   Thu Mar 7 03:37:08 2019 -0500

    stream: purge remaining flows before shutdown counts

commit a22cb207099c52b9bb0b3af7c2b2c45798f15213
Author: russ <rucombs@cisco.com>
Date:   Thu Mar 7 03:12:09 2019 -0500

    stream_tcp: implement reserve seglist

commit fcad14fd2875f9b5f3c6c792882617529dea67f3
Author: russ <rucombs@cisco.com>
Date:   Thu Mar 7 01:53:07 2019 -0500

    stream_tcp: consolidate segment node and data

commit 38d2075e51809c564057dde52b9ea47913b29f9d
Author: russ <rucombs@cisco.com>
Date:   Wed Mar 6 16:28:26 2019 -0500

    memory: require subclass implementation of FlowData::size_of()

commit 5cd42d4fa5a3f30d1e2f1a0008134403998e8779
Author: russ <rucombs@cisco.com>
Date:   Wed Mar 6 16:05:38 2019 -0500

    memory: add size_of to various FlowData subclasses

commit 3b82fc157d789d993eb8d7d1c77c05898956da6c
Author: russ <rucombs@cisco.com>
Date:   Wed Mar 6 16:04:45 2019 -0500

    memory: apply fudge factor to tracking to better align with RSS

commit 2deb67a92ddc1f8143d3e3768d74f3d99f7ba137
Author: russ <rucombs@cisco.com>
Date:   Wed Mar 6 18:44:56 2019 -0500

    stream_tcp: fixup allocation tracking for overlapped segmenets

commit a9539d086d3956f2346b2bb04137b71b427464c6
Author: russ <rucombs@cisco.com>
Date:   Wed Mar 6 13:17:42 2019 -0500

    memory: track session allocations

commit e18575a5e608ea598b41175f10923b1061ea65ad
Author: russ <rucombs@cisco.com>
Date:   Wed Mar 6 10:53:10 2019 -0500

    memory: basic flow pruning

commit 5da1c556989cd267c2718a4068b0e12edb7aea20
Author: russ <rucombs@cisco.com>
Date:   Wed Mar 6 10:52:38 2019 -0500

    memory: refactor stats

commit e6bfcd81fe52f018148b7c53ca3ce0520eadf532
Author: russ <rucombs@cisco.com>
Date:   Tue Mar 5 20:04:48 2019 -0500

    memory: basic flow data allocation tracking

commit 77f6ae93f8c5eb8f19df3b9d17736bb2655dcebc
Author: russ <rucombs@cisco.com>
Date:   Tue Mar 5 10:20:02 2019 -0500

    Revert "Merge pull request #1524 in SNORT/snort3 from ~PSHINDE2/snort3:memory_tracker_simplified to master"

    This reverts commit 0bb8323f6aae61501aaaaa6a9e904448ddf35ceb.
    Done to restore tracking of total allocations.
    Will fix differently.

commit feb9b3707d1fc8c9b13fe236eb55433944704c7c
Author: russ <rucombs@cisco.com>
Date:   Tue Mar 5 10:19:04 2019 -0500

    memory: initial preemptive pruning based on flow data

commit 118e0b21c8d2f4bc42d287bba7867d0ede1e728e
Author: russ <rucombs@cisco.com>
Date:   Mon Mar 4 18:01:42 2019 -0500

    memory: remove overloading manager to make way for new implementation
56 files changed:
src/detection/regex_offload.h
src/file_api/file_flows.h
src/flow/flow.cc
src/flow/flow.h
src/flow/flow_cache.cc
src/flow/flow_cache.h
src/flow/flow_config.h
src/main/snort.cc
src/memory/CMakeLists.txt
src/memory/memory_allocator.cc [deleted file]
src/memory/memory_allocator.h [deleted file]
src/memory/memory_cap.cc
src/memory/memory_cap.h
src/memory/memory_config.h
src/memory/memory_manager.cc [deleted file]
src/memory/memory_module.cc
src/memory/memory_module.h
src/network_inspectors/appid/appid_session.h
src/service_inspectors/dce_rpc/dce_smb.h
src/service_inspectors/dce_rpc/dce_tcp.h
src/service_inspectors/dce_rpc/dce_udp.h
src/service_inspectors/dnp3/dnp3.h
src/service_inspectors/dns/dns.h
src/service_inspectors/ftp_telnet/ftpp_si.h
src/service_inspectors/gtp/gtp_inspect.h
src/service_inspectors/http2_inspect/http2_flow_data.h
src/service_inspectors/http_inspect/http_flow_data.h
src/service_inspectors/imap/imap.h
src/service_inspectors/modbus/modbus.h
src/service_inspectors/pop/pop.h
src/service_inspectors/rpc_decode/rpc_decode.cc
src/service_inspectors/sip/sip.h
src/service_inspectors/smtp/smtp.h
src/service_inspectors/ssh/ssh.h
src/service_inspectors/ssl/ssl_inspector.h
src/stream/base/stream_base.cc
src/stream/base/stream_module.cc
src/stream/file/file_session.cc
src/stream/file/file_session.h
src/stream/icmp/icmp_session.cc
src/stream/icmp/icmp_session.h
src/stream/ip/ip_defrag.cc
src/stream/ip/ip_session.cc
src/stream/ip/ip_session.h
src/stream/libtcp/tcp_stream_session.cc
src/stream/libtcp/tcp_stream_session.h
src/stream/tcp/stream_tcp.cc
src/stream/tcp/tcp_reassembler.cc
src/stream/tcp/tcp_segment_node.cc
src/stream/tcp/tcp_segment_node.h
src/stream/tcp/tcp_session.cc
src/stream/tcp/tcp_session.h
src/stream/udp/udp_session.cc
src/stream/udp/udp_session.h
src/stream/user/user_session.cc
src/stream/user/user_session.h