2008-01-29 18:15:54 +00:00
|
|
|
#include <config.h>
|
2007-11-26 12:03:34 +00:00
|
|
|
|
2007-07-25 23:16:30 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2008-05-29 15:31:49 +00:00
|
|
|
#include <unistd.h>
|
2007-07-25 23:16:30 +00:00
|
|
|
|
|
|
|
#include "testutils.h"
|
|
|
|
#include "internal.h"
|
2014-01-22 11:56:06 +00:00
|
|
|
#include "nodeinfopriv.h"
|
2011-07-19 18:32:58 +00:00
|
|
|
#include "virfile.h"
|
2013-04-03 10:36:23 +00:00
|
|
|
#include "virstring.h"
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2013-06-07 15:10:28 +00:00
|
|
|
#define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
|
2011-06-12 19:57:01 +00:00
|
|
|
#if ! (defined __linux__ && (defined(__x86_64__) || \
|
|
|
|
defined(__amd64__) || \
|
2011-12-01 07:17:52 +00:00
|
|
|
defined(__i386__) || \
|
|
|
|
defined(__powerpc__) || \
|
|
|
|
defined(__powerpc64__)))
|
2008-12-18 12:08:05 +00:00
|
|
|
|
2011-07-28 15:48:12 +00:00
|
|
|
int
|
|
|
|
main(void)
|
2008-12-18 12:08:05 +00:00
|
|
|
{
|
2011-07-28 15:48:12 +00:00
|
|
|
return EXIT_AM_SKIP;
|
2008-12-18 12:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
2011-04-24 22:25:10 +00:00
|
|
|
static int
|
2011-12-01 07:17:52 +00:00
|
|
|
linuxTestCompareFiles(const char *cpuinfofile,
|
2012-05-11 19:59:59 +00:00
|
|
|
char *sysfs_dir,
|
2011-12-01 07:17:52 +00:00
|
|
|
const char *outputfile)
|
2011-04-24 22:25:10 +00:00
|
|
|
{
|
|
|
|
int ret = -1;
|
|
|
|
char *actualData = NULL;
|
|
|
|
char *expectData = NULL;
|
2007-07-25 23:16:30 +00:00
|
|
|
virNodeInfo nodeinfo;
|
Use gnulib, starting with its physmem and getaddrinfo modules.
New files go into these directories:
gnulib/lib
gnulib/m4
gnulib/tests
* bootstrap: A wrapper around gnulib-tool.
* configure.in: Invoke gl_EARLY and gl_INIT, being careful to put gl_EARLY
before any macro that uses AC_COMPILE_IFELSE.
(AC_OUTPUT): Add lib/Makefile and gl-tests/Makefile. Remove m4/Makefile.
* Makefile.am (SUBDIRS): Add gnulib/lib and remove m4. Add gnulib/tests
early enough that those tests run before any libvirt unit tests.
* m4/Makefile.am: Remove file. Not needed.
* src/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS, libvirt_la_LIBADD): Add ../gnulib/lib/libgnu.la.
* src/nodeinfo.c: Include "physmem.h".
* qemud/qemud.c, src/remote_internal.c: Include "getaddrinfo.h".
(MEMINFO_PATH, linuxNodeInfoMemPopulate): Remove definitions.
(virNodeInfoPopulate): Use physmem_total, not linuxNodeInfoMemPopulate.
* tests/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS): Add ../gnulib/lib/libgnu.la.
* qemud/Makefile.am (libvirtd_LDADD): Add ../gnulib/lib/libgnu.la.
* tests/nodeinfotest.c (linuxTestCompareFiles): No longer read total
memory from a file.
Update expected output not to include "Memory: NNNN"
* tests/nodeinfodata/linux-nodeinfo-1.txt:
* tests/nodeinfodata/linux-nodeinfo-2.txt:
* tests/nodeinfodata/linux-nodeinfo-3.txt:
* tests/nodeinfodata/linux-nodeinfo-4.txt:
* tests/nodeinfodata/linux-nodeinfo-5.txt:
* tests/nodeinfodata/linux-nodeinfo-6.txt:
* src/test.c [WITH_TEST]: Remove definition of _GNU_SOURCE that
would conflict with the one now in "config.h".
* autogen.sh: Add -I gnulib/m4.
* src/conf.c, src/sexpr.c: Don't define _GNU_SOURCE.
Instead, include "config.h".
* qemud/qemud.c: Remove definition of _GNU_SOURCE.
* src/openvz_driver.c: Likewise.
* src/qemu_driver.c: Likewise.
* src/remote_internal.c: Likewise.
* configure.in: Use AC_CONFIG_AUX_DIR(build-aux), so that a bunch
of gettextize-generated files go into build-aux/, rather than in
the top-level directory.
* .cvsignore: Adjust.
* build-aux/.cvsignore: New file.
Author: Jim Meyering <meyering@redhat.com>
2007-12-05 21:31:07 +00:00
|
|
|
FILE *cpuinfo;
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2011-04-24 22:25:10 +00:00
|
|
|
if (virtTestLoadFile(outputfile, &expectData) < 0)
|
|
|
|
goto fail;
|
2007-07-25 23:16:30 +00:00
|
|
|
|
|
|
|
cpuinfo = fopen(cpuinfofile, "r");
|
|
|
|
if (!cpuinfo)
|
2011-04-24 22:25:10 +00:00
|
|
|
goto fail;
|
2010-05-18 09:58:32 +00:00
|
|
|
|
|
|
|
memset(&nodeinfo, 0, sizeof(nodeinfo));
|
2012-05-11 19:59:59 +00:00
|
|
|
if (linuxNodeInfoCPUPopulate(cpuinfo, sysfs_dir, &nodeinfo) < 0) {
|
2010-08-23 14:48:33 +00:00
|
|
|
if (virTestGetDebug()) {
|
|
|
|
virErrorPtr error = virSaveLastError();
|
|
|
|
if (error && error->code != VIR_ERR_OK)
|
|
|
|
fprintf(stderr, "\n%s\n", error->message);
|
|
|
|
virFreeError(error);
|
|
|
|
}
|
2010-11-17 02:13:29 +00:00
|
|
|
VIR_FORCE_FCLOSE(cpuinfo);
|
2011-04-24 22:25:10 +00:00
|
|
|
goto fail;
|
2007-07-25 23:16:30 +00:00
|
|
|
}
|
2010-11-17 02:13:29 +00:00
|
|
|
VIR_FORCE_FCLOSE(cpuinfo);
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2012-05-14 23:11:47 +00:00
|
|
|
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)
|
2011-04-24 22:25:10 +00:00
|
|
|
goto fail;
|
2007-07-25 23:16:30 +00:00
|
|
|
|
|
|
|
if (STRNEQ(actualData, expectData)) {
|
2012-05-11 19:59:59 +00:00
|
|
|
virtTestDifference(stderr, expectData, actualData);
|
2011-04-24 22:25:10 +00:00
|
|
|
goto fail;
|
2007-07-25 23:16:30 +00:00
|
|
|
}
|
|
|
|
|
2011-04-24 22:25:10 +00:00
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:53:44 +00:00
|
|
|
fail:
|
2012-02-02 23:16:43 +00:00
|
|
|
VIR_FREE(expectData);
|
|
|
|
VIR_FREE(actualData);
|
2011-04-24 22:25:10 +00:00
|
|
|
return ret;
|
2007-07-25 23:16:30 +00:00
|
|
|
}
|
|
|
|
|
2014-01-16 11:37:27 +00:00
|
|
|
# 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;
|
|
|
|
|
2014-03-25 06:53:44 +00:00
|
|
|
fail:
|
2014-01-16 11:37:27 +00:00
|
|
|
virBufferFreeAndReset(&buf);
|
|
|
|
VIR_FORCE_FCLOSE(cpustat);
|
|
|
|
VIR_FREE(expectData);
|
|
|
|
VIR_FREE(actualData);
|
|
|
|
VIR_FREE(params);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2011-04-24 22:25:10 +00:00
|
|
|
static int
|
|
|
|
linuxTestNodeInfo(const void *data)
|
|
|
|
{
|
|
|
|
int result = -1;
|
|
|
|
char *cpuinfo = NULL;
|
2012-05-11 19:59:59 +00:00
|
|
|
char *sysfs_dir = NULL;
|
2011-04-24 22:25:10 +00:00
|
|
|
char *output = NULL;
|
2012-05-11 19:59:59 +00:00
|
|
|
const char *test = data;
|
|
|
|
const char *arch = "x86";
|
2011-04-24 22:25:10 +00:00
|
|
|
|
2011-12-01 07:17:52 +00:00
|
|
|
# if defined(__powerpc__) || \
|
|
|
|
defined(__powerpc64__)
|
2012-05-11 19:59:59 +00:00
|
|
|
arch = "ppc";
|
2011-12-01 07:17:52 +00:00
|
|
|
# endif
|
2012-05-11 19:59:59 +00:00
|
|
|
|
|
|
|
if (virAsprintf(&sysfs_dir, "%s/nodeinfodata/linux-%s",
|
|
|
|
abs_srcdir, test) < 0 ||
|
|
|
|
virAsprintf(&cpuinfo, "%s/nodeinfodata/linux-%s-%s.cpuinfo",
|
2012-07-20 19:12:44 +00:00
|
|
|
abs_srcdir, arch, test) < 0 ||
|
|
|
|
virAsprintf(&output, "%s/nodeinfodata/linux-%s-%s.expected",
|
|
|
|
abs_srcdir, arch, test) < 0) {
|
2011-04-24 22:25:10 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2012-05-11 19:59:59 +00:00
|
|
|
result = linuxTestCompareFiles(cpuinfo, sysfs_dir, output);
|
2011-04-24 22:25:10 +00:00
|
|
|
|
2014-03-25 06:53:44 +00:00
|
|
|
cleanup:
|
2012-02-02 23:16:43 +00:00
|
|
|
VIR_FREE(cpuinfo);
|
|
|
|
VIR_FREE(output);
|
2012-05-11 19:59:59 +00:00
|
|
|
VIR_FREE(sysfs_dir);
|
2011-04-24 22:25:10 +00:00
|
|
|
|
|
|
|
return result;
|
2007-07-25 23:16:30 +00:00
|
|
|
}
|
|
|
|
|
2014-01-16 11:37:27 +00:00
|
|
|
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);
|
2014-03-25 06:53:44 +00:00
|
|
|
fail:
|
2014-01-16 11:37:27 +00:00
|
|
|
VIR_FREE(cpustatfile);
|
|
|
|
VIR_FREE(outfile);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
static int
|
2011-04-29 16:21:20 +00:00
|
|
|
mymain(void)
|
2007-07-25 23:16:30 +00:00
|
|
|
{
|
|
|
|
int ret = 0;
|
Convert 'int i' to 'size_t i' in tests/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 14:09:33 +00:00
|
|
|
size_t i;
|
2007-07-25 23:16:30 +00:00
|
|
|
const char *nodeData[] = {
|
2012-07-20 19:12:44 +00:00
|
|
|
"test1",
|
2012-05-11 20:30:05 +00:00
|
|
|
# if !(defined(__powerpc__) || \
|
|
|
|
defined(__powerpc64__))
|
2012-07-20 19:12:44 +00:00
|
|
|
"test2",
|
|
|
|
"test3",
|
|
|
|
"test4",
|
|
|
|
"test5",
|
|
|
|
"test6",
|
2012-11-07 14:19:47 +00:00
|
|
|
"test7",
|
2012-11-07 14:50:56 +00:00
|
|
|
"test8",
|
2012-05-11 20:30:05 +00:00
|
|
|
# endif
|
2007-07-25 23:16:30 +00:00
|
|
|
};
|
|
|
|
|
2010-05-18 10:32:39 +00:00
|
|
|
if (virInitialize() < 0)
|
|
|
|
return EXIT_FAILURE;
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2013-05-21 07:53:48 +00:00
|
|
|
for (i = 0; i < ARRAY_CARDINALITY(nodeData); i++)
|
2013-09-20 18:13:35 +00:00
|
|
|
if (virtTestRun(nodeData[i], linuxTestNodeInfo, nodeData[i]) != 0)
|
2008-04-10 16:54:54 +00:00
|
|
|
ret = -1;
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2014-01-16 11:37:27 +00:00
|
|
|
# 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);
|
|
|
|
|
2014-03-17 09:38:38 +00:00
|
|
|
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
2007-07-25 23:16:30 +00:00
|
|
|
}
|
2008-05-29 15:31:49 +00:00
|
|
|
|
|
|
|
VIRT_TEST_MAIN(mymain)
|
2011-07-28 15:48:12 +00:00
|
|
|
|
|
|
|
#endif /* __linux__ */
|