Changeset 10452 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Jul 10, 2008 2:43:48 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

33119

Message:

Cooked up some basic RTMp for darwin.

File:

• trunk/src/VBox/Runtime/r3/darwin/mp-darwin.cpp (copied) (copied from trunk/src/VBox/Runtime/r3/linux/mp-linux.cpp ) (14 diffs)

trunk/src/VBox/Runtime/r3/darwin/mp-darwin.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Multiprocessor, Linux.
+ * IPRT - Multiprocessor, Darwin.
  */
 
@@ -34 +34 @@
 *******************************************************************************/
 #define LOG_GROUP RTLOGGROUP_SYSTEM
+#include <iprt/types.h>
+
 #include <unistd.h>
 #include <stdio.h>
@@ -47 +49 @@
 
 
-/** @todo move the rtLinuxSysFs* bits into sysfs.cpp and sysfs.h. */
-
-/**
- * Checks if a sysfs file (or directory, device, symlink, whatever) exists.
- *
- * @returns true / false, errno is preserved.
- * @param   pszFormat   The name format, without "/sys/".
- * @param   va          The format args.
- */
-bool rtLinuxSysFsExistsV(const char *pszFormat, va_list va)
-{
-    int iSavedErrno = errno;
-
-    /*
-     * Construct the filename and call stat.
-     */
-    char szFilename[128];
-    static const size_t cchPrefix = sizeof("/sys/") - 1;
-    strcpy(szFilename, "/sys/");
-    size_t cch = RTStrPrintfV(&szFilename[cchPrefix], sizeof(szFilename) - cchPrefix, pszFormat, va);
-    Assert(cch < sizeof(szFilename) - cchPrefix - 1);
-
-    struct stat st;
-    bool fRet = stat(szFilename, &st) == 0;
-
-    errno = iSavedErrno;
-    return fRet;
-}
-
-/**
- * Checks if a sysfs file (or directory, device, symlink, whatever) exists.
- *
- * @returns true / false, errno is preserved.
- * @param   pszFormat   The name format, without "/sys/".
- * @param   ...         The format args.
- */
-bool rtLinuxSysFsExists(const char *pszFormat, ...)
-{
-    va_list va;
-    va_start(va, pszFormat);
-    bool fRet = rtLinuxSysFsExistsV(pszFormat, va);
-    va_end(va);
-    return fRet;
-}
-
-
-/**
- * Opens a sysfs file.
- *
- * @returns The file descriptor. -1 and errno on failure.
- * @param   pszFormat   The name format, without "/sys/".
- * @param   va          The format args.
- */
-int rtLinuxSysFsOpenV(const char *pszFormat, va_list va)
-{
-    /*
-     * Construct the filename and call open.
-     */
-    char szFilename[128];
-    static const size_t cchPrefix = sizeof("/sys/") - 1;
-    strcpy(szFilename, "/sys/");
-    size_t cch = RTStrPrintfV(&szFilename[cchPrefix], sizeof(szFilename) - cchPrefix, pszFormat, va);
-    Assert(cch < sizeof(szFilename) - cchPrefix - 1);
-
-    return open(szFilename, O_RDONLY, 0);
-}
-
-
-/**
- * Opens a sysfs file.
- *
- * @returns The file descriptor. -1 and errno on failure.
- * @param   pszFormat   The name format, without "/sys/".
- * @param   ...         The format args.
- */
-int rtLinuxSysFsOpen(const char *pszFormat, ...)
-{
-    va_list va;
-    va_start(va, pszFormat);
-    int fd = rtLinuxSysFsOpenV(pszFormat, va);
-    va_end(va);
-    return fd;
-}
-
-
-/**
- * Closes a file opened with rtLinuxSysFsOpen or rtLinuxSysFsOpenV.
- *
- * @param   fd
- */
-void rtLinuxSysFsClose(int fd)
-{
-    int iSavedErrno = errno;
-    close(fd);
-    errno = iSavedErrno;
-}
-
-
-/**
- * Closes a file opened with rtLinuxSysFsOpen or rtLinuxSysFsOpenV.
- *
- * @returns The number of bytes read. -1 and errno on failure.
- * @param   fd          The file descriptor returned by rtLinuxSysFsOpen or rtLinuxSysFsOpenV.
- * @param   pszBuf      Where to store the string.
- * @param   cchBuf      The size of the buffer. Must be at least 2 bytes.
- */
-ssize_t rtLinuxSysFsReadStr(int fd, char *pszBuf, size_t cchBuf)
-{
-    Assert(cchBuf > 1);
-    ssize_t cchRead = read(fd, pszBuf, cchBuf - 1);
-    pszBuf[cchRead >= 0 ? cchRead : 0] = '\0';
-    return cchRead;
-}
-
-
-/**
- * Reads a sysfs file.
- *
- * @returns 64-bit signed value on success, -1 and errno on failure.
- * @param   uBase       The number base, 0 for autodetect.
- * @param   pszFormat   The filename format, without "/sys/".
- * @param   va          Format args.
- */
-int64_t rtLinuxSysFsReadIntFileV(unsigned uBase, const char *pszFormat, va_list va)
-{
-    int fd = rtLinuxSysFsOpenV(pszFormat, va);
-    if (fd == -1)
-        return -1;
-
-    int64_t i64Ret = -1;
-    char szNum[128];
-    ssize_t cchNum = rtLinuxSysFsReadStr(fd, szNum, sizeof(szNum));
-    if (cchNum > 0)
-    {
-        int rc = RTStrToInt64Ex(szNum, NULL, uBase, &i64Ret);
-        if (RT_FAILURE(rc))
-        {
-            i64Ret = -1;
-            errno = -ETXTBSY; /* just something that won't happen at read / open. */
-        }
-    }
-    else if (cchNum == 0)
-        errno = -ETXTBSY; /* just something that won't happen at read / open. */
-
-    rtLinuxSysFsClose(fd);
-    return i64Ret;
-}
-
-
-/**
- * Reads a sysfs file.
- *
- * @returns 64-bit signed value on success, -1 and errno on failure.
- * @param   uBase       The number base, 0 for autodetect.
- * @param   pszFormat   The filename format, without "/sys/".
- * @param   ...         Format args.
- */
-static int64_t rtLinuxSysFsReadIntFile(unsigned uBase, const char *pszFormat, ...)
-{
-    va_list va;
-    va_start(va, pszFormat);
-    int64_t i64Ret = rtLinuxSysFsReadIntFileV(uBase, pszFormat, va);
-    va_end(va);
-    return i64Ret;
-}
-
-
 /**
  * Internal worker that determins the max possible CPU count.
@@ -219 +54 @@
  * @returns Max cpus.
  */
