Changeset 24969 in vbox for trunk/src

Timestamp:

Nov 25, 2009 4:56:40 PM (15 years ago)

Author:

vboxsync

Message:

Main,VBoxManage: Check for timeout in the progress object (simple polling) and made use of this in the controlvm teleport VBoxManage command.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageControlVM.cpp (modified) (4 diffs)
• Main/ProgressImpl.cpp (modified) (6 diffs)
• Main/include/ProgressImpl.h (modified) (1 diff)

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

@@ -797 +797 @@
             uint32_t    uMaxDowntime = 250 /*ms*/;
             uint32_t    uPort        = UINT32_MAX;
+            uint32_t    cMsTimeout   = 0;
             Bstr        bstrPassword("");
             static const RTGETOPTDEF s_aTeleportOptions[] =
@@ -804 +805 @@
                 { "--maxdowntime", 'd', RTGETOPT_REQ_UINT32 },
                 { "--port",        'p', RTGETOPT_REQ_UINT32 }, /** @todo RTGETOPT_FLAG_MANDATORY */
-                { "--password",    'P', RTGETOPT_REQ_STRING }
+                { "--password",    'P', RTGETOPT_REQ_STRING },
+                { "--timeout",     't', RTGETOPT_REQ_UINT32 }
             };
             RTGETOPTSTATE GetOptState;
@@ -819 +821 @@
                     case 'p': uPort         = Value.u32; break;
                     case 'P': bstrPassword  = Value.psz; break;
+                    case 't': cMsTimeout    = Value.u32; break;
                     default:
                         errorGetOpt(USAGE_CONTROLVM, ch, &Value);
@@ -830 +833 @@
             ComPtr<IProgress> progress;
             CHECK_ERROR_BREAK(console, Teleport(bstrHostname, uPort, bstrPassword, uMaxDowntime, progress.asOutParam()));
+
+            if (cMsTimeout)
+            {
+                rc = progress->COMSETTER(Timeout)(cMsTimeout);
+                if (FAILED(rc) && rc != VBOX_E_INVALID_OBJECT_STATE)
+                    CHECK_ERROR_BREAK(progress, COMSETTER(Timeout)(cMsTimeout)); /* lazyness */
+            }
+
             rc = showProgress(progress);
             if (FAILED(rc))

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -287 +287 @@
     return dPercent;
 }
+
+/**
+ * Internal helper for automatically timing out the operation.
+ *
+ * The caller should hold the object write lock.
+ */
+void ProgressBase::checkForAutomaticTimeout(void)
+{
+    if (   m_cMsTimeout
+        && mCancelable
+        && !mCanceled
+        && RTTimeMilliTS() - m_ullTimestamp > m_cMsTimeout
+       )
+        Cancel();
+}
+
 
 STDMETHODIMP ProgressBase::COMGETTER(TimeRemaining)(LONG *aTimeRemaining)
@@ -328 +344 @@
     CheckComRCReturnRC(autoCaller.rc());
 
-    AutoReadLock alock(this);
+    checkForAutomaticTimeout();
+
+    /* checkForAutomaticTimeout requires a write lock. */
+    AutoWriteLock alock(this);
 
     if (mCompleted && SUCCEEDED(mResultCode))
@@ -346 +365 @@
     }
 
+    checkForAutomaticTimeout();
+
     return S_OK;
 }
@@ -562 +583 @@
     AutoWriteLock alock(this);
 
+    checkForAutomaticTimeout();
     if (mCanceled)
         return false;
@@ -952 +974 @@
     AssertReturn(aPercent <= 100, E_INVALIDARG);
 
+    checkForAutomaticTimeout();
     if (mCancelable && mCanceled)
     {
@@ -957 +980 @@
         return E_FAIL;
     }
-    else
-        AssertReturn(!mCompleted && !mCanceled, E_FAIL);
+    AssertReturn(!mCompleted && !mCanceled, E_FAIL);
 
     m_ulOperationPercent = aPercent;

trunk/src/VBox/Main/include/ProgressImpl.h

@@ -99 +99 @@
 
 protected:
+    void checkForAutomaticTimeout(void);
 
 #if !defined (VBOX_COM_INPROC)