]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
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)
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

index 33dd33eb4ed9727192b183cb13ae367766030a5b..fcb274975d16495caec7ef8a8aa784fd78ee73df 100644 (file)
@@ -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;