Changeset 81040 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp

Timestamp:

Sep 27, 2019 9:45:46 AM (6 years ago)

Author:

vboxsync

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

133643

Message:

Additions/VBoxClient: Revamped and unified local logging infrastructure; cleaned up a lot of different logging styles / ways. Fixed logging memory leaks.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp (modified) (25 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp

@@ -46 +46 @@
                                     const char *aPropName, unsigned long *nItems)
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     Atom propNameAtom = XInternAtom (aDpy, aPropName,
                                      True /* only_if_exists */);
@@ -65 +65 @@
         return NULL;
 
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
     return propVal;
 }
@@ -79 +79 @@
     int rc = VINF_SUCCESS;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     if (mHostCallback != NULL)  /* Assertion */
     {
-        LogRel(("VBoxClient: ERROR: attempt to initialise seamless guest object twice!\n"));
+        VBClLogError("Attempting to initialise seamless guest object twice!\n");
         return VERR_INTERNAL_ERROR;
     }
     if (!(mDisplay = XOpenDisplay(NULL)))
     {
-        LogRel(("VBoxClient: seamless guest object failed to acquire a connection to the display.\n"));
+        VBClLogError("Seamless guest object failed to acquire a connection to the display\n");
         return VERR_ACCESS_DENIED;
     }
@@ -93 +93 @@
     mEnabled = false;
     unmonitorClientList();
-    LogRelFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -111 +111 @@
     int error, event;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     if (mEnabled)
         return VINF_SUCCESS;
@@ -118 +118 @@
     monitorClientList();
     rebuildWindowTree();
-    LogRelFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -126 +126 @@
 void SeamlessX11::stop(void)
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     if (!mEnabled)
         return;
@@ -132 +132 @@
     unmonitorClientList();
     freeWindowTree();
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
 }
 
 void SeamlessX11::monitorClientList(void)
 {
-    LogRelFlowFunc(("called\n"));
+    LogRelFlowFuncEnter();
     XSelectInput(mDisplay, DefaultRootWindow(mDisplay), PropertyChangeMask | SubstructureNotifyMask);
 }
@@ -143 +143 @@
 void SeamlessX11::unmonitorClientList(void)
 {
-    LogRelFlowFunc(("called\n"));
+    LogRelFlowFuncEnter();
     XSelectInput(mDisplay, DefaultRootWindow(mDisplay), PropertyChangeMask);
 }
@@ -153 +153 @@
 void SeamlessX11::rebuildWindowTree(void)
 {
-    LogRelFlowFunc(("called\n"));
+    LogRelFlowFuncEnter();
     freeWindowTree();
     addClients(DefaultRootWindow(mDisplay));
@@ -177 +177 @@
     unsigned cChildren;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     if (!XQueryTree(mDisplay, hRoot, &hRealRoot, &hParent, &phChildrenRaw, &cChildren))
         return;
@@ -184 +184 @@
         addClientWindow(phChildren[i]);
     XFree(phChildrenRaw);
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
 }
 
@@ -190 +190 @@
 void SeamlessX11::addClientWindow(const Window hWin)
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     XWindowAttributes winAttrib;
     bool fAddWin = true;
@@ -199 +199 @@
     if (fAddWin && !XGetWindowAttributes(mDisplay, hWin, &winAttrib))
     {
-        LogRelFunc(("VBoxClient: Failed to get the window attributes for window %d\n", hWin));
+        VBClLogError("Failed to get the window attributes for window %d\n", hWin);
         fAddWin = false;
     }
@@ -211 +211 @@
                                        &dummyLong)))
     {
-        LogRelFlowFunc(("window %lu, client window %lu has no size hints\n",
-                     hWin, hClient));
+        LogRelFlowFunc(("window %lu, client window %lu has no size hints\n", hWin, hClient));
         fAddWin = false;
     }
@@ -244 +243 @@
                                 pRects);
     }
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
 }
 
@@ -260 +259 @@
     bool rc = false;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     windowTypeRaw = XXGetProperty(mDisplay, hWin, XA_ATOM, WM_TYPE_PROP, &ulCount);
     if (windowTypeRaw != NULL)
@@ -290 +289 @@
 {
     /* We use post-increment in the operation to prevent the iterator from being invalidated. */
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     mGuestWindows.detachAll(VBoxGuestWinFree, mDisplay);
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
 }
 
@@ -305 +304 @@
     XEvent event;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     /* Start by sending information about the current window setup to the host.  We do this
        here because we want to send all such information from a single thread. */
@@ -341 +340 @@
             || event.xproperty.window != DefaultRootWindow(mDisplay))
             break;
-        LogRelFlowFunc(("_NET_CLIENT_LIST property event on root window.\n"));
+        LogRelFlowFunc(("_NET_CLIENT_LIST property event on root window\n"));
         rebuildWindowTree();
         break;
@@ -392 +391 @@
 void SeamlessX11::doShapeEvent(Window hWin)
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     VBoxGuestWinInfo *pInfo = mGuestWindows.find(hWin);
     if (pInfo)
@@ -410 +409 @@
         mChanged = true;
     }
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
 }
 
@@ -477 +476 @@
 int SeamlessX11::updateRects(void)
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     struct RectList rects = RTVEC_INITIALIZER;
 
@@ -492 +491 @@
     mcRects = RectListSize(&rects);
     mpRects = RectListDetach(&rects);
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
     return VINF_SUCCESS;
 }
@@ -506 +505 @@
     Display *pDisplay = XOpenDisplay(NULL);
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     if (pDisplay == NULL)
-        VBClFatalError(("Failed to open X11 display.\n"));
+        VBClLogFatalError("Failed to open X11 display\n");
     /* Message contents set to zero. */
     XClientMessageEvent clientMessage = { ClientMessage, 0, 0, 0, 0, 0, 8 };