Changeset 31597 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 12, 2010 12:49:46 PM (14 years ago)

Author:

vboxsync

Message:

vboxweb.cpp: error handling and message cleanup.

File:

• trunk/src/VBox/Main/webservice/vboxweb.cpp (modified) (10 diffs)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -29 +29 @@
 
 #include <iprt/buildconfig.h>
+#include <iprt/ctype.h>
+#include <iprt/getopt.h>
+#include <iprt/initterm.h>
+#include <iprt/ldr.h>
+#include <iprt/message.h>
+#include <iprt/process.h>
+#include <iprt/rand.h>
+#include <iprt/semaphore.h>
+#include <iprt/string.h>
 #include <iprt/thread.h>
-#include <iprt/rand.h>
-#include <iprt/initterm.h>
-#include <iprt/getopt.h>
-#include <iprt/ctype.h>
-#include <iprt/process.h>
-#include <iprt/string.h>
-#include <iprt/ldr.h>
-#include <iprt/semaphore.h>
 #include <iprt/time.h>
 
@@ -104 +105 @@
 
 bool                    g_fVerbose = false;             // be verbose
-PRTSTREAM               g_pstrLog = NULL;
+PRTSTREAM               g_pStrmLog = NULL;
 
 #if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
@@ -265 +266 @@
         m_soap->max_keep_alive = g_cMaxKeepAlive;
 
-        if (!RT_SUCCESS(RTThreadCreate(&m_pThread,
-                                       fntWrapper,
-                                       this,             // pvUser
-                                       0,               // cbStack,
-                                       RTTHREADTYPE_MAIN_HEAVY_WORKER,
-                                       0,
-                                       m_strThread.c_str())))
+        int rc = RTThreadCreate(&m_pThread,
+                                fntWrapper,
+                                this,             // pvUser
+                                0,               // cbStack,
+                                RTTHREADTYPE_MAIN_HEAVY_WORKER,
+                                0,
+                                m_strThread.c_str());
+        if (RT_FAILURE(rc))
         {
-            RTStrmPrintf(g_pStdErr, "[!] Cannot start worker thread %d\n", u);
+            RTMsgError("Cannot start worker thread %d: %Rrc\n", u, rc);
             exit(1);
         }
@@ -503 +505 @@
 
     // log file
