External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Inline a sysconf call for linuxCPUStatsToBuf

Browse Source 
While unlikely, sysconf(_SC_CLK_TCK) could fail leading to
indeterminate results for the subsequent division. So let's
just remove the # define and inline the same change.

Signed-off-by: John Ferlan <jferlan@redhat.com>
ACKed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
John Ferlan 2018-09-27 18:46:36 -04:00
parent 425b9f8aa6
commit fddf92836a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/virhostcputest.c
View File

@ -72,7 +72,6 @@ linuxTestCompareFiles(const char *cpuinfofile,
return ret; return ret;
} }
# define TICK_TO_NSEC (1000ull * 1000ull * 1000ull / sysconf(_SC_CLK_TCK))
static int static int
linuxCPUStatsToBuf(virBufferPtr buf, linuxCPUStatsToBuf(virBufferPtr buf,
@ -81,6 +80,15 @@ linuxCPUStatsToBuf(virBufferPtr buf,
size_t nparams) size_t nparams)
{ {
size_t i = 0; size_t i = 0;
unsigned long long tick_to_nsec;
long long sc_clk_tck;
if ((sc_clk_tck = sysconf(_SC_CLK_TCK)) < 0) {
fprintf(stderr, "sysconf(_SC_CLK_TCK) fails : %s\n",
strerror(errno));
return -1;
}
tick_to_nsec = (1000ull * 1000ull * 1000ull) / sc_clk_tck;
if (cpu < 0) if (cpu < 0)
virBufferAddLit(buf, "cpu:\n"); virBufferAddLit(buf, "cpu:\n");
@ -89,7 +97,7 @@ linuxCPUStatsToBuf(virBufferPtr buf,
for (i = 0; i < nparams; i++) for (i = 0; i < nparams; i++)
virBufferAsprintf(buf, "%s: %llu\n", param[i].field, virBufferAsprintf(buf, "%s: %llu\n", param[i].field,
param[i].value / TICK_TO_NSEC); param[i].value / tick_to_nsec);
virBufferAddChar(buf, '\n'); virBufferAddChar(buf, '\n');
return 0; return 0;