mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-11-04 20:31:13 +00:00
f4dc812c9e
The virNodeParseSocket() function tries to get socked ID from 'topology/physical_package_id' file. However, on some architectures the file contains the -1 constant which makes in turn libvirt think the info extraction was unsuccessful. If that's the case, we need to overwrite the obtained integer with zero like we are doing for other architectures. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
273 lines
6.8 KiB
C
273 lines
6.8 KiB
C
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include "testutils.h"
|
|
#include "internal.h"
|
|
#include "nodeinfopriv.h"
|
|
#include "virfile.h"
|
|
#include "virstring.h"
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
#if !(defined __linux__)
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
return EXIT_AM_SKIP;
|
|
}
|
|
|
|
#else
|
|
|
|
static int
|
|
linuxTestCompareFiles(const char *cpuinfofile,
|
|
char *sysfs_dir,
|
|
virArch arch,
|
|
const char *outputfile)
|
|
{
|
|
int ret = -1;
|
|
char *actualData = NULL;
|
|
char *expectData = NULL;
|
|
virNodeInfo nodeinfo;
|
|
FILE *cpuinfo;
|
|
|
|
if (virtTestLoadFile(outputfile, &expectData) < 0)
|
|
goto fail;
|
|
|
|
cpuinfo = fopen(cpuinfofile, "r");
|
|
if (!cpuinfo) {
|
|
fprintf(stderr, "unable to open: %s : %s\n",
|
|
cpuinfofile, strerror(errno));
|
|
goto fail;
|
|
}
|
|
|
|
memset(&nodeinfo, 0, sizeof(nodeinfo));
|
|
if (linuxNodeInfoCPUPopulate(cpuinfo, sysfs_dir, arch, &nodeinfo) < 0) {
|
|
if (virTestGetDebug()) {
|
|
virErrorPtr error = virSaveLastError();
|
|
if (error && error->code != VIR_ERR_OK)
|
|
fprintf(stderr, "\n%s\n", error->message);
|
|
virFreeError(error);
|
|
}
|
|
VIR_FORCE_FCLOSE(cpuinfo);
|
|
goto fail;
|
|
}
|
|
VIR_FORCE_FCLOSE(cpuinfo);
|
|
|
|
if (virAsprintf(&actualData,
|
|
"CPUs: %u/%u, MHz: %u, Nodes: %u, Sockets: %u, "
|
|
"Cores: %u, Threads: %u\n",
|
|
nodeinfo.cpus, VIR_NODEINFO_MAXCPUS(nodeinfo),
|
|
nodeinfo.mhz, nodeinfo.nodes, nodeinfo.sockets,
|
|
nodeinfo.cores, nodeinfo.threads) < 0)
|
|
goto fail;
|
|
|
|
if (STRNEQ(actualData, expectData)) {
|
|
virtTestDifference(stderr, expectData, actualData);
|
|
goto fail;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
fail:
|
|
VIR_FREE(expectData);
|
|
VIR_FREE(actualData);
|
|
return ret;
|
|
}
|
|
|
|
# define TICK_TO_NSEC (1000ull * 1000ull * 1000ull / sysconf(_SC_CLK_TCK))
|
|
|
|
static int
|
|
linuxCPUStatsToBuf(virBufferPtr buf,
|
|
int cpu,
|
|
virNodeCPUStatsPtr param,
|
|
size_t nparams)
|
|
{
|
|
size_t i = 0;
|
|
|
|
if (cpu < 0)
|
|
virBufferAddLit(buf, "cpu:\n");
|
|
else
|
|
virBufferAsprintf(buf, "cpu%d:\n", cpu);
|
|
|
|
for (i = 0; i < nparams; i++)
|
|
virBufferAsprintf(buf, "%s: %llu\n", param[i].field,
|
|
param[i].value / TICK_TO_NSEC);
|
|
|
|
virBufferAddChar(buf, '\n');
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
linuxCPUStatsCompareFiles(const char *cpustatfile,
|
|
size_t ncpus,
|
|
const char *outfile)
|
|
{
|
|
int ret = -1;
|
|
char *actualData = NULL;
|
|
char *expectData = NULL;
|
|
FILE *cpustat = NULL;
|
|
virNodeCPUStatsPtr params = NULL;
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
size_t i;
|
|
int nparams = 0;
|
|
|
|
if (virtTestLoadFile(outfile, &expectData) < 0)
|
|
goto fail;
|
|
|
|
if (!(cpustat = fopen(cpustatfile, "r"))) {
|
|
virReportSystemError(errno, "failed to open '%s': ", cpustatfile);
|
|
goto fail;
|
|
}
|
|
|
|
if (linuxNodeGetCPUStats(NULL, 0, NULL, &nparams) < 0)
|
|
goto fail;
|
|
|
|
if (VIR_ALLOC_N(params, nparams) < 0)
|
|
goto fail;
|
|
|
|
if (linuxNodeGetCPUStats(cpustat, VIR_NODE_CPU_STATS_ALL_CPUS, params,
|
|
&nparams) < 0)
|
|
goto fail;
|
|
|
|
if (linuxCPUStatsToBuf(&buf, VIR_NODE_CPU_STATS_ALL_CPUS,
|
|
params, nparams) < 0)
|
|
goto fail;
|
|
|
|
for (i = 0; i < ncpus; i++) {
|
|
if (linuxNodeGetCPUStats(cpustat, i, params, &nparams) < 0)
|
|
goto fail;
|
|
if (linuxCPUStatsToBuf(&buf, i, params, nparams) < 0)
|
|
goto fail;
|
|
}
|
|
|
|
if (!(actualData = virBufferContentAndReset(&buf))) {
|
|
virReportOOMError();
|
|
goto fail;
|
|
}
|
|
|
|
if (STRNEQ(actualData, expectData)) {
|
|
virtTestDifference(stderr, expectData, actualData);
|
|
goto fail;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
fail:
|
|
virBufferFreeAndReset(&buf);
|
|
VIR_FORCE_FCLOSE(cpustat);
|
|
VIR_FREE(expectData);
|
|
VIR_FREE(actualData);
|
|
VIR_FREE(params);
|
|
return ret;
|
|
}
|
|
|
|
|
|
struct linuxTestNodeInfoData {
|
|
const char *testName;
|
|
virArch arch;
|
|
};
|
|
|
|
static int
|
|
linuxTestNodeInfo(const void *opaque)
|
|
{
|
|
int result = -1;
|
|
char *cpuinfo = NULL;
|
|
char *sysfs_dir = NULL;
|
|
char *output = NULL;
|
|
struct linuxTestNodeInfoData *data = (struct linuxTestNodeInfoData *) opaque;
|
|
const char *archStr = virArchToString(data->arch);
|
|
|
|
if (virAsprintf(&sysfs_dir, "%s/nodeinfodata/linux-%s",
|
|
abs_srcdir, data->testName) < 0 ||
|
|
virAsprintf(&cpuinfo, "%s/nodeinfodata/linux-%s-%s.cpuinfo",
|
|
abs_srcdir, archStr, data->testName) < 0 ||
|
|
virAsprintf(&output, "%s/nodeinfodata/linux-%s-%s.expected",
|
|
abs_srcdir, archStr, data->testName) < 0) {
|
|
goto cleanup;
|
|
}
|
|
|
|
result = linuxTestCompareFiles(cpuinfo, sysfs_dir, data->arch, output);
|
|
|
|
cleanup:
|
|
VIR_FREE(cpuinfo);
|
|
VIR_FREE(output);
|
|
VIR_FREE(sysfs_dir);
|
|
|
|
return result;
|
|
}
|
|
|
|
struct nodeCPUStatsData {
|
|
const char *name;
|
|
int ncpus;
|
|
};
|
|
|
|
static int
|
|
linuxTestNodeCPUStats(const void *data)
|
|
{
|
|
const struct nodeCPUStatsData *testData = data;
|
|
int result = -1;
|
|
char *cpustatfile = NULL;
|
|
char *outfile = NULL;
|
|
|
|
if (virAsprintf(&cpustatfile, "%s/nodeinfodata/linux-cpustat-%s.stat",
|
|
abs_srcdir, testData->name) < 0 ||
|
|
virAsprintf(&outfile, "%s/nodeinfodata/linux-cpustat-%s.out",
|
|
abs_srcdir, testData->name) < 0)
|
|
goto fail;
|
|
|
|
result = linuxCPUStatsCompareFiles(cpustatfile,
|
|
testData->ncpus,
|
|
outfile);
|
|
fail:
|
|
VIR_FREE(cpustatfile);
|
|
VIR_FREE(outfile);
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = 0;
|
|
size_t i;
|
|
const struct linuxTestNodeInfoData nodeData[] = {
|
|
{"test1", VIR_ARCH_X86_64},
|
|
{"test1", VIR_ARCH_PPC},
|
|
{"test2", VIR_ARCH_X86_64},
|
|
{"test3", VIR_ARCH_X86_64},
|
|
{"test4", VIR_ARCH_X86_64},
|
|
{"test5", VIR_ARCH_X86_64},
|
|
{"test6", VIR_ARCH_X86_64},
|
|
{"test7", VIR_ARCH_X86_64},
|
|
{"test8", VIR_ARCH_X86_64},
|
|
{"raspberrypi", VIR_ARCH_ARMV6L},
|
|
};
|
|
|
|
if (virInitialize() < 0)
|
|
return EXIT_FAILURE;
|
|
|
|
for (i = 0; i < ARRAY_CARDINALITY(nodeData); i++)
|
|
if (virtTestRun(nodeData[i].testName, linuxTestNodeInfo, &nodeData[i]) != 0)
|
|
ret = -1;
|
|
|
|
# define DO_TEST_CPU_STATS(name, ncpus) \
|
|
do { \
|
|
static struct nodeCPUStatsData data = { name, ncpus }; \
|
|
if (virtTestRun("CPU stats " name, linuxTestNodeCPUStats, &data) < 0) \
|
|
ret = -1; \
|
|
} while (0)
|
|
|
|
DO_TEST_CPU_STATS("24cpu", 24);
|
|
|
|
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
|
}
|
|
|
|
VIRT_TEST_MAIN(mymain)
|
|
|
|
#endif /* __linux__ */
|