Changeset 24830 in vbox for trunk/src/VBox/Main/xpcom

Timestamp:

Nov 20, 2009 3:05:10 PM (15 years ago)

Author:

vboxsync

Message:

xpcom/server.cpp: More cleanup.

File:

• trunk/src/VBox/Main/xpcom/server.cpp (modified) (20 diffs)

trunk/src/VBox/Main/xpcom/server.cpp

@@ -42 +42 @@
 #include <iprt/critsect.h>
 #include <iprt/getopt.h>
+#include <iprt/message.h>
+#include <iprt/stream.h>
 #include <iprt/path.h>
 #include <iprt/timer.h>
 
-#include <stdio.h>
 #include <signal.h>     // for the signal handler
 #include <stdlib.h>
@@ -285 +286 @@
 
         LogFlowFunc(("VirtualBox object deleted.\n"));
-        printf("Informational: VirtualBox object deleted.\n");
+        RTPrintf("Informational: VirtualBox object deleted.\n");
     }
 
@@ -505 +506 @@
                 sInstance->AddRef(); /* protect FinalConstruct() */
                 rv = sInstance->FinalConstruct();
-                printf("Informational: VirtualBox object created (rc=%08X).\n", rv);
+                RTPrintf("Informational: VirtualBox object created (rc=%Rhrc).\n", rv);
                 if (NS_FAILED(rv))
                 {
@@ -816 +817 @@
         if (pipe(daemon_pipe_fds) < 0)
         {
-            printf("ERROR: pipe() failed (errno = %d)\n", errno);
+            RTMsgError("pipe() failed (errno = %d)", errno);
             return 1;
         }
@@ -825 +826 @@
         if (childpid == -1)
         {
-            printf("ERROR: fork() failed (errno = %d)\n", errno);
+            RTMsgError("fork() failed (errno = %d)", errno);
             return 1;
         }
@@ -845 +846 @@
                     fSuccess = true;
                 else
-                    printf("ERROR: Unknown message from child process (%s)\n", msg);
+                    RTMsgError("Unknown message from child process (%s)", msg);
             }
             else
-                printf("ERROR: 0 bytes read from child process\n");
+                RTMsgError("0 bytes read from child process");
 
             /* close the reading end of the pipe as well and exit */
@@ -860 +861 @@
         if (sid < 0)
         {
-            printf("ERROR: setsid() failed (errno = %d)\n", errno);
+            RTMsgError("setsid() failed (errno = %d)", errno);
             return 1;
         }
@@ -870 +871 @@
         if (childpid == -1)
         {
-            printf("ERROR: second fork() failed (errno = %d)\n", errno);
+            RTMsgError("second fork() failed (errno = %d)", errno);
             return 1;
         }
@@ -945 +946 @@
         if (NS_FAILED(rc))
         {
-            printf("ERROR: Failed to initialize XPCOM! (rc=%08X)\n", rc);
+            RTMsgError("Failed to initialize XPCOM! (rc=%Rhrc)\n", rc);
             break;
         }
@@ -953 +954 @@
         if (NS_FAILED(rc))
         {
-            printf("ERROR: Failed to get component registrar! (rc=%08X)\n", rc);
+            RTMsgError("Failed to get component registrar! (rc=%Rhrc)", rc);
             break;
         }
@@ -962 +963 @@
         if (NS_FAILED(rc))
         {
-            printf("ERROR: Failed to register server components! (rc=%08X)\n", rc);
+            RTMsgError("Failed to register server components! (rc=%Rhrc)", rc);
             break;
         }
@@ -972 +973 @@
         if (NS_FAILED(rc))
         {
-            printf("ERROR: Failed to get the main event queue! (rc=%08X)\n", rc);
+            RTMsgError("Failed to get the main event queue! (rc=%Rhrc)", rc);
             break;
         }
@@ -979 +980 @@
         if (NS_FAILED (rc))
         {
-            printf("ERROR: Failed to get IPC service! (rc=%08X)\n", rc);
+            RTMsgError("Failed to get IPC service! (rc=%Rhrc)", rc);
             break;
         }
