varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-12 16:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsysprof-profile: various cpu counter cleanups and fixes

Browse Source
This commit is contained in:
Christian Hergert
2023-06-27 13:41:15 -07:00
parent ab12f6a18a
commit d7584d1d86
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libsysprof-profile/sysprof-cpu-usage.c
View File

@ -159,17 +159,16 @@ sysprof_cpu_usage_record_fiber (gpointer user_data)
*/ */
for (guint i = 0; i < n_cpu; i++) for (guint i = 0; i < n_cpu; i++)
{ {
guint counter_base = sysprof_capture_writer_request_counter (writer, 2);
g_autofree char *max_path = g_strdup_printf ("/sys/devices/system/cpu/cpu%u/cpufreq/scaling_max_freq", i); g_autofree char *max_path = g_strdup_printf ("/sys/devices/system/cpu/cpu%u/cpufreq/scaling_max_freq", i);
g_autofree char *cur_path = g_strdup_printf ("/sys/devices/system/cpu/cpu%u/cpufreq/scaling_cur_freq", i); g_autofree char *cur_path = g_strdup_printf ("/sys/devices/system/cpu/cpu%u/cpufreq/scaling_cur_freq", i);
g_autofree char *max_value = NULL; g_autofree char *max_value = NULL;
CpuFreq cf; CpuFreq cf;
ids[i*2] = counter_base; ids[i*2] = sysprof_capture_writer_request_counter (writer, 1);
ids[i*2+1] = counter_base + 1; ids[i*2+1] = sysprof_capture_writer_request_counter (writer, 1);
counter = &counters[i*2]; counter = &counters[i*2];
counter->id = counter_base; counter->id = ids[i*2];
counter->type = SYSPROF_CAPTURE_COUNTER_DOUBLE; counter->type = SYSPROF_CAPTURE_COUNTER_DOUBLE;
counter->value.vdbl = 0; counter->value.vdbl = 0;
g_strlcpy (counter->category, "CPU Percent", sizeof counter->category); g_strlcpy (counter->category, "CPU Percent", sizeof counter->category);
@ -178,7 +177,7 @@ sysprof_cpu_usage_record_fiber (gpointer user_data)
"Total CPU usage %d", i); "Total CPU usage %d", i);
counter = &counters[i*2+1]; counter = &counters[i*2+1];
counter->id = counter_base + 1; counter->id = ids[i*2+1];
counter->type = SYSPROF_CAPTURE_COUNTER_DOUBLE; counter->type = SYSPROF_CAPTURE_COUNTER_DOUBLE;
counter->value.vdbl = 0; counter->value.vdbl = 0;
g_strlcpy (counter->category, "CPU Frequency", sizeof counter->category); g_strlcpy (counter->category, "CPU Frequency", sizeof counter->category);
@ -285,7 +284,7 @@ sysprof_cpu_usage_record_fiber (gpointer user_data)
/* Parse the various counters in order */ /* Parse the various counters in order */
user = nice = sys = idle = id = 0; user = nice = sys = idle = id = 0;
ret = sscanf (line, "%s %ld %ld %ld %ld %ld %ld %ld %ld %ld %ld", ret = sscanf (line, "%63s %ld %ld %ld %ld %ld %ld %ld %ld %ld %ld",
cpu, &user, &nice, &sys, &idle, cpu, &user, &nice, &sys, &idle,
&iowait, &irq, &softirq, &steal, &guest, &guest_nice); &iowait, &irq, &softirq, &steal, &guest, &guest_nice);
if (ret != 11) if (ret != 11)
@ -332,8 +331,8 @@ sysprof_cpu_usage_record_fiber (gpointer user_data)
DexFuture *freq_future = g_ptr_array_index (futures, i); DexFuture *freq_future = g_ptr_array_index (futures, i);
gssize len = dex_await_int64 (dex_ref (freq_future), NULL); gssize len = dex_await_int64 (dex_ref (freq_future), NULL);
values[n_cpu*i].vdbl = ci->total; values[i*2].vdbl = ci->total;
values[n_cpu*i+1].vdbl = get_cpu_freq (cf->stat_fd, i, cf->max, cf->buf, len); values[i*2+1].vdbl = get_cpu_freq (cf->stat_fd, i, cf->max, cf->buf, len);
total_usage += ci->total; total_usage += ci->total;
} }