-static RTCPUID rtMpLinuxMaxCpus(void)
+static RTCPUID rtMpDarwinMaxCpus(void)
 {
-#if 0 /* this doesn't do the right thing :-/ */
-    int cMax = sysconf(_SC_NPROCESSORS_CONF);
-    Assert(cMax >= 1);
-    return cMax;
-#else
-    static uint32_t s_cMax = 0;
-    if (!s_cMax)
-    {
-        int cMax = 1;
-        for (unsigned iCpu = 0; iCpu < RTCPUSET_MAX_CPUS; iCpu++)
-            if (rtLinuxSysFsExists("devices/system/cpu/cpu%d", iCpu))
-                cMax = iCpu + 1;
-        ASMAtomicUoWriteU32((uint32_t volatile *)&s_cMax, cMax);
-        return cMax;
-    }
-    return s_cMax;
-#endif
-}
-
-/**
- * Internal worker that picks the processor speed in MHz from /proc/cpuinfo.
- *
- * @returns CPU frequency.
- */
-static uint32_t rtMpLinuxGetFrequency(RTCPUID idCpu)
-{
-    FILE *f = fopen("/proc/cpuinfo", "r");
-    if (!f)
-        return 0;
-
-    char sz[256];
-    char *psz = NULL;
-    RTCPUID idCpuFound = NIL_RTCPUID;
-    uint32_t freq = 0;
-    while (fgets(sz, sizeof(sz), f))
-    {
-        if (   !strncmp(sz, "processor", 9)
-            && (sz[10] == ' ' || sz[10] == '\t' || sz[10] == ':')
-            && (psz = strchr(sz, ':')))
-        {
-            psz += 2;
-            int64_t iCpu;
-            int rc = RTStrToInt64Ex(psz, NULL, 0, &iCpu);
-            if (RT_SUCCESS(rc))
-                idCpuFound = iCpu;
-        }
-        else if (   idCpu == idCpuFound
-                 && !strncmp(sz, "cpu MHz", 7)
-                 && (sz[10] == ' ' || sz[10] == '\t' || sz[10] == ':')
-                 && (psz = strchr(sz, ':')))
-        {
-            psz += 2;
-            int64_t v;
-            int rc = RTStrToInt64Ex(psz, &psz, 0, &v);
-            if (RT_SUCCESS(rc))
-            {
-                freq = v;
-                break;
-            }
-        }
-    }
-    fclose(f);
-    return freq;
+    int aiMib[2];
+    aiMib[0] = CTL_HW;
+    aiMib[1] = HW_NCPU;
+    int cCpus = -1;
+    size_t cb = sizeof(cCpus);
+    int rc = sysctl(aiMib, ELEMENTS(aiMib), &cCpus, &cb, NULL, 0);
+    if (rc != -1 && cCpus >= 1)
+        return cCpus;
+    AssertFailed();
+    return 1;
 }
 
