fixed freebsd cpu calculation (#18648)
Costa Tsaousis committed
Sep 30, 2024 at 18:18 UTC
0689f2bf01a71b4ec1c5163798c39b2c03f67b11
2 files changed
+5
-5
src/collectors/apps.plugin/apps_os_freebsd.c
+4
-4
@@ -281,10 +281,10 @@ bool apps_os_read_pid_stat_freebsd(struct pid_stat *p, void *ptr) {
281
pid_incremental_rate(stat, PDF_CMINFLT, (kernel_uint_t)proc_info->ki_rusage_ch.ru_minflt);
282
pid_incremental_rate(stat, PDF_MAJFLT, (kernel_uint_t)proc_info->ki_rusage.ru_majflt);
283
pid_incremental_rate(stat, PDF_CMAJFLT, (kernel_uint_t)proc_info->ki_rusage_ch.ru_majflt);
284
- pid_incremental_rate(stat, PDF_UTIME, (kernel_uint_t)proc_info->ki_rusage.ru_utime.tv_sec * NSEC_PER_SEC + proc_info->ki_rusage.ru_utime.tv_usec * NSEC_PER_USEC);
285
- pid_incremental_rate(stat, PDF_STIME, (kernel_uint_t)proc_info->ki_rusage.ru_stime.tv_sec * NSEC_PER_SEC + proc_info->ki_rusage.ru_stime.tv_usec * NSEC_PER_USEC);
286
- pid_incremental_rate(stat, PDF_CUTIME, (kernel_uint_t)proc_info->ki_rusage_ch.ru_utime.tv_sec * NSEC_PER_SEC + proc_info->ki_rusage_ch.ru_utime.tv_usec * NSEC_PER_USEC);
287
- pid_incremental_rate(stat, PDF_CSTIME, (kernel_uint_t)proc_info->ki_rusage_ch.ru_stime.tv_sec * NSEC_PER_SEC + proc_info->ki_rusage_ch.ru_stime.tv_usec * NSEC_PER_USEC);
284
+ pid_incremental_cpu(stat, PDF_UTIME, (kernel_uint_t)proc_info->ki_rusage.ru_utime.tv_sec * NSEC_PER_SEC + proc_info->ki_rusage.ru_utime.tv_usec * NSEC_PER_USEC);
285
+ pid_incremental_cpu(stat, PDF_STIME, (kernel_uint_t)proc_info->ki_rusage.ru_stime.tv_sec * NSEC_PER_SEC + proc_info->ki_rusage.ru_stime.tv_usec * NSEC_PER_USEC);
286
+ pid_incremental_cpu(stat, PDF_CUTIME, (kernel_uint_t)proc_info->ki_rusage_ch.ru_utime.tv_sec * NSEC_PER_SEC + proc_info->ki_rusage_ch.ru_utime.tv_usec * NSEC_PER_USEC);
287
+ pid_incremental_cpu(stat, PDF_CSTIME, (kernel_uint_t)proc_info->ki_rusage_ch.ru_stime.tv_sec * NSEC_PER_SEC + proc_info->ki_rusage_ch.ru_stime.tv_usec * NSEC_PER_USEC);
288
289
p->values[PDF_THREADS] = proc_info->ki_numthreads;
290
src/collectors/apps.plugin/apps_plugin.h
+1
-1
@@ -36,7 +36,7 @@
36
#define PROCESSES_HAVE_STATE 0
37
#define PPID_SHOULD_BE_RUNNING 1
38
#define INCREMENTAL_DATA_COLLECTION 1
39
-#define CPU_TO_NANOSECONDCORES (1000) // convert microseconds to nanoseconds
39
+#define CPU_TO_NANOSECONDCORES (1)
40
#define OS_FUNCTION(func) OS_FUNC_CONCAT(func, _freebsd)
41
42
#elif defined(OS_MACOS)