Changeset 26608 in vbox for trunk/src/VBox/Runtime

Timestamp:

Feb 17, 2010 12:48:33 PM (15 years ago)

Author:

vboxsync

Message:

IPRT: linux implementation of RTSystemQueryDmiString.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• generic/RTSystemQueryDmiString-generic.cpp (modified) (1 diff)
• r3/linux/RTSystemQueryDmiString-linux.cpp (added)
• r3/linux/sysfs.cpp (modified) (1 diff)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstRTSystemQueryDmi.cpp (copied) (copied from trunk/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp ) (7 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -471 +471 @@
         generic/RTFileMove-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
-        generic/RTSystemQueryDmiString-generic.cpp \
         generic/RTTimeLocalNow-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
@@ -485 +484 @@
         r3/linux/time-linux.cpp \
         r3/linux/RTProcIsRunningByName-linux.cpp \
+        r3/linux/RTSystemQueryDmiString-linux.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTSystemQueryOSInfo-posix.cpp \

trunk/src/VBox/Runtime/generic/RTSystemQueryDmiString-generic.cpp

@@ -42 +42 @@
 RTDECL(int) RTSystemQueryDmiString(RTSYSDMISTR enmString, char *pszBuf, size_t cbBuf)
 {
-    AssertReturn(enmString > RTSYSDMISTR_INVALID && enmString < RTSYSDMISTR_END, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pszBuf, VERR_INVALID_POINTER);
     AssertReturn(cbBuf > 0, VERR_INVALID_PARAMETER);
+    *pszBuf = '\0';
+    AssertReturn(enmString > RTSYSDMISTR_INVALID && enmString < RTSYSDMISTR_END, VERR_INVALID_PARAMETER);
     return VERR_NOT_SUPPORTED;
 }

trunk/src/VBox/Runtime/r3/linux/sysfs.cpp

@@ -208 +208 @@
     pszBuf[cchRead >= 0 ? cchRead : 0] = '\0';
     return cchRead;
+}
+
+
+RTDECL(int) RTLinuxSysFsReadFile(int fd, void *pvBuf, size_t cbBuf, size_t *pcbRead)
+{
+    int     rc;
+    ssize_t cbRead = read(fd, pvBuf, cbBuf);
+    if (cbRead >= 0)
+    {
+        if (pcbRead)
+            *pcbRead = cbRead;
+        if ((size_t)cbRead < cbBuf)
+            rc = VINF_SUCCESS;
+        else
+        {
+            /* Check for EOF */
+            char    ch;
+            off_t   off     = lseek(fd, 0, SEEK_CUR);
+            ssize_t cbRead2 = read(fd, &ch, 1);
+            if (cbRead2 == 0)
+                rc = VINF_SUCCESS;
+            else if (cbRead2 > 0)
+            {
+                lseek(fd, off, SEEK_SET);
+                rc = VERR_BUFFER_OVERFLOW;
+            }
+            else
+                rc = RTErrConvertFromErrno(errno);
+        }
+    }
+    else
+        rc = RTErrConvertFromErrno(errno);
+    return rc;
 }
 

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -104 +104 @@
         tstStrToNum \
         tstRTStrVersion \
+        tstRTSystemQueryDmi \
         tstRTSystemQueryOsInfo \
         tstRTTemp \
@@ -408 +409 @@
 tstRTStrVersion_SOURCES = tstRTStrVersion.cpp
 
+tstRTSystemQueryDmi_TEMPLATE = VBOXR3TSTEXE
+tstRTSystemQueryDmi_SOURCES = tstRTSystemQueryDmi.cpp
+
 tstRTSystemQueryOsInfo_TEMPLATE = VBOXR3TSTEXE
 tstRTSystemQueryOsInfo_SOURCES = tstRTSystemQueryOsInfo.cpp

trunk/src/VBox/Runtime/testcase/tstRTSystemQueryDmi.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT Testcase - RTSystemQueryOSInfo.
+ * IPRT Testcase - RTSystemQueryDmi*.
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
 *******************************************************************************/
 #include <iprt/system.h>
+
+#include <iprt/assert.h>
 #include <iprt/string.h>
 #include <iprt/test.h>