@@ -291 +73 @@
 RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu)
 {
-    return idCpu < rtMpLinuxMaxCpus() ? idCpu : -1;
+    return idCpu < rtMpDarwinMaxCpus() ? idCpu : -1;
 }
 
@@ -297 +79 @@
 RTDECL(RTCPUID) RTMpCpuIdFromSetIndex(int iCpu)
 {
-    return (unsigned)iCpu < rtMpLinuxMaxCpus() ? iCpu : NIL_RTCPUID;
+    return (unsigned)iCpu < rtMpDarwinMaxCpus() ? iCpu : NIL_RTCPUID;
 }
 
@@ -303 +85 @@
 RTDECL(RTCPUID) RTMpGetMaxCpuId(void)
 {
-    return rtMpLinuxMaxCpus() - 1;
+    return rtMpDarwinMaxCpus() - 1;
 }
 
@@ -309 +91 @@
 RTDECL(bool) RTMpIsCpuOnline(RTCPUID idCpu)
 {
-    /** @todo check if there is a simpler interface than this... */
-    int i = rtLinuxSysFsReadIntFile(0, "devices/system/cpu/cpu%d/online", (int)idCpu);
-    if (    i == -1
-        &&  rtLinuxSysFsExists("devices/system/cpu/cpu%d", (int)idCpu))
-    {
-        Assert(!rtLinuxSysFsExists("devices/system/cpu/cpu%d/online", (int)idCpu));
-        i = 1;
-    }
-
-    Assert(i == 0 || i == -1 || i == 1);
-    return i != 0 && i != -1;
+#if 1
+    return RTMpIsCpuPossible(idCpu);
+#else
+    /** @todo proper ring-3 support on darwin, see #3014. */
+#endif
 }
 
@@ -325 +101 @@
 RTDECL(bool) RTMpIsCpuPossible(RTCPUID idCpu)
 {
-    /** @todo check this up with hotplugging! */
-    return rtLinuxSysFsExists("devices/system/cpu/cpu%d", (int)idCpu);
+    return idCpu != NIL_RTCPUID
+        && idCpu < rtMpDarwinMaxCpus();
 }
 
