Changeset 85214 in vbox

Timestamp:

Jul 11, 2020 1:04:06 PM (4 years ago)

Author:

vboxsync

Message:

Main/ProcessImpl.cpp: Tweaked the waitForOperationCompletion and waitForCompletion loops a little. Fixed sign conversion warnings/errors for Clang 11. bugref:9790

File:

• trunk/src/VBox/Main/src-all/ProgressImpl.cpp (modified) (13 diffs)

trunk/src/VBox/Main/src-all/ProgressImpl.cpp

@@ -369 +369 @@
     }
 
-    return notifyComplete(aResultCode, errorInfo);
+    return notifyComplete((LONG)aResultCode, errorInfo);
 }
 
@@ -413 +413 @@
     errorInfo->init(aResultCode, aIID, pcszComponent, text);
 
-    return notifyComplete(aResultCode, errorInfo);
+    return notifyComplete((LONG)aResultCode, errorInfo);
 }
 
@@ -460 +460 @@
     errorInfo->initEx(aResultCode, vrc, aIID, pszComponent, text);
 
-    return notifyComplete(aResultCode, errorInfo);
+    return notifyComplete((LONG)aResultCode, errorInfo);
 }
 
@@ -656 +656 @@
         return setError(E_FAIL, tr("Result code is not available, operation is still in progress"));
 
-    *aResultCode = mResultCode;
+    *aResultCode = (LONG)mResultCode;
 
     return S_OK;
@@ -766 +766 @@
 
     /* if we're already completed, take a shortcut */
-    if (!mCompleted)
-    {
-        int vrc = VINF_SUCCESS;
-        bool fForever = aTimeout < 0;
-        int64_t timeLeft = aTimeout;
-        int64_t lastTime = RTTimeMilliTS();
-
-        while (!mCompleted && (fForever || timeLeft > 0))
+    if (!mCompleted && aTimeout != 0)
+    {
+        RTMSINTERVAL cMsWait  = aTimeout < 0 ? RT_INDEFINITE_WAIT : (RTMSINTERVAL)aTimeout;
+        uint64_t     msLast   = aTimeout < 0 ? 0                  : RTTimeMilliTS();
+
+        for (;;)
         {
             mWaitersCount++;
             alock.release();
-            vrc = RTSemEventMultiWait(mCompletedSem,
-                                      fForever ? RT_INDEFINITE_WAIT : (RTMSINTERVAL)timeLeft);
+            int vrc = RTSemEventMultiWait(mCompletedSem, cMsWait);
             alock.acquire();
             mWaitersCount--;
@@ -787 +784 @@
 
             if (RT_FAILURE(vrc) && vrc != VERR_TIMEOUT)
+                return setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Failed to wait for the task completion (%Rrc)"), vrc);
+
+            if (mCompleted)
                 break;
 
-            if (!fForever)
+            if (aTimeout >= 0)
             {
-                int64_t now = RTTimeMilliTS();
-                timeLeft -= now - lastTime;
-                lastTime = now;
+                uint64_t msNow = RTTimeMilliTS();
+                uint64_t cMsElapsed = msNow - msLast;
+                if (cMsWait <= cMsElapsed)
+                    break;
+                cMsWait -= (RTMSINTERVAL)cMsElapsed;
+                msLast   = msNow;
             }
         }
-
-        if (RT_FAILURE(vrc) && vrc != VERR_TIMEOUT)
-            return setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Failed to wait for the task completion (%Rrc)"), vrc);
     }
 
     LogFlowThisFuncLeave();
-
     return S_OK;
 }
