]> git.ipfire.org Git - thirdparty/snort3.git/commit
projects / thirdparty / snort3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9ba09bb) | patch
Merge pull request #1086 in SNORT/snort3 from rusage to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 14 Dec 2017 19:43:51 +0000 (14:43 -0500)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 14 Dec 2017 19:43:51 +0000 (14:43 -0500)
commitdc8ea86f848efc335ea1a4fd5bc24b2163fec2cb
treef0a4cbd0cda359b362678e0312faab2f896b9dadtree | snapshot
parent9ba09bbaa64ef24416dc798a7a6e778b61ae1bc9commit | diff
Merge pull request #1086 in SNORT/snort3 from rusage to master

Squashed commit of the following:

commit 833250653e7df0242f9ae239445c76576a4220ad
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Dec 14 11:49:48 2017 -0500

    cpu_tracker: fall back to RUSAGE_SELF if RUSAGE_THREAD is not defined

    thanks to Fabrice Fontaine fontaine.fabrice@gmail.com
src/network_inspectors/perf_monitor/cpu_tracker.cc diff | blob | blame | history
Mirror of https://github.com/snort3/snort3.git