Changeset 29041 in vbox for trunk/src/VBox

Timestamp:

May 4, 2010 8:13:41 PM (15 years ago)

Author:

vboxsync

Message:

VBoxService/Control: Use critsects also, logging.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (19 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp

@@ -178 +178 @@
         if (RT_FAILURE(rc))
         {
-            VBoxServiceError("Control: Error while sending real-time output data, rc=%Rrc, cbRead=%u, CID=%u, PID=%u\n",
+            VBoxServiceError("ControlExec: Error while sending real-time output data, rc=%Rrc, cbRead=%u, CID=%u, PID=%u\n",
                              rc, cbRead, pThread->uClientID, pData->uPID);
         }
@@ -274 +274 @@
      * and that it's now OK to send input to the process.
      */
-    VBoxServiceVerbose(3, "Control: Process started: PID=%u, CID=%u, User=%s, PW=%s\n",
+    VBoxServiceVerbose(3, "ControlExec: Process started: PID=%u, CID=%u, User=%s, PW=%s\n",
                        pData->uPID, pThread->uContextID, pData->pszUser, pData->pszPassword);
     rc = VbglR3GuestCtrlExecReportStatus(pThread->uClientID, pThread->uContextID,
@@ -370 +370 @@
             if (cMsElapsed >= cMillies)
             {
-                VBoxServiceVerbose(3, "Control: Process timed out (%ums elapsed > %ums timeout), killing ...", cMsElapsed, cMillies);
+                VBoxServiceVerbose(3, "ControlExec: Process timed out (%ums elapsed > %ums timeout), killing ...", cMsElapsed, cMillies);
 
                 fProcessTimedOut = true;
@@ -435 +435 @@
         if (     fProcessTimedOut  && !fProcessAlive && MsProcessKilled != UINT64_MAX)
         {
+            VBoxServiceVerbose(3, "ControlExec: Process timed out and got killed\n");
             uStatus = PROC_STS_TOK;
         }
         else if (fProcessTimedOut  &&  fProcessAlive && MsProcessKilled != UINT64_MAX)
         {
+            VBoxServiceVerbose(3, "ControlExec: Process timed out and did *not* get killed\n");
             uStatus = PROC_STS_TOA;
         }
         else if (pThread->fShutdown && (fProcessAlive || MsProcessKilled != UINT64_MAX))
         {
+            VBoxServiceVerbose(3, "ControlExec: Process got terminated because system/service is going stopping\n");
             uStatus = PROC_STS_DWN; /* Service is stopping, process was killed. */
         }
         else if (fProcessAlive)
         {
-            VBoxServiceError("Control: Process is alive when it should not!\n");
+            VBoxServiceError("ControlExec: Process is alive when it should not!\n");
         }
         else if (MsProcessKilled != UINT64_MAX)
         {
-            VBoxServiceError("Control: Process has been killed when it should not!\n");
+            VBoxServiceError("ControlExec: Process has been killed when it should not!\n");
         }
         else if (ProcessStatus.enmReason == RTPROCEXITREASON_NORMAL)
         {
+            VBoxServiceVerbose(3, "ControlExec: Process ended with RTPROCEXITREASON_NORMAL\n");
+
             uStatus = PROC_STS_TEN;
             uFlags = ProcessStatus.iStatus;
@@ -460 +465 @@
         else if (ProcessStatus.enmReason == RTPROCEXITREASON_SIGNAL)
         {
+            VBoxServiceVerbose(3, "ControlExec: Process ended with RTPROCEXITREASON_SIGNAL\n");
+
             uStatus = PROC_STS_TES;
             uFlags = ProcessStatus.iStatus;
@@ -465 +472 @@
         else if (ProcessStatus.enmReason == RTPROCEXITREASON_ABEND)
         {
+            VBoxServiceVerbose(3, "ControlExec: Process ended with RTPROCEXITREASON_ABEND\n");
+
             uStatus = PROC_STS_TEA;
             uFlags = ProcessStatus.iStatus;
@@ -470 +479 @@
         else
         {
-            VBoxServiceError("Control: Process has reached an undefined status!\n");
-        }
-
-        VBoxServiceVerbose(3, "Control: Process ended: PID=%u, CID=%u, Status=%u, Flags=%u\n",
+            VBoxServiceError("ControlExec: Process has reached an undefined status!\n");
+        }
+
+        VBoxServiceVerbose(3, "ControlExec: Process ended: PID=%u, CID=%u, Status=%u, Flags=%u\n",
                            pData->uPID, pThread->uContextID, uStatus, uFlags);
         rc = VbglR3GuestCtrlExecReportStatus(pThread->uClientID, pThread->uContextID,
@@ -480 +489 @@
     }
     RTMemFree(StdInBuf.pch);
-    VBoxServiceVerbose(3, "Control: Process loop ended with rc=%Rrc\n", rc);
+    VBoxServiceVerbose(3, "ControlExec: Process loop ended with rc=%Rrc\n", rc);
     return rc;
 }
@@ -545 +554 @@
     pBuf->cbRead = 0;
 
-    return RTSemMutexCreate(&pBuf->mtx);
+    return RTCritSectInit(&pBuf->CritSect);
 }
 
@@ -559 +568 @@
         pBuf->cbRead = 0;
     }
-    return RTSemMutexDestroy(pBuf->mtx);
+    return RTCritSectDelete(&pBuf->CritSect);
 }
 
@@ -568 +577 @@
     AssertPtr(pcbToRead);
 
-    int rc = RTSemMutexRequest(pBuf->mtx, RT_INDEFINITE_WAIT);
+    int rc = RTCritSectEnter(&pBuf->CritSect);
     if (RT_SUCCESS(rc))
     {    
@@ -588 +597 @@
             *pcbToRead = 0;
         }
-        rc = RTSemMutexRelease(pBuf->mtx);
+        rc = RTCritSectLeave(&pBuf->CritSect);
     }
     return rc;
@@ -598 +607 @@
     AssertPtr(pBuf);
 
-    int rc = RTSemMutexRequest(pBuf->mtx, RT_INDEFINITE_WAIT);
+    int rc = RTCritSectEnter(&pBuf->CritSect);
     if (RT_SUCCESS(rc))
     {    
@@ -621 +630 @@
         else
             rc = VERR_NO_MEMORY;
-        int rc2 = RTSemMutexRelease(pBuf->mtx);
+        int rc2 = RTCritSectLeave(&pBuf->CritSect);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -759 +768 @@
      */
     RTThreadUserSignal(RTThreadSelf());
-    VBoxServiceVerbose(3, "Control: Thread of process \"%s\" started\n", pData->pszCmd);
+    VBoxServiceVerbose(3, "ControlExec: Thread of process \"%s\" started\n", pData->pszCmd);
 
     int rc = VbglR3GuestCtrlConnect(&pThread->uClientID);
     if (RT_FAILURE(rc))
     {
-        VBoxServiceError("Control: Thread failed to connect to the guest control service, aborted! Error: %Rrc\n", rc);
+        VBoxServiceError("ControlExec: Thread failed to connect to the guest control service, aborted! Error: %Rrc\n", rc);
         return rc;
     }
@@ -863 +872 @@
                                                                               NULL /* pvData */, 0 /* cbData */);
                                     if (RT_FAILURE(rc2))
-                                        VBoxServiceError("Control: Could not report process start error! Error: %Rrc (process error %Rrc)\n",
+                                        VBoxServiceError("ControlExec: Could not report process start error! Error: %Rrc (process error %Rrc)\n",
                                                          rc2, rc);
                                 }
@@ -882 +891 @@
 
     VbglR3GuestCtrlDisconnect(pThread->uClientID);
-    VBoxServiceVerbose(3, "Control: Thread of process \"%s\" (PID: %u) ended with rc=%Rrc\n",
+    VBoxServiceVerbose(3, "ControlExec: Thread of process \"%s\" (PID: %u) ended with rc=%Rrc\n",
                        pData->pszCmd, pData->uPID, rc);
     return rc;
@@ -920 +929 @@
             if (RT_FAILURE(rc))
             {
-                VBoxServiceError("Control: RTThreadCreate failed, rc=%Rrc\n, pThread=%p\n",
+                VBoxServiceError("ControlExec: RTThreadCreate failed, rc=%Rrc\n, pThread=%p\n",
                                  rc, pThread);
             }
@@ -929 +938 @@
                 if (pThread->fShutdown)
                 {
-                    VBoxServiceError("Control: Thread for process \"%s\" failed to start!\n", pszCmd);
+                    VBoxServiceError("ControlExec: Thread for process \"%s\" failed to start!\n", pszCmd);
                     rc = VERR_GENERAL_FAILURE;
                 }