Changeset 69011 in vbox for trunk/src/VBox/Runtime/common/err

Timestamp:

Oct 9, 2017 11:52:45 AM (7 years ago)

Author:

vboxsync

Message:

Added RTERRINFO_LOG_* macros for logging RTErrInfo setings to the right group.

File:

• trunk/src/VBox/Runtime/common/err/errinfolog.cpp (copied) (copied from trunk/src/VBox/Runtime/common/err/errinfo.cpp ) (8 diffs)

trunk/src/VBox/Runtime/common/err/errinfolog.cpp

@@ -34 +34 @@
 #include <iprt/assert.h>
 #include <iprt/string.h>
+#include <iprt/log.h>
 
 
-RTDECL(int) RTErrInfoSet(PRTERRINFO pErrInfo, int rc, const char *pszMsg)
+RTDECL(int) RTErrInfoLogAndSet(PRTERRINFO pErrInfo, int rc, uint32_t iLogGroup, uint32_t fFlags, const char *pszMsg)
 {
+    /* The logging: */
+    if (fFlags & RTERRINFO_LOG_F_RELEASE)
+    {
+        PRTLOGGER pLogger = RTLogRelGetDefaultInstanceEx(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
+        if (pLogger)
+            RTLogLoggerEx(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoSet(%Rrc): %s\n", rc, pszMsg);
+    }
+
+    PRTLOGGER pLogger = RTLogGetDefaultInstanceEx(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
+    if (pLogger)
+        RTLogLoggerEx(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoSet(%Rrc): %s\n", rc, pszMsg);
+
+    /* The setting: */
     if (pErrInfo)
     {
@@ -51 +65 @@
 
 
-RTDECL(int) RTErrInfoSetF(PRTERRINFO pErrInfo, int rc, const char *pszFormat, ...)
+RTDECL(int) RTErrInfoLogAndSetF(PRTERRINFO pErrInfo, int rc, uint32_t iLogGroup, uint32_t fFlags, const char *pszFormat, ...)
 {
     va_list va;
     va_start(va, pszFormat);
-    RTErrInfoSetV(pErrInfo, rc, pszFormat, va);
+    RTErrInfoLogAndSetV(pErrInfo, rc, iLogGroup, fFlags, pszFormat, va);
     va_end(va);
     return rc;
@@ -61 +75 @@
 
 
-RTDECL(int) RTErrInfoSetV(PRTERRINFO pErrInfo, int rc, const char *pszFormat, va_list va)
+RTDECL(int) RTErrInfoLogAndSetV(PRTERRINFO pErrInfo, int rc, uint32_t iLogGroup, uint32_t fFlags, const char *pszFormat, va_list va)
 {
+    /* The logging: */
+    if (fFlags & RTERRINFO_LOG_F_RELEASE)
+    {
+        PRTLOGGER pLogger = RTLogRelGetDefaultInstanceEx(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
+        if (pLogger)
+            RTLogLoggerEx(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoSet(%Rrc): %N\n", rc, pszFormat, &va);
+    }
+
+    PRTLOGGER pLogger = RTLogGetDefaultInstanceEx(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
+    if (pLogger)
+        RTLogLoggerEx(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoSet(%Rrc): %N\n", rc, pszFormat, &va);
+
+    /* The setting: */
     if (pErrInfo)
     {
@@ -76 +103 @@
 
 
-RTDECL(int) RTErrInfoAdd(PRTERRINFO pErrInfo, int rc, const char *pszMsg)
+RTDECL(int) RTErrInfoLogAndAdd(PRTERRINFO pErrInfo, int rc, uint32_t iLogGroup, uint32_t fFlags, const char *pszMsg)
 {
     if (pErrInfo)
@@ -90 +117 @@
         }
     }
+
+    /* The logging: */
+    if (fFlags & RTERRINFO_LOG_F_RELEASE)
+    {
+        PRTLOGGER pLogger = RTLogRelGetDefaultInstanceEx(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
+        if (pLogger)
+            RTLogLoggerEx(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoAdd(%Rrc): %s\n", rc, pszMsg);
+    }
+
+    PRTLOGGER pLogger = RTLogGetDefaultInstanceEx(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
+    if (pLogger)
+        RTLogLoggerEx(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoAdd(%Rrc): %s\n", rc, pszMsg);
+
     return rc;
 }
 
 
-RTDECL(int) RTErrInfoAddF(PRTERRINFO pErrInfo, int rc, const char *pszFormat, ...)
+RTDECL(int) RTErrInfoLogAndAddF(PRTERRINFO pErrInfo, int rc, uint32_t iLogGroup, uint32_t fFlags, const char *pszFormat, ...)
 {
     va_list va;
     va_start(va, pszFormat);
-    RTErrInfoAddV(pErrInfo, rc, pszFormat, va);
+    RTErrInfoLogAndAddV(pErrInfo, rc, iLogGroup, fFlags, pszFormat, va);
     va_end(va);
     return rc;
@@ -104 +144 @@
 
 
-RTDECL(int) RTErrInfoAddV(PRTERRINFO pErrInfo, int rc, const char *pszFormat, va_list va)
+RTDECL(int) RTErrInfoLogAndAddV(PRTERRINFO pErrInfo, int rc, uint32_t iLogGroup, uint32_t fFlags, const char *pszFormat, va_list va)
 {
     if (pErrInfo)
@@ -114 +154 @@
             char *pszOut = (char *)memchr(pErrInfo->pszMsg, '\0', pErrInfo->cbMsg - 2);
             if (pszOut)
-                RTStrPrintfV(pszOut, &pErrInfo->pszMsg[pErrInfo->cbMsg] - pszOut, pszFormat, va);
+            {
+                va_list va2;
+                va_copy(va2, va);
+                RTStrPrintfV(pszOut, &pErrInfo->pszMsg[pErrInfo->cbMsg] - pszOut, pszFormat, va2);
+                va_end(va2);
+            }
         }
         else
@@ -123 +168 @@
         }
     }
+
+    /* The logging: */
+    if (fFlags & RTERRINFO_LOG_F_RELEASE)
+    {
+        PRTLOGGER pLogger = RTLogRelGetDefaultInstanceEx(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
+        if (pLogger)
+            RTLogLoggerEx(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoAdd(%Rrc): %N\n", rc, pszFormat, &va);
+    }
+
+    PRTLOGGER pLogger = RTLogGetDefaultInstanceEx(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
+    if (pLogger)
+        RTLogLoggerEx(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoAdd(%Rrc): %N\n", rc, pszFormat, &va);
+
     return rc;
 }