Changeset 99616 in vbox

Timestamp:

May 5, 2023 8:48:06 AM (19 months ago)

Author:

vboxsync

Message:

Guest / Host: Added VBGHLogVerbosity[Get|Set](), removed external (global) as a requirement. bugref:10427

Location:

trunk

Files:

• include/VBox/GuestHost/Log.h (modified) (1 diff)
• src/VBox/Additions/x11/VBoxClient/main.cpp (modified) (1 diff)
• src/VBox/GuestHost/Log.cpp (modified) (7 diffs)

trunk/include/VBox/GuestHost/Log.h

@@ -53 +53 @@
 void VBGHLogVerbose(unsigned iLevel, const char *pszFormat, ...);
 void VBGHLogVerboseV(unsigned iLevel, const char *pszFormat, va_list va);
+void VBGHLogVerbositySet(unsigned iLevel);
+unsigned VBGHLogVerbosityGet(void);
 
 #endif /* !VBOX_INCLUDED_GuestHost_Log_h */

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -738 +738 @@
                 RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity);
 
+    VBGHLogVerbositySet(g_cVerbosity);
+
     /* Try to detect the current session type early on, if needed. */
     if (g_enmSessionType == VBGHSESSIONTYPE_AUTO)

trunk/src/VBox/GuestHost/Log.cpp

@@ -37 +37 @@
 
 /*********************************************************************************************************************************
-*   Externals                                                                                                                    *
+*   Globals                                                                                                                      *
 *********************************************************************************************************************************/
-extern unsigned g_cVerbosity; /* Current verbosity level; must be provided by the implementation using this code. */
+static unsigned g_vbghLogVerbosity = 0; /* Current guest/host log verbosity level. */
 
 
@@ -130 +130 @@
  * Logs an error message with a va_list.
  *
- * @param   pszFormat   Format string..
- * @param   va          Format arguments.
+ * @param   pszFormat           Format string..
+ * @param   va                  Format arguments.
  */
 void VBGHLogErrorV(const char *pszFormat, va_list va)
@@ -141 +141 @@
  * Logs an error message to the (release) logging instance.
  *
- * @param   pszFormat               Format string to log.
+ * @param   pszFormat           Format string to log.
  */
 void VBGHLogError(const char *pszFormat, ...)
@@ -151 +151 @@
  * Logs a info message with a va_list.
  *
- * @param   pszFormat   Format string..
- * @param   va          Format arguments.
+ * @param   pszFormat           Format string..
+ * @param   va                  Format arguments.
  */
 void VBGHLogInfoV(const char *pszFormat, va_list va)
@@ -172 +172 @@
  * Logs a fatal error, notifies the desktop environment via a message (if available).
  *
- * @param   pszFormat   Format string..
- * @param   va          Format arguments.
+ * @param   pszFormat           Format string..
+ * @param   va                  Format arguments.
  */
 void VBGHLogFatalErrorV(const char *pszFormat, va_list va)
@@ -197 +197 @@
  * set global verbosity level.
  *
- * @param   iLevel      Minimum log level required to display this message.
- * @param   pszFormat   Format string.
- * @param   ...         Format arguments.
+ * @param   iLevel              Minimum log level required to display this message.
+ * @param   pszFormat           Format string.
+ * @param   ...                 Format arguments.
  */
 void VBGHLogVerbose(unsigned iLevel, const char *pszFormat, ...)
 {
-    if (iLevel <= g_cVerbosity)
+    if (iLevel <= g_vbghLogVerbosity)
         VBGH_LOG_VA("", pszFormat);
 }
@@ -211 +211 @@
  * set global verbosity level with a va_list.
  *
- * @param   iLevel      Minimum log level required to display this message.
- * @param   pszFormat   Format string.
- * @param   va          Format arguments.
+ * @param   iLevel              Minimum log level required to display this message.
+ * @param   pszFormat           Format string.
+ * @param   va                  Format arguments.
  */
 void VBGHLogVerboseV(unsigned iLevel, const char *pszFormat, va_list va)
 {
-    if (iLevel <= g_cVerbosity)
+    if (iLevel <= g_vbghLogVerbosity)
         VBGH_LOG_VALIST("", pszFormat, va);
 }
 
+/**
+ * Sets the verbosity level.
+ * @param   iLevel              Verbosity level to set.
+ *
+ * @note Not thread safe.
+ */
+void VBGHLogVerbositySet(unsigned iLevel)
+{
+    g_vbghLogVerbosity = iLevel;
+}
+
+/**
+ * Gets the current verbosity level.
+ *
+ * @returns The current verbosity level.
+ *
+ * @note Not thread safe.
+ */
+unsigned VBGHLogVerbosityGet(void)
+{
+    return g_vbghLogVerbosity;
+}
+