@@ -825 +824 @@
      * then take a shortcut */
     if (    !mCompleted
-         && aOperation >= m_ulCurrentOperation)
-    {
-        int vrc = VINF_SUCCESS;
-        bool fForever = aTimeout < 0;
-        int64_t timeLeft = aTimeout;
-        int64_t lastTime = RTTimeMilliTS();
-
-        while (    !mCompleted && aOperation >= m_ulCurrentOperation
-                && (fForever || timeLeft > 0))
+         && aOperation >= m_ulCurrentOperation
+         && aTimeout != 0)
+    {
+        RTMSINTERVAL cMsWait  = aTimeout < 0 ? RT_INDEFINITE_WAIT : (RTMSINTERVAL)aTimeout;
+        uint64_t     msLast   = aTimeout < 0 ? 0                  : RTTimeMilliTS();
+
+        for (;;)
         {
             mWaitersCount ++;
             alock.release();
-            vrc = RTSemEventMultiWait(mCompletedSem,
-                                      fForever ? RT_INDEFINITE_WAIT : (unsigned) timeLeft);
+            int vrc = RTSemEventMultiWait(mCompletedSem, cMsWait);
             alock.acquire();
             mWaitersCount--;
@@ -847 +843 @@
 
             if (RT_FAILURE(vrc) && vrc != VERR_TIMEOUT)
+                return setErrorBoth(E_FAIL, vrc, tr("Failed to wait for the operation completion (%Rrc)"), vrc);
+
+            if (mCompleted || aOperation >= m_ulCurrentOperation)
                 break;
 
-            if (!fForever)
+            if (aTimeout >= 0)
             {
-                int64_t now = RTTimeMilliTS();
-                timeLeft -= now - lastTime;
-                lastTime = now;
+                uint64_t msNow = RTTimeMilliTS();
+                uint64_t cMsElapsed = msNow - msLast;
+                if (cMsWait <= cMsElapsed)
+                    break;
+                cMsWait -= (RTMSINTERVAL)cMsElapsed;
+                msLast   = msNow;
             }
         }
-
-        if (RT_FAILURE(vrc) && vrc != VERR_TIMEOUT)
-            return setErrorBoth(E_FAIL, vrc, tr("Failed to wait for the operation completion (%Rrc)"), vrc);
     }
 
     LogFlowThisFuncLeave();
-
     return S_OK;
 }
@@ -913 +911 @@
         ULONG actualPercent = 0;
         getPercent(&actualPercent);
-        fireProgressPercentageChangedEvent(pEventSource, mId.toUtf16().raw(), actualPercent);
+        fireProgressPercentageChangedEvent(pEventSource, mId.toUtf16().raw(), (LONG)actualPercent);
     }
 
@@ -1026 +1024 @@
     rc = aProgressOther->COMGETTER(ResultCode)(&iRc);
     if (FAILED(rc)) return rc;
-    if (FAILED(iRc))
+    if (FAILED((HRESULT)iRc))
     {
         setError(ProgressErrorInfo(aProgressOther));
-        rc = iRc;
+        rc = (HRESULT)iRc;
     }
 
@@ -1070 +1068 @@
     ULONG actualPercent = 0;
     getPercent(&actualPercent);
-    fireProgressPercentageChangedEvent(pEventSource, mId.toUtf16().raw(), actualPercent);
+    fireProgressPercentageChangedEvent(pEventSource, mId.toUtf16().raw(), (LONG)actualPercent);
 
     return S_OK;
@@ -1114 +1112 @@
 HRESULT Progress::notifyComplete(LONG aResultCode, const ComPtr<IVirtualBoxErrorInfo> &aErrorInfo)
 {
-    LogThisFunc(("aResultCode=%d\n", aResultCode));
+    HRESULT hrcOperation = (HRESULT)aResultCode; /* XPCOM has an unsigned HRESULT, upsetting Clang 11 wrt sign conv. */
+    LogThisFunc(("hrcOperation=%Rhrc\n", hrcOperation));
     /* on failure we expect error info, on success there must be none */
-    AssertMsg(FAILED(aResultCode) ^ aErrorInfo.isNull(),
+    AssertMsg(FAILED(hrcOperation) ^ aErrorInfo.isNull(),
               ("No error info but trying to set a failed result (%08X)!\n",
-               aResultCode));
+               hrcOperation));
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1124 +1123 @@
     AssertReturn(mCompleted == FALSE, E_FAIL);
 
-    if (mCanceled && SUCCEEDED(aResultCode))
-        aResultCode = E_FAIL;
+    if (mCanceled && SUCCEEDED(hrcOperation))
+        hrcOperation = E_FAIL;
 
     mCompleted = TRUE;
-    mResultCode = aResultCode;
-    if (SUCCEEDED(aResultCode))
+    mResultCode = hrcOperation;
+    if (SUCCEEDED(hrcOperation))
     {
         m_ulCurrentOperation = m_cOperations - 1; /* last operation */