-    if (g_pstrLog)
-    {
-        RTStrmPrintf(g_pstrLog, "%s %s", strPrefix.c_str(), psz);
-        RTStrmFlush(g_pstrLog);
+    if (g_pStrmLog)
+    {
+        RTStrmPrintf(g_pStrmLog, "%s %s", strPrefix.c_str(), psz);
+        RTStrmFlush(g_pStrmLog);
     }
 
@@ -619 +621 @@
 int main(int argc, char* argv[])
 {
-    int rc;
-
     // intialize runtime
-    RTR3Init();
+    int rc = RTR3Init();
+    if (RT_FAILURE(rc))
+        return RTMsgInitFailure(rc);
 
     // store a log prefix for this thread
@@ -657 +659 @@
             case 'F':
             {
-                int rc2 = RTStrmOpen(ValueUnion.psz, "a", &g_pstrLog);
+                int rc2 = RTStrmOpen(ValueUnion.psz, "a", &g_pStrmLog);
                 if (rc2)
-                {
-                    RTPrintf("Error: Cannot open log file \"%s\" for writing, error %d.\n", ValueUnion.psz, rc2);
-                    exit(2);
-                }
+                    return RTMsgErrorExit(RTEXITCODE_FAILURE, "Cannot open log file \"%s\" for writing: %Rrc", ValueUnion.psz, rc2);
 
                 WebLog("Sun VirtualBox Webservice Version %s\n"
@@ -705 +704 @@
         rc = RTProcDaemonizeUsingFork(false /* fNoChDir */, false /* fNoClose */, NULL);
         if (RT_FAILURE(rc))
-        {
-            RTStrmPrintf(g_pStdErr, "vboxwebsrv: failed to daemonize, rc=%Rrc. exiting.\n", rc);
-            exit(1);
-        }
+            return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to daemonize, rc=%Rrc. exiting.", rc);
     }
 #endif
 
     // intialize COM/XPCOM
-    rc = com::Initialize();
-    if (FAILED(rc))
-    {
-        RTPrintf("ERROR: failed to initialize COM!\n");
-        return rc;
-    }
+    HRESULT hrc = com::Initialize();
+    if (FAILED(hrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to initialize COM! hrc=%Rhrc\n", hrc);
 
     ComPtr<ISession> session;
 
-    rc = g_pVirtualBox.createLocalObject(CLSID_VirtualBox);
-    if (FAILED(rc))
-        RTPrintf("ERROR: failed to create the VirtualBox object!\n");
+    hrc = g_pVirtualBox.createLocalObject(CLSID_VirtualBox);
+    if (FAILED(hrc))
+        RTMsgError("failed to create the VirtualBox object!");
     else
     {
-        rc = session.createInprocObject(CLSID_Session);
-        if (FAILED(rc))
-            RTPrintf("ERROR: failed to create a session object!\n");
-    }
-
-    if (FAILED(rc))
+        hrc = session.createInprocObject(CLSID_Session);
+        if (FAILED(hrc))
+            RTMsgError("failed to create a session object!");
+    }
+
+    if (FAILED(hrc))
     {
         com::ErrorInfo info;
         if (!info.isFullAvailable() && !info.isBasicAvailable())
         {
-            com::GluePrintRCMessage(rc);
-            RTPrintf("Most likely, the VirtualBox COM server is not running or failed to start.\n");
+            com::GluePrintRCMessage(hrc);
+            RTMsgError("Most likely, the VirtualBox COM server is not running or failed to start.");
         }
         else
             com::GluePrintErrorInfo(info);
-        return rc;
+        return RTEXITCODE_FAILURE;
     }
 
@@ -752 +745 @@
 
     // SOAP queue pumper thread
-    RTTHREAD  tQPumper;
-    if (RTThreadCreate(&tQPumper,
-                       fntQPumper,
-                       NULL,        // pvUser
-                       0,           // cbStack (default)
-                       RTTHREADTYPE_MAIN_WORKER,
-                       0,           // flags
-                       "SoapQPumper"))
-    {
-        RTStrmPrintf(g_pStdErr, "[!] Cannot start SOAP queue pumper thread\n");
-        exit(1);
-    }
+    rc = RTThreadCreate(NULL,
+                        fntQPumper,
+                        NULL,        // pvUser
+                        0,           // cbStack (default)
+                        RTTHREADTYPE_MAIN_WORKER,
+                        0,           // flags
+                        "SoapQPumper");
+    if (RT_FAILURE(rc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Cannot start SOAP queue pumper thread: %Rrc", rc);
 
     // watchdog thread
@@ -769 +759 @@
     {
         // start our watchdog thread
-        RTTHREAD  tWatchdog;
-        if (RTThreadCreate(&tWatchdog,
-                           fntWatchdog,
-                           NULL,
-                           0,
-                           RTTHREADTYPE_MAIN_WORKER,
-                           0,
-                           "Watchdog"))
-        {
-            RTStrmPrintf(g_pStdErr, "[!] Cannot start watchdog thread\n");
-            exit(1);
-        }
+        rc = RTThreadCreate(NULL,
+                            fntWatchdog,
+                            NULL,
+                            0,
+                            RTTHREADTYPE_MAIN_WORKER,
+                            0,
+                            "Watchdog");
+        if (RT_FAILURE(rc))
+            return RTMsgErrorExit(RTEXITCODE_FAILURE, "Cannot start watchdog thread: %Rrc", rc);
     }
 
@@ -790 +777 @@
         int vrc = pQ->processEventQueue(RT_INDEFINITE_WAIT);
         if (RT_FAILURE(vrc) && vrc != VERR_TIMEOUT)
-            com::GluePrintRCMessage(vrc);
+            RTMsgError("processEventQueue -> %Rrc", rc);
     }