@@ -993 +994 @@
                          "Is another server already running?\n", rc, rc));
 
-            printf("ERROR: Failed to register the server name \"%s\" (rc=%08X)!\n"
-                   "Is another server already running?\n",
-                   VBOXSVC_IPC_NAME, rc);
+            RTMsgError("Failed to register the server name \"%s\" (rc=%Rhrc)!\n"
+                       "Is another server already running?\n",
+                       VBOXSVC_IPC_NAME, rc);
             NS_RELEASE(gIpcServ);
             break;
@@ -1021 +1022 @@
             for (int i = iSize; i > 0; i--)
                 putchar('*');
-            printf("\n%s\n", szBuf);
-            printf("(C) 2008-2009 Sun Microsystems, Inc.\n"
-                   "All rights reserved.\n");
+            RTPrintf("\n%s\n", szBuf);
+            RTPrintf("(C) 2008-2009 Sun Microsystems, Inc.\n"
+                     "All rights reserved.\n");
 #ifdef DEBUG
-            printf("Debug version.\n");
+            RTPrintf("Debug version.\n");
 #endif
         }
@@ -1031 +1032 @@
         if (daemon_pipe_wr >= 0)
         {
-            printf("\nStarting event loop....\n[send TERM signal to quit]\n");
+            RTPrintf("\nStarting event loop....\n[send TERM signal to quit]\n");
             /* now we're ready, signal the parent process */
             write(daemon_pipe_wr, "READY", strlen("READY"));
         }
         else
-            printf("\nStarting event loop....\n[press Ctrl-C to quit]\n");
+            RTPrintf("\nStarting event loop....\n[press Ctrl-C to quit]\n");
 
         if (g_pszPidFile)
         {
-            RTFILE pidFile = NIL_RTFILE;
-            vrc = RTFileOpen(&pidFile, g_pszPidFile, RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_NONE);
+            RTFILE hPidFile = NIL_RTFILE;
+            vrc = RTFileOpen(&hPidFile, g_pszPidFile, RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_NONE);
             if (RT_SUCCESS(vrc))
             {
@@ -1047 +1048 @@
                 const char *lf = "\n";
                 RTStrFormatNumber(szBuf, getpid(), 10, 0, 0, 0);
-                RTFileWrite(pidFile, szBuf, strlen(szBuf), NULL);
-                RTFileWrite(pidFile, lf, strlen(lf), NULL);
-                RTFileClose(pidFile);
+                RTFileWrite(hPidFile, szBuf, strlen(szBuf), NULL);
+                RTFileWrite(hPidFile, lf, strlen(lf), NULL);
+                RTFileClose(hPidFile);
             }
         }
@@ -1062 +1063 @@
                 lim.rlim_cur = RT_MIN(lim.rlim_max, 10240);
                 if (setrlimit(RLIMIT_NOFILE, &lim) == -1)
-                    printf("WARNING: failed to increase file descriptor limit. (%d)\n", errno);
+                    RTPrintf("WARNING: failed to increase file descriptor limit. (%d)\n", errno);
             }
         }
         else
-            printf("WARNING: failed to obtain per-process file-descriptor limit (%d).\n", errno);
+            RTPrintf("WARNING: failed to obtain per-process file-descriptor limit (%d).\n", errno);
 
         PLEvent *ev;
@@ -1091 +1092 @@
         gEventQ->ProcessPendingEvents();
 
-        printf("Terminated event loop.\n");
+        RTPrintf("Terminated event loop.\n");
     }
     while (0); // this scopes the nsCOMPtrs
@@ -1104 +1105 @@
     LogFlowFunc(("Finished com::Shutdown() (rc=%Rhrc)\n", rc));
 
-    if (NS_FAILED (rc))
-        printf("ERROR: Failed to shutdown XPCOM! (rc=%08X)\n", rc);
-
-    printf("XPCOM server has shutdown.\n");
+    if (NS_FAILED(rc))
+        RTMsgError("Failed to shutdown XPCOM! (rc=%Rhrc)", rc);
+
+    RTPrintf("XPCOM server has shutdown.\n");
 
     if (g_pszPidFile)