Changeset 29438 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

May 12, 2010 9:50:16 PM (15 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: Added support for cancel pending (blocking) calls; added support for properly stopping + shutting down main thread.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -318 +318 @@
                         if (verbose)
                             RTPrintf("No time left to wait for process!\n");
-                    }                    
+                    }
                 }
                 else if (verbose)
-                    RTPrintf("Waiting for process to exit ...\n");                        
+                    RTPrintf("Waiting for process to exit ...\n");
 
                 /* setup signal handling if cancelable */
@@ -344 +344 @@
                 while (SUCCEEDED(progress->COMGETTER(Completed(&fCompleted))))
                 {
-                    /* 
+                    /*
                      * because we want to get all the output data even if the process
                      * already ended, we first need to check whether there is some data
                      * left to output before checking the actual timeout and is-process-completed
-                     * stuff. 
+                     * stuff.
                      */
                     if (cbOutputData <= 0)
@@ -363 +363 @@
                     }
 
-                    if (   waitForStdOut 
+                    if (   waitForStdOut
                         || waitForStdErr)
                     {
-                        CHECK_ERROR_BREAK(guest, GetProcessOutput(uPID, 0 /* aFlags */, 
+                        CHECK_ERROR_BREAK(guest, GetProcessOutput(uPID, 0 /* aFlags */,
                                                                   u32TimeoutMS, _64K, ComSafeArrayAsOutParam(aOutputData)));
                         cbOutputData = aOutputData.size();
@@ -421 +421 @@
                 }
                 else
-                {                   
+                {
                     if (fCompleted)
                     {
@@ -440 +440 @@
                             CHECK_ERROR_BREAK(guest, GetProcessStatus(uPID, &uRetExitCode, &uRetFlags, &uRetStatus));
                             RTPrintf("Exit code=%u (Status=%u, Flags=%u)\n", uRetExitCode, uRetStatus, uRetFlags);
-                        }       
-                    }
-                    else /* not completed yet? -> timeout */
-                    {
-                        RTPrintf("Process timed out!\n");
+                        }
                     }
                 }