From dc8ea86f848efc335ea1a4fd5bc24b2163fec2cb Mon Sep 17 00:00:00 2001 From: "Russ Combs (rucombs)" Date: Thu, 14 Dec 2017 14:43:51 -0500 Subject: [PATCH] Merge pull request #1086 in SNORT/snort3 from rusage to master Squashed commit of the following: commit 833250653e7df0242f9ae239445c76576a4220ad Author: Russ Combs 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; -- 2.47.3