Changeset 69321 in vbox for trunk/src/VBox/Main/src-server/MediumImpl.cpp

Timestamp:

Oct 25, 2017 6:57:26 PM (7 years ago)

Author:

vboxsync

Message:

Medium: use ready made callback which optimizes update frequency, not a simple private implementation

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -242 +242 @@
         /* Set up a per-operation progress interface, can be used freely (for
          * binary operations you can use it either on the source or target). */
-        mVDIfProgress.pfnProgress = vdProgressCall;
+        mVDIfProgress = VDINTERFACEPROGRESS_INITALIZER(aProgress->i_vdProgressCallback);
         int vrc = VDInterfaceAdd(&mVDIfProgress.Core,
                                 "Medium::Task::vdInterfaceProgress",
                                 VDINTERFACETYPE_PROGRESS,
                                 mProgress,
-                                sizeof(VDINTERFACEPROGRESS),
+                                sizeof(mVDIfProgress),
                                 &mVDOperationIfaces);
         AssertRC(vrc);
@@ -315 +315 @@
 
     const ComObjPtr<Progress> mProgress;
-
-    static DECLCALLBACK(int) vdProgressCall(void *pvUser, unsigned uPercent);
 
     VDINTERFACEPROGRESS mVDIfProgress;
@@ -800 +798 @@
     VDINTERFACECRYPTO vdIfCrypto;
 };
-
-/**
- * PFNVDPROGRESS callback handler for Task operations.
- *
- * @param pvUser      Pointer to the Progress instance.
- * @param uPercent    Completion percentage (0-100).
- */
-/*static*/
-DECLCALLBACK(int) Medium::Task::vdProgressCall(void *pvUser, unsigned uPercent)
-{
-    Progress *that = static_cast<Progress *>(pvUser);
-
-    if (that != NULL)
-    {
-        /* update the progress object, capping it at 99% as the final percent
-         * is used for additional operations like setting the UUIDs and similar. */
-        HRESULT rc = that->SetCurrentOperationProgress(uPercent * 99 / 100);
-        if (FAILED(rc))
-        {
-            if (rc == E_FAIL)
-                return VERR_CANCELLED;
-            else
-                return VERR_INVALID_STATE;
-        }
-    }
-
-    return VINF_SUCCESS;
-}
 
 /**