45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
|
commit d874d2e486c8a64fa9945ed7aa0048cccbd46f77
|
||
|
|
Author: Nathan Scott <nathans@redhat.com>
|
||
|
|
Date: Wed May 4 17:11:19 2022 +1000
|
||
|
|
|
||
|
|
pmdaproc: fix cgroup cpu metrics refresh structures
|
||
|
|
|
||
|
|
Jan Kurik encountered this issue when running the regression
|
||
|
|
testsuite (especially qa/359) on non-x86_64 architectures.
|
||
|
|
|
||
|
|
Something must've changed in the toolchain recently on these
|
||
|
|
platforms since we've not seen this before, but this bug has
|
||
|
|
been in our code for some time. It works everywhere else by
|
||
|
|
good fortune, when there just happen to be NULLs after these
|
||
|
|
cgroups CPU parsing data structures.
|
||
|
|
|
||
|
|
Resolves Red Hat BZ #2081262.
|
||
|
|
|
||
|
|
diff --git a/src/pmdas/linux_proc/cgroups.c b/src/pmdas/linux_proc/cgroups.c
|
||
|
|
index 413a72343..26d59863a 100644
|
||
|
|
--- a/src/pmdas/linux_proc/cgroups.c
|
||
|
|
+++ b/src/pmdas/linux_proc/cgroups.c
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
/*
|
||
|
|
- * Copyright (c) 2012-2019 Red Hat.
|
||
|
|
+ * Copyright (c) 2012-2019,2022 Red Hat.
|
||
|
|
* Copyright (c) 2010 Aconex. All Rights Reserved.
|
||
|
|
*
|
||
|
|
* This program is free software; you can redistribute it and/or modify it
|
||
|
|
@@ -863,6 +863,7 @@ read_cpu_time(const char *file, cgroup_cputime_t *ccp)
|
||
|
|
{ "usage_usec", &cputime.usage },
|
||
|
|
{ "user_usec", &cputime.user },
|
||
|
|
{ "system_usec", &cputime.system },
|
||
|
|
+ { NULL, NULL }
|
||
|
|
};
|
||
|
|
char buffer[4096], name[64];
|
||
|
|
unsigned long long value;
|
||
|
|
@@ -903,6 +904,7 @@ read_cpu_stats(const char *file, cgroup_cpustat_t *ccp)
|
||
|
|
{ "nr_periods", &cpustat.nr_periods },
|
||
|
|
{ "nr_throttled", &cpustat.nr_throttled },
|
||
|
|
{ "throttled_time", &cpustat.throttled_time },
|
||
|
|
+ { NULL, NULL }
|
||
|
|
};
|
||
|
|
char buffer[4096], name[64];
|
||
|
|
unsigned long long value;
|