Changeset 71263 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Mar 7, 2018 5:43:44 PM (7 years ago)

Author:

vboxsync

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

121189

Message:

Guest Control: Renamed GUESTPROCESSTOOL_FLAG_ -> GUESTPROCESSTOOL_WAIT_FLAG_ to emphasize its usage.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDirectoryImpl.cpp (modified) (1 diff)
• GuestProcessImpl.cpp (modified) (7 diffs)
• GuestSessionImplTasks.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp

@@ -283 +283 @@
 
     GuestProcessStreamBlock curBlock;
-    int rc = mData.mProcessTool.i_waitEx(GUESTPROCESSTOOL_FLAG_STDOUT_BLOCK,
+    int rc = mData.mProcessTool.i_waitEx(GUESTPROCESSTOOL_WAIT_FLAG_STDOUT_BLOCK,
                                          &curBlock, pGuestRc);
     if (RT_SUCCESS(rc))

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -2170 +2170 @@
                 GuestProcessStreamBlock strmBlk;
                 vrc = procTool.i_waitEx(  paStrmOutObjects
-                                        ? GUESTPROCESSTOOL_FLAG_STDOUT_BLOCK
-                                        : GUESTPROCESSTOOL_FLAG_NONE, &strmBlk, &errorInfo.guestRc);
+                                        ? GUESTPROCESSTOOL_WAIT_FLAG_STDOUT_BLOCK
+                                        : GUESTPROCESSTOOL_WAIT_FLAG_NONE, &strmBlk, &errorInfo.guestRc);
                 if (paStrmOutObjects)
                     paStrmOutObjects->push_back(strmBlk);
@@ -2185 +2185 @@
     {
         /* Make sure the process runs until completion. */
-        vrc = procTool.i_wait(GUESTPROCESSTOOL_FLAG_NONE, &errorInfo.guestRc);
+        vrc = procTool.i_wait(GUESTPROCESSTOOL_WAIT_FLAG_NONE, &errorInfo.guestRc);
         if (RT_SUCCESS(vrc))
             errorInfo.guestRc = procTool.i_terminatedOk(&errorInfo.iExitCode);
@@ -2227 +2227 @@
 }
 
-int GuestProcessTool::i_wait(uint32_t fFlags, int *pGuestRc)
-{
-    return i_waitEx(fFlags, NULL /* pStrmBlkOut */, pGuestRc);
-}
-
-int GuestProcessTool::i_waitEx(uint32_t fFlags, GuestProcessStreamBlock *pStrmBlkOut, int *pGuestRc)
-{
-    LogFlowThisFunc(("fFlags=0x%x, pStreamBlock=%p, pGuestRc=%p\n", fFlags, pStrmBlkOut, pGuestRc));
+int GuestProcessTool::i_wait(uint32_t fToolWaitFlags, int *pGuestRc)
+{
+    return i_waitEx(fToolWaitFlags, NULL /* pStrmBlkOut */, pGuestRc);
+}
+
+int GuestProcessTool::i_waitEx(uint32_t fToolWaitFlags, GuestProcessStreamBlock *pStrmBlkOut, int *pGuestRc)
+{
+    LogFlowThisFunc(("fToolWaitFlags=0x%x, pStreamBlock=%p, pGuestRc=%p\n", fToolWaitFlags, pStrmBlkOut, pGuestRc));
 
     /* Can we parse the next block without waiting? */
     int vrc;
-    if (fFlags & GUESTPROCESSTOOL_FLAG_STDOUT_BLOCK)
+    if (fToolWaitFlags & GUESTPROCESSTOOL_WAIT_FLAG_STDOUT_BLOCK)
     {
         AssertPtr(pStrmBlkOut);
@@ -2248 +2248 @@
 
     /* Do the waiting. */
-    uint32_t fWaitFlags = ProcessWaitForFlag_Terminate;
+    uint32_t fProcWaitForFlags = ProcessWaitForFlag_Terminate;
     if (mStartupInfo.mFlags & ProcessCreateFlag_WaitForStdOut)
-        fWaitFlags |= ProcessWaitForFlag_StdOut;
+        fProcWaitForFlags |= ProcessWaitForFlag_StdOut;
     if (mStartupInfo.mFlags & ProcessCreateFlag_WaitForStdErr)
-        fWaitFlags |= ProcessWaitForFlag_StdErr;
+        fProcWaitForFlags |= ProcessWaitForFlag_StdErr;
 
     /** @todo Decrease timeout while running. */
@@ -2293 +2293 @@
         UPDATE_AND_CHECK_ELAPSED_TIME();
 
-        vrc = pProcess->i_waitFor(fWaitFlags, GET_REMAINING_TIME,
-                                  waitRes, &vrcGuest);
+        vrc = pProcess->i_waitFor(fProcWaitForFlags, GET_REMAINING_TIME, waitRes, &vrcGuest);
         if (RT_FAILURE(vrc))
             break;
@@ -2313 +2312 @@
 
             case ProcessWaitResult_WaitFlagNotSupported:
-                if (fWaitFlags & ProcessWaitForFlag_StdOut)
+                if (fProcWaitForFlags & ProcessWaitForFlag_StdOut)
                     fHandleStdOut = true;
-                if (fWaitFlags & ProcessWaitForFlag_StdErr)
+                if (fProcWaitForFlags & ProcessWaitForFlag_StdErr)
                     fHandleStdErr = true;
                 /* Since waiting for stdout / stderr is not supported by the guest,
@@ -2366 +2365 @@
 
                 if (   RT_SUCCESS(vrc)
-                    && (fFlags & GUESTPROCESSTOOL_FLAG_STDOUT_BLOCK))
+                    && (fToolWaitFlags & GUESTPROCESSTOOL_WAIT_FLAG_STDOUT_BLOCK))
                 {
                     AssertPtr(pStrmBlkOut);

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -1718 +1718 @@
     {
         if (RT_SUCCESS(rcGuest))
-            vrc = procTool.i_wait(GUESTPROCESSTOOL_FLAG_NONE, &rcGuest);
+            vrc = procTool.i_wait(GUESTPROCESSTOOL_WAIT_FLAG_NONE, &rcGuest);
         if (RT_SUCCESS(vrc))
             vrc = procTool.i_terminatedOk();