@@ -332 +108 @@
 RTDECL(PRTCPUSET) RTMpGetSet(PRTCPUSET pSet)
 {
+#if 0
+    RTCPUID cCpus = rtMpDarwinMaxCpus();
+    return RTCpuSetFromU64(RT_BIT_64(cCpus) - 1);
+
+#else
     RTCpuSetEmpty(pSet);
-    RTCPUID cMax = rtMpLinuxMaxCpus();
+    RTCPUID cMax = rtMpDarwinMaxCpus();
     for (RTCPUID idCpu = 0; idCpu < cMax; idCpu++)
         if (RTMpIsCpuPossible(idCpu))
             RTCpuSetAdd(pSet, idCpu);
     return pSet;
+#endif
 }
 
@@ -343 +125 @@
 RTDECL(RTCPUID) RTMpGetCount(void)
 {
-    RTCPUSET Set;
-    RTMpGetSet(&Set);
-    return RTCpuSetCount(&Set);
+    return rtMpDarwinMaxCpus();
 }
 
@@ -351 +131 @@
 RTDECL(PRTCPUSET) RTMpGetOnlineSet(PRTCPUSET pSet)
 {
+#if 1
+    return RTMpGetSet(pSet);
+#else
     RTCpuSetEmpty(pSet);
-    RTCPUID cMax = rtMpLinuxMaxCpus();
+    RTCPUID cMax = rtMpDarwinMaxCpus();
     for (RTCPUID idCpu = 0; idCpu < cMax; idCpu++)
         if (RTMpIsCpuOnline(idCpu))
             RTCpuSetAdd(pSet, idCpu);
     return pSet;
+#endif
 }
 
@@ -370 +154 @@
 RTDECL(uint32_t) RTMpGetCurFrequency(RTCPUID idCpu)
 {
-    int64_t kHz = rtLinuxSysFsReadIntFile(0, "devices/system/cpu/cpu%d/cpufreq/cpuinfo_cur_freq", (int)idCpu);
-    if (kHz == -1)
-    {
-        /* The file may be just unreadable - in that case use plan B, i.e.
-         * /proc/cpuinfo to get the data we want. The assumption is that if
-         * cpuinfo_cur_freq doesn't exist then the speed won't change, and
-         * thus cur == max. If it does exist then cpuinfo contains the
-         * current frequency. */
-        kHz = rtMpLinuxGetFrequency(idCpu) * 1000;
-    }
-    return (kHz + 999) / 1000;
+    /** @todo figure out how to get the current cpu speed on darwin. */
+    return 0;
 }
 
@@ -386 +161 @@
 RTDECL(uint32_t) RTMpGetMaxFrequency(RTCPUID idCpu)
 {
-    int64_t kHz = rtLinuxSysFsReadIntFile(0, "devices/system/cpu/cpu%d/cpufreq/cpuinfo_max_freq", (int)idCpu);
-    if (kHz == -1)
-    {
-        /* Check if the file isn't there - if it is there, then /proc/cpuinfo
-         * would provide current frequency information, which is wrong. */
-        if (!rtLinuxSysFsExists("devices/system/cpu/cpu%d/cpufreq/cpuinfo_max_freq", (int)idCpu))
-            kHz = rtMpLinuxGetFrequency(idCpu) * 1000;
-        else
-            kHz = 0;
-    }
-    return (kHz + 999) / 1000;
+    if (!RTMpIsCpuOnline(idCpu))
+        return 0;
+
+    /*
+     * Try the 'hw.cpufrequency_max' one.
+     */
+    uint64_t CpuFrequencyMax = 0;
+    size_t cb = sizeof(CpuFrequencyMax);
+    int rc = sysctlbyname("hw.cpufrequency_max", &CpuFrequencyMax, &cb, NULL, 0);
+    if (!rc)
+        return CpuFrequencyMax + 999999 / 1000000;
+
+    /*
+     * Use the depricated one.
+     */
+    int aiMib[2];
+    aiMib[0] = CTL_HW;
+    aiMib[1] = HW_CPU_FREQ;
+    int cCpus = -1;
+    cb = sizeof(cCpus);
+    rc = sysctl(aiMib, ELEMENTS(aiMib), &cCpus, &cb, NULL, 0);
+    if (rc != -1 && cCpus >= 1)
+        return cCpus;
+    AssertFailed();
+    return 0;
 }