-
-
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
-static int g_cErrors = 0;
 
 
@@ -46 +42 @@
 {
     RTTEST hTest;
-    int rc = RTTestInitAndCreate("tstRTSystemQueryOsInfo", &hTest);
+    int rc = RTTestInitAndCreate("tstRTSystemQueryDmi", &hTest);
     if (rc)
         return rc;
@@ -56 +52 @@
     char szInfo[256];
 
-    rc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szInfo, sizeof(szInfo));
-    RTTestIPrintf(RTTESTLVL_ALWAYS, "PRODUCT: \"%s\", rc=%Rrc\n", szInfo, rc);
+    rc = RTSystemQueryDmiString(RTSYSDMISTR_PRODUCT_NAME, szInfo, sizeof(szInfo));
+    RTTestIPrintf(RTTESTLVL_ALWAYS, "PRODUCT_NAME: \"%s\", rc=%Rrc\n", szInfo, rc);
 
-    rc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szInfo, sizeof(szInfo));
-    RTTestIPrintf(RTTESTLVL_ALWAYS, "RELEASE: \"%s\", rc=%Rrc\n", szInfo, rc);
+    rc = RTSystemQueryDmiString(RTSYSDMISTR_PRODUCT_VERSION, szInfo, sizeof(szInfo));
+    RTTestIPrintf(RTTESTLVL_ALWAYS, "PRODUCT_VERSION: \"%s\", rc=%Rrc\n", szInfo, rc);
 
-    rc = RTSystemQueryOSInfo(RTSYSOSINFO_VERSION, szInfo, sizeof(szInfo));
-    RTTestIPrintf(RTTESTLVL_ALWAYS, "VERSION: \"%s\", rc=%Rrc\n", szInfo, rc);
+    rc = RTSystemQueryDmiString(RTSYSDMISTR_PRODUCT_UUID, szInfo, sizeof(szInfo));
+    RTTestIPrintf(RTTESTLVL_ALWAYS, "PRODUCT_UUID: \"%s\", rc=%Rrc\n", szInfo, rc);
 
-    rc = RTSystemQueryOSInfo(RTSYSOSINFO_SERVICE_PACK, szInfo, sizeof(szInfo));
-    RTTestIPrintf(RTTESTLVL_ALWAYS, "SERVICE_PACK: \"%s\", rc=%Rrc\n", szInfo, rc);
+    rc = RTSystemQueryDmiString(RTSYSDMISTR_PRODUCT_SERIAL, szInfo, sizeof(szInfo));
+    RTTestIPrintf(RTTESTLVL_ALWAYS, "PRODUCT_SERIAL: \"%s\", rc=%Rrc\n", szInfo, rc);
 
     /*
      * Check that unsupported stuff is terminated correctly.
      */
-    for (int i = RTSYSOSINFO_INVALID + 1; i < RTSYSOSINFO_END; i++)
+    for (int i = RTSYSDMISTR_INVALID + 1; i < RTSYSDMISTR_END; i++)
     {
         memset(szInfo, ' ', sizeof(szInfo));
-        rc = RTSystemQueryOSInfo((RTSYSOSINFO)i, szInfo, sizeof(szInfo));
+        rc = RTSystemQueryDmiString((RTSYSDMISTR)i, szInfo, sizeof(szInfo));
         if (    rc == VERR_NOT_SUPPORTED
             &&  szInfo[0] != '\0')
             RTTestIFailed("level=%d; unterminated buffer on VERR_NOT_SUPPORTED\n", i);
-        else if (RT_SUCCESS(rc) || rc == VERR_BUFFER_OVERFLOW)
+        else if (RT_SUCCESS(rc) || rc == VERR_BUFFER_OVERFLOW || rc == VERR_ACCESS_DENIED)
             RTTESTI_CHECK(memchr(szInfo, '\0', sizeof(szInfo)) != NULL);
         else if (rc != VERR_NOT_SUPPORTED)
@@ -87 +83 @@
      * Check buffer overflow
      */
-    for (int i = RTSYSOSINFO_INVALID + 1; i < RTSYSOSINFO_END; i++)
+    RTAssertSetQuiet(true);
+    RTAssertSetMayPanic(false);
+    for (int i = RTSYSDMISTR_INVALID + 1; i < RTSYSDMISTR_END; i++)
     {
         rc = VERR_BUFFER_OVERFLOW;
@@ -93 +91 @@
         {
             memset(szInfo, 0x7f, sizeof(szInfo));
-            rc = RTSystemQueryOSInfo((RTSYSOSINFO)i, szInfo, cch);
+            rc = RTSystemQueryDmiString((RTSYSDMISTR)i, szInfo, cch);
 
             /* check the padding. */
@@ -109 +107 @@
                 &&  cch > 0
                 &&  !memchr(szInfo, '\0', cch))
-            {
-
                 RTTestIFailed("level=%d, rc=%Rrc, cch=%zu: Buffer not terminated!\n", i, rc, cch);
-                g_cErrors++;
-            }
         }
     }