From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Thu, 14 Dec 2017 19:43:51 +0000 (-0500)
Subject: Merge pull request #1086 in SNORT/snort3 from rusage to master
X-Git-Tag: 3.0.0-241~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc8ea86f848efc335ea1a4fd5bc24b2163fec2cb;p=thirdparty%2Fsnort3.git

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
---

diff --git a/src/network_inspectors/perf_monitor/cpu_tracker.cc b/src/network_inspectors/perf_monitor/cpu_tracker.cc
index 33dd33eb4..fcb274975 100644
--- a/src/network_inspectors/perf_monitor/cpu_tracker.cc
+++ b/src/network_inspectors/perf_monitor/cpu_tracker.cc
@@ -73,8 +73,10 @@ void CPUTracker::get_clocks(struct timeval& user_time,
     struct rusage usage;
 #ifdef RUSAGE_LWP
     getrusage(RUSAGE_LWP, &usage);
-#else
+#elif defined(RUSAGE_THREAD)
     getrusage(RUSAGE_THREAD, &usage);
+#else
+    getrusage(RUSAGE_SELF, &usage);
 #endif
     user_time = usage.ru_utime;
     sys_time = usage.ru_stime;