提交 2d74822a 编写于 作者: R Ryota Ozaki 提交者: Michal Privoznik

nodeinfo: make freebsdNodeGetCPUCount work on Mac OS X

This fixes the following error:
  error : nodeGetInfo:933 : this function is not supported
  by the connection driver: node info not implemented on this platform

The freebsdNodeGetCPUCount was renamed to appleFreebsdNodeGetCPUCount
in order to make more visible the fact, that it works on Mac OS X too.

Mac OS X can use sysctlbyname as same as FreeBSD to get the CPU
frequency. However, the MIB style name is different from FreeBSD's.
And the unit of the return frequency is also different.
Signed-off-by: NRyota Ozaki <ozaki.ryota@gmail.com>
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
上级 5a468b38
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
# include <numa.h> # include <numa.h>
#endif #endif
#ifdef __FreeBSD__ #if defined(__FreeBSD__) || defined(__APPLE__)
# include <sys/types.h> # include <sys/types.h>
# include <sys/sysctl.h> # include <sys/sysctl.h>
#endif #endif
...@@ -58,9 +58,9 @@ ...@@ -58,9 +58,9 @@
#define VIR_FROM_THIS VIR_FROM_NONE #define VIR_FROM_THIS VIR_FROM_NONE
#ifdef __FreeBSD__ #if defined(__FreeBSD__) || defined(__APPLE__)
static int static int
freebsdNodeGetCPUCount(void) appleFreebsdNodeGetCPUCount(void)
{ {
int ncpu_mib[2] = { CTL_HW, HW_NCPU }; int ncpu_mib[2] = { CTL_HW, HW_NCPU };
unsigned long ncpu; unsigned long ncpu;
...@@ -882,13 +882,13 @@ cleanup: ...@@ -882,13 +882,13 @@ cleanup:
VIR_FORCE_FCLOSE(cpuinfo); VIR_FORCE_FCLOSE(cpuinfo);
return ret; return ret;
} }
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__) || defined(__APPLE__)
{ {
nodeinfo->nodes = 1; nodeinfo->nodes = 1;
nodeinfo->sockets = 1; nodeinfo->sockets = 1;
nodeinfo->threads = 1; nodeinfo->threads = 1;
nodeinfo->cpus = freebsdNodeGetCPUCount(); nodeinfo->cpus = appleFreebsdNodeGetCPUCount();
if (nodeinfo->cpus == -1) if (nodeinfo->cpus == -1)
return -1; return -1;
...@@ -897,12 +897,21 @@ cleanup: ...@@ -897,12 +897,21 @@ cleanup:
unsigned long cpu_freq; unsigned long cpu_freq;
size_t cpu_freq_len = sizeof(cpu_freq); size_t cpu_freq_len = sizeof(cpu_freq);
# ifdef __FreeBSD__
if (sysctlbyname("dev.cpu.0.freq", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) { if (sysctlbyname("dev.cpu.0.freq", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) {
virReportSystemError(errno, "%s", _("cannot obtain CPU freq")); virReportSystemError(errno, "%s", _("cannot obtain CPU freq"));
return -1; return -1;
} }
nodeinfo->mhz = cpu_freq; nodeinfo->mhz = cpu_freq;
# else
if (sysctlbyname("hw.cpufrequency", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) {
virReportSystemError(errno, "%s", _("cannot obtain CPU freq"));
return -1;
}
nodeinfo->mhz = cpu_freq / 1000000;
# endif
/* get memory information */ /* get memory information */
int mib[2] = { CTL_HW, HW_PHYSMEM }; int mib[2] = { CTL_HW, HW_PHYSMEM };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册