Changeset 57765 in vbox for trunk/src

Timestamp:

Sep 15, 2015 3:15:27 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Main.cpp cleanup/rework bit-by-bit (step 7).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/main.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -132 +132 @@
 
 
-#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
-/** X11, Linux, Debug: The signal handler that prints out a backtrace of the call stack.
-  * @remarks The code is taken from http://www.linuxjournal.com/article/6391. */
-static void BackTraceSignalHandler(int sig, siginfo_t *pInfo, void *pSecret)
-{
-    void *trace[16];
-    char **messages = (char **)0;
-    int i, iTraceSize = 0;
-    ucontext_t *uc = (ucontext_t *)pSecret;
-
-    /* Do something useful with siginfo_t: */
-    if (sig == SIGSEGV)
-        Log(("GUI: Got signal %d, faulty address is %p, from %p\n",
-             sig, pInfo->si_addr, uc->uc_mcontext.gregs[REG_PC]));
-    /* Or do nothing by default: */
-    else
-        Log(("GUI: Got signal %d\n", sig));
-
-    /* Acquire backtrace of 16 lvls depth: */
-    iTraceSize = backtrace(trace, 16);
-
-    /* Overwrite sigaction with caller's address: */
-    trace[1] = (void *)uc->uc_mcontext.gregs[REG_PC];
-
-    /* Translate the addresses into an array of messages: */
-    messages = backtrace_symbols(trace, iTraceSize);
-
-    /* Skip first stack frame (points here): */
-    Log(("GUI: [bt] Execution path:\n"));
-    for (i = 1; i < iTraceSize; ++i)
-        Log(("GUI: [bt] %s\n", messages[i]));
-
-    exit(0);
-}
-
-/** X11, Linux, Debug: Installs signal handler printing backtrace of the call stack. */
-static void InstallSignalHandler()
-{
-    struct sigaction sa;
-    sa.sa_sigaction = BackTraceSignalHandler;
-    sigemptyset(&sa.sa_mask);
-    sa.sa_flags = SA_RESTART | SA_SIGINFO;
-    sigaction(SIGSEGV, &sa, 0);
-    sigaction(SIGBUS,  &sa, 0);
-    sigaction(SIGUSR1, &sa, 0);
-}
-#endif /* DEBUG && Q_WS_X11 && RT_OS_LINUX */
-
 #ifdef Q_WS_MAC
 /** Mac OS X: Really ugly hack to prevent silly check in AppKit. */
@@ -197 +149 @@
 }
 #endif /* Q_WS_MAC */
+
+#ifdef Q_WS_X11
+/** X11: For versions of Xlib which are aware of multi-threaded environments this function
+  *      calls for XInitThreads() which initializes Xlib support for concurrent threads.
+  * @returns @c non-zero unless it is unsafe to make multi-threaded calls to Xlib.
+  * @remarks This is a workaround for a bug on old Xlib versions, fixed in commit
+  *          941f02e and released in Xlib version 1.1. We check for the symbol
+  *          "xcb_connect" which was introduced in that version. */
+static Status MakeSureMultiThreadingIsSafe()
+{
+    /* Success by default: */
+    Status rc = 1;
+    /* Get a global handle to process symbols: */
+    void *pvProcess = dlopen(0, RTLD_GLOBAL | RTLD_LAZY);
+    /* Initialize multi-thread environment only if we can obtain
+     * an address of xcb_connect symbol in this process: */
+    if (pvProcess && dlsym(pvProcess, "xcb_connect"))
+        rc = XInitThreads();
+    /* Close the handle: */
+    if (pvProcess)
+        dlclose(pvProcess);
+    /* Return result: */
+    return rc;
+}
+
+# if defined(RT_OS_LINUX) && defined(DEBUG)
+/** X11, Linux, Debug: The signal handler that prints out a backtrace of the call stack.
+  * @remarks The code is taken from http://www.linuxjournal.com/article/6391. */
+static void BackTraceSignalHandler(int sig, siginfo_t *pInfo, void *pSecret)
+{
+    void *trace[16];
+    char **messages = (char **)0;
+    int i, iTraceSize = 0;
+    ucontext_t *uc = (ucontext_t *)pSecret;
+
+    /* Do something useful with siginfo_t: */
+    if (sig == SIGSEGV)
+        Log(("GUI: Got signal %d, faulty address is %p, from %p\n",
+             sig, pInfo->si_addr, uc->uc_mcontext.gregs[REG_PC]));
+    /* Or do nothing by default: */
+    else
+        Log(("GUI: Got signal %d\n", sig));
+
+    /* Acquire backtrace of 16 lvls depth: */
+    iTraceSize = backtrace(trace, 16);
+
+    /* Overwrite sigaction with caller's address: */
+    trace[1] = (void *)uc->uc_mcontext.gregs[REG_PC];
+
+    /* Translate the addresses into an array of messages: */
+    messages = backtrace_symbols(trace, iTraceSize);
+
+    /* Skip first stack frame (points here): */
+    Log(("GUI: [bt] Execution path:\n"));
+    for (i = 1; i < iTraceSize; ++i)
+        Log(("GUI: [bt] %s\n", messages[i]));
+
+    exit(0);
+}
+
+/** X11, Linux, Debug: Installs signal handler printing backtrace of the call stack. */
+static void InstallSignalHandler()
+{
+    struct sigaction sa;
+    sa.sa_sigaction = BackTraceSignalHandler;
+    sigemptyset(&sa.sa_mask);
+    sa.sa_flags = SA_RESTART | SA_SIGINFO;
+    sigaction(SIGSEGV, &sa, 0);
+    sigaction(SIGBUS,  &sa, 0);
+    sigaction(SIGUSR1, &sa, 0);
+}
+# endif /* RT_OS_LINUX && DEBUG */
+#endif /* Q_WS_X11 */
 
 /** Qt message handler, function that prints out
@@ -291 +316 @@
 }
 
-#ifdef Q_WS_X11
-/** X11: For versions of Xlib which are aware of multi-threaded environments this function
-  *      calls for XInitThreads() which initializes Xlib support for concurrent threads.
-  * @returns @c non-zero unless it is unsafe to make multi-threaded calls to Xlib.
-  * @remarks This is a workaround for a bug on old Xlib versions, fixed in commit
-  *          941f02e and released in Xlib version 1.1. We check for the symbol
-  *          "xcb_connect" which was introduced in that version. */
-static Status MakeSureMultiThreadingIsSafe()
-{
-    /* Success by default: */
-    Status rc = 1;
-    /* Get a global handle to process symbols: */
-    void *pvProcess = dlopen(0, RTLD_GLOBAL | RTLD_LAZY);
-    /* Initialize multi-thread environment only if we can obtain
-     * an address of xcb_connect symbol in this process: */
-    if (pvProcess && dlsym(pvProcess, "xcb_connect"))
-        rc = XInitThreads();
-    /* Close the handle: */
-    if (pvProcess)
-        dlclose(pvProcess);
-    /* Return result: */
-    return rc;
-}
-#endif /* Q_WS_X11 */
-
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char ** /*envp*/)
 {