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

Timestamp:

Jan 14, 2013 6:22:18 PM (12 years ago)

Author:

vboxsync

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

83197

Message:

Eliminate last use of CombinedProgress class etc xtracker id id 6167

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (11 diffs)

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

@@ -5962 +5962 @@
     AutoCaller autoCaller(this);
     AssertComRCReturnVoid(autoCaller.rc());
-
     fireStateChangedEvent(mEventSource, machineState);
 }
@@ -6329 +6328 @@
 HRESULT Console::powerUp(IProgress **aProgress, bool aPaused)
 {
+
     LogFlowThisFuncEnter();
     LogFlowThisFunc(("mMachineState=%d\n", mMachineState));
@@ -6343 +6343 @@
     bool fBeganPoweringUp = false;
 
+    LONG cOperations = 1;
+    LONG ulTotalOperationsWeight = 1;
+
     try
     {
+
         if (Global::IsOnlineOrTransient(mMachineState))
             throw setError(VBOX_E_INVALID_VM_STATE,
@@ -6361 +6365 @@
         if (FAILED(rc))
             throw rc;
+
 #if 0 /** @todo we should save it afterwards, but that isn't necessarily a good idea. Find a better place for this (VBoxSVC).  */
         if (fTeleporterEnabled)
@@ -6391 +6396 @@
         else
             progressDesc = tr("Starting virtual machine");
-        if (    mMachineState == MachineState_Saved
+
+        /* Check all types of shared folders and compose a single list */
+        SharedFolderDataMap sharedFolders;
+        {
+            /* first, insert global folders */
+            for (SharedFolderDataMap::const_iterator it = m_mapGlobalSharedFolders.begin();
+                 it != m_mapGlobalSharedFolders.end();
+                 ++it)
+            {
+                const SharedFolderData &d = it->second;
+                sharedFolders[it->first] = d;
+            }
+
+            /* second, insert machine folders */
+            for (SharedFolderDataMap::const_iterator it = m_mapMachineSharedFolders.begin();
+                 it != m_mapMachineSharedFolders.end();
+                 ++it)
+            {
+                const SharedFolderData &d = it->second;
+                sharedFolders[it->first] = d;
+            }
+
+            /* third, insert console folders */
+            for (SharedFolderMap::const_iterator it = m_mapSharedFolders.begin();
+                 it != m_mapSharedFolders.end();
+                 ++it)
+            {
+                SharedFolder *pSF = it->second;
+                AutoCaller sfCaller(pSF);
+                AutoReadLock sfLock(pSF COMMA_LOCKVAL_SRC_POS);
+                sharedFolders[it->first] = SharedFolderData(pSF->getHostPath(),
+                                                            pSF->isWritable(),
+                                                            pSF->isAutoMounted());
+            }
+        }
+
+        Bstr savedStateFile;
+
+        /*
+         * Saved VMs will have to prove that their saved states seem kosher.
+         */
+        if (mMachineState == MachineState_Saved)
+        {
+            rc = mMachine->COMGETTER(StateFilePath)(savedStateFile.asOutParam());
+            if (FAILED(rc))
+                throw rc;
+            ComAssertRet(!savedStateFile.isEmpty(), E_FAIL);
+            int vrc = SSMR3ValidateFile(Utf8Str(savedStateFile).c_str(), false /* fChecksumIt */);
+            if (RT_FAILURE(vrc))
+                throw setError(VBOX_E_FILE_ERROR,
+                               tr("VM cannot start because the saved state file '%ls' is invalid (%Rrc). Delete the saved state prior to starting the VM"),
+                               savedStateFile.raw(), vrc);
+        }
+
+        /* Setup task object and thread to carry out the operaton
+         * Asycnhronously */
+        std::auto_ptr<VMPowerUpTask> task(new VMPowerUpTask(this, pPowerupProgress));
+        ComAssertComRCRetRC(task->rc());
+
+        task->mConfigConstructor = configConstructor;
+        task->mSharedFolders = sharedFolders;
+        task->mStartPaused = aPaused;
+        if (mMachineState == MachineState_Saved)
+            task->mSavedStateFile = savedStateFile;
+        task->mTeleporterEnabled = fTeleporterEnabled;
+        task->mEnmFaultToleranceState = enmFaultToleranceState;
+
+        /* Reset differencing hard disks for which autoReset is true,
+         * but only if the machine has no snapshots OR the current snapshot
+         * is an OFFLINE snapshot; otherwise we would reset the current
+         * differencing image of an ONLINE snapshot which contains the disk
+         * state of the machine while it was previously running, but without
+         * the corresponding machine state, which is equivalent to powering
+         * off a running machine and not good idea
+         */
+        ComPtr<ISnapshot> pCurrentSnapshot;
+        rc = mMachine->COMGETTER(CurrentSnapshot)(pCurrentSnapshot.asOutParam());
+        if (FAILED(rc))
+            throw rc;
+
+        BOOL fCurrentSnapshotIsOnline = false;
+        if (pCurrentSnapshot)
+        {
+            rc = pCurrentSnapshot->COMGETTER(Online)(&fCurrentSnapshotIsOnline);
+            if (FAILED(rc))
+                throw rc;
+        }
+
+        if (!fCurrentSnapshotIsOnline)
+        {
+            LogFlowThisFunc(("Looking for immutable images to reset\n"));
+
+            com::SafeIfaceArray<IMediumAttachment> atts;
+            rc = mMachine->COMGETTER(MediumAttachments)(ComSafeArrayAsOutParam(atts));
+            if (FAILED(rc))
+                throw rc;
+
+            for (size_t i = 0;
+                 i < atts.size();
+                 ++i)
+            {
+                DeviceType_T devType;
+                rc = atts[i]->COMGETTER(Type)(&devType);
+                /** @todo later applies to floppies as well */
+                if (devType == DeviceType_HardDisk)
+                {
+                    ComPtr<IMedium> pMedium;
+                    rc = atts[i]->COMGETTER(Medium)(pMedium.asOutParam());
+                    if (FAILED(rc))
+                        throw rc;
+
+                    /* needs autoreset? */
+                    BOOL autoReset = FALSE;
+                    rc = pMedium->COMGETTER(AutoReset)(&autoReset);
+                    if (FAILED(rc))
+                        throw rc;
+
+                    if (autoReset)
+                    {
+                        ComPtr<IProgress> pResetProgress;
+                        rc = pMedium->Reset(pResetProgress.asOutParam());
+                        if (FAILED(rc))
+                            throw rc;
+
+                        /* save for later use on the powerup thread */
+                        task->hardDiskProgresses.push_back(pResetProgress);
+                    }
+                }
+            }
+        }
+        else
+            LogFlowThisFunc(("Machine has a current snapshot which is online, skipping immutable images reset\n"));
+
+        /* setup task object and thread to carry out the operation
+         * asynchronously */
+
+#ifdef VBOX_WITH_EXTPACK
+        mptrExtPackManager->dumpAllToReleaseLog();
+#endif
+
+#ifdef RT_OS_SOLARIS
+        /* setup host core dumper for the VM */
+        Bstr value;
+        HRESULT hrc = mMachine->GetExtraData(Bstr("VBoxInternal2/CoreDumpEnabled").raw(), value.asOutParam());
+        if (SUCCEEDED(hrc) && value == "1")
+        {
+            Bstr coreDumpDir, coreDumpReplaceSys, coreDumpLive;
+            mMachine->GetExtraData(Bstr("VBoxInternal2/CoreDumpDir").raw(), coreDumpDir.asOutParam());
+            mMachine->GetExtraData(Bstr("VBoxInternal2/CoreDumpReplaceSystemDump").raw(), coreDumpReplaceSys.asOutParam());
+            mMachine->GetExtraData(Bstr("VBoxInternal2/CoreDumpLive").raw(), coreDumpLive.asOutParam());
+
+            uint32_t fCoreFlags = 0;
+            if (   coreDumpReplaceSys.isEmpty() == false
+                && Utf8Str(coreDumpReplaceSys).toUInt32() == 1)
+                fCoreFlags |= RTCOREDUMPER_FLAGS_REPLACE_SYSTEM_DUMP;
+
+            if (   coreDumpLive.isEmpty() == false
+                && Utf8Str(coreDumpLive).toUInt32() == 1)
+                fCoreFlags |= RTCOREDUMPER_FLAGS_LIVE_CORE;
+
+            Utf8Str strDumpDir(coreDumpDir);
+            const char *pszDumpDir = strDumpDir.c_str();
+            if (   pszDumpDir
+                && *pszDumpDir == '\0')
+                pszDumpDir = NULL;
+
+            int vrc;
+            if (   pszDumpDir
+                && !RTDirExists(pszDumpDir))
+            {
+                /*
+                 * Try create the directory.
+                 */
+                vrc = RTDirCreateFullPath(pszDumpDir, 0700);
+                if (RT_FAILURE(vrc))
+                    throw setError(E_FAIL, "Failed to setup CoreDumper. Couldn't create dump directory '%s' (%Rrc)\n", pszDumpDir, vrc);
+            }
+
+            vrc = RTCoreDumperSetup(pszDumpDir, fCoreFlags);
+            if (RT_FAILURE(vrc))
+                throw setError(E_FAIL, "Failed to setup CoreDumper (%Rrc)", vrc);
+            else
+                LogRel(("CoreDumper setup successful. pszDumpDir=%s fFlags=%#x\n", pszDumpDir ? pszDumpDir : ".", fCoreFlags));
+        }
+#endif
+
+
+        // If there is immutable drive the process that.
+        VMPowerUpTask::ProgressList progresses(task->hardDiskProgresses);
+        if (aProgress && progresses.size() > 0){
+
+            for (VMPowerUpTask::ProgressList::const_iterator it = progresses.begin(); it !=  progresses.end(); ++it)
+            {
+                ++cOperations;
+                ulTotalOperationsWeight += 1;
+            }
+            rc = pPowerupProgress->init(static_cast<IConsole *>(this),
+                                        progressDesc.raw(),
+                                        TRUE, // Cancelable
+                                        cOperations,
+                                        ulTotalOperationsWeight,
+                                        Bstr(tr("Starting Hard Disk operations")).raw(),
+                                        1,
+                                        NULL);
+            AssertComRCReturnRC(rc);
+        }
+        else if (    mMachineState == MachineState_Saved
             ||  (!fTeleporterEnabled && !fFaultToleranceSyncEnabled))
+        {
             rc = pPowerupProgress->init(static_cast<IConsole *>(this),
                                         progressDesc.raw(),
                                         FALSE /* aCancelable */);
-        else
-        if (fTeleporterEnabled)
+        }
+        else if (fTeleporterEnabled)
+        {
             rc = pPowerupProgress->init(static_cast<IConsole *>(this),
                                         progressDesc.raw(),
@@ -6406 +6619 @@
                                         1    /* ulFirstOperationWeight */,
                                         NULL);
-        else
-        if (fFaultToleranceSyncEnabled)
+        }
+        else if (fFaultToleranceSyncEnabled)
+        {
             rc = pPowerupProgress->init(static_cast<IConsole *>(this),
                                         progressDesc.raw(),
@@ -6416 +6630 @@
                                         1    /* ulFirstOperationWeight */,
                                         NULL);
+        }
 
         if (FAILED(rc))
@@ -6430 +6645 @@
         }
         fBeganPoweringUp = true;
+
+        LogFlowThisFunc(("Checking if canceled...\n"));
+        BOOL fCanceled;
+        rc = pPowerupProgress->COMGETTER(Canceled)(&fCanceled);
+        if (FAILED(rc))
+            throw rc;
+
+        if (fCanceled)
+        {
+            LogFlowThisFunc(("Canceled in BeginPowerUp\n"));
+            throw setError(E_FAIL, tr("Powerup was canceled"));
+        }
+        LogFlowThisFunc(("Not canceled yet.\n"));
 
         /** @todo this code prevents starting a VM with unavailable bridged
@@ -6490 +6718 @@
             throw rc;
 
-        /* Check all types of shared folders and compose a single list */
-        SharedFolderDataMap sharedFolders;
-        {
-            /* first, insert global folders */
-            for (SharedFolderDataMap::const_iterator it = m_mapGlobalSharedFolders.begin();
-                 it != m_mapGlobalSharedFolders.end();
-                 ++it)
-            {
-                const SharedFolderData &d = it->second;
-                sharedFolders[it->first] = d;
-            }
-
-            /* second, insert machine folders */
-            for (SharedFolderDataMap::const_iterator it = m_mapMachineSharedFolders.begin();
-                 it != m_mapMachineSharedFolders.end();
-                 ++it)
-            {
-                const SharedFolderData &d = it->second;
-                sharedFolders[it->first] = d;
-            }
-
-            /* third, insert console folders */
-            for (SharedFolderMap::const_iterator it = m_mapSharedFolders.begin();
-                 it != m_mapSharedFolders.end();
-                 ++it)
-            {
-                SharedFolder *pSF = it->second;
-                AutoCaller sfCaller(pSF);
-                AutoReadLock sfLock(pSF COMMA_LOCKVAL_SRC_POS);
-                sharedFolders[it->first] = SharedFolderData(pSF->getHostPath(),
-                                                            pSF->isWritable(),
-                                                            pSF->isAutoMounted());
-            }
-        }
-
-        Bstr savedStateFile;
-
-        /*
-         * Saved VMs will have to prove that their saved states seem kosher.
-         */
-        if (mMachineState == MachineState_Saved)
-        {
-            rc = mMachine->COMGETTER(StateFilePath)(savedStateFile.asOutParam());
-            if (FAILED(rc))
-                throw rc;
-            ComAssertRet(!savedStateFile.isEmpty(), E_FAIL);
-            int vrc = SSMR3ValidateFile(Utf8Str(savedStateFile).c_str(), false /* fChecksumIt */);
-            if (RT_FAILURE(vrc))
-                throw setError(VBOX_E_FILE_ERROR,
-                                tr("VM cannot start because the saved state file '%ls' is invalid (%Rrc). Delete the saved state prior to starting the VM"),
-                                savedStateFile.raw(), vrc);
-        }
-
-        LogFlowThisFunc(("Checking if canceled...\n"));
-        BOOL fCanceled;
-        rc = pPowerupProgress->COMGETTER(Canceled)(&fCanceled);
-        if (FAILED(rc))
-            throw rc;
-        if (fCanceled)
-        {
-            LogFlowThisFunc(("Canceled in BeginPowerUp\n"));
-            throw setError(E_FAIL, tr("Powerup was canceled"));
-        }
-        LogFlowThisFunc(("Not canceled yet.\n"));
-
         /* setup task object and thread to carry out the operation
          * asynchronously */
-
-        std::auto_ptr<VMPowerUpTask> task(new VMPowerUpTask(this, pPowerupProgress));
-        ComAssertComRCRetRC(task->rc());
-
-        task->mConfigConstructor = configConstructor;
-        task->mSharedFolders = sharedFolders;
-        task->mStartPaused = aPaused;
-        if (mMachineState == MachineState_Saved)
-            task->mSavedStateFile = savedStateFile;
-        task->mTeleporterEnabled = fTeleporterEnabled;
-        task->mEnmFaultToleranceState = enmFaultToleranceState;
-
-        /* Reset differencing hard disks for which autoReset is true,
-         * but only if the machine has no snapshots OR the current snapshot
-         * is an OFFLINE snapshot; otherwise we would reset the current
-         * differencing image of an ONLINE snapshot which contains the disk
-         * state of the machine while it was previously running, but without
-         * the corresponding machine state, which is equivalent to powering
-         * off a running machine and not good idea
-         */
-        ComPtr<ISnapshot> pCurrentSnapshot;
-        rc = mMachine->COMGETTER(CurrentSnapshot)(pCurrentSnapshot.asOutParam());
-        if (FAILED(rc))
-            throw rc;
-
-        BOOL fCurrentSnapshotIsOnline = false;
-        if (pCurrentSnapshot)
-        {
-            rc = pCurrentSnapshot->COMGETTER(Online)(&fCurrentSnapshotIsOnline);
-            if (FAILED(rc))
-                throw rc;
-        }
-
-        if (!fCurrentSnapshotIsOnline)
-        {
-            LogFlowThisFunc(("Looking for immutable images to reset\n"));
-
-            com::SafeIfaceArray<IMediumAttachment> atts;
-            rc = mMachine->COMGETTER(MediumAttachments)(ComSafeArrayAsOutParam(atts));
-            if (FAILED(rc))
-                throw rc;
-
-            for (size_t i = 0;
-                 i < atts.size();
-                 ++i)
-            {
-                DeviceType_T devType;
-                rc = atts[i]->COMGETTER(Type)(&devType);
-                /** @todo later applies to floppies as well */
-                if (devType == DeviceType_HardDisk)
-                {
-                    ComPtr<IMedium> pMedium;
-                    rc = atts[i]->COMGETTER(Medium)(pMedium.asOutParam());
-                    if (FAILED(rc))
-                        throw rc;
-
-                    /* needs autoreset? */
-                    BOOL autoReset = FALSE;
-                    rc = pMedium->COMGETTER(AutoReset)(&autoReset);
-                    if (FAILED(rc))
-                        throw rc;
-
-                    if (autoReset)
-                    {
-                        ComPtr<IProgress> pResetProgress;
-                        rc = pMedium->Reset(pResetProgress.asOutParam());
-                        if (FAILED(rc))
-                            throw rc;
-
-                        /* save for later use on the powerup thread */
-                        task->hardDiskProgresses.push_back(pResetProgress);
-                    }
-                }
-            }
-        }
-        else
-            LogFlowThisFunc(("Machine has a current snapshot which is online, skipping immutable images reset\n"));
-
-#ifdef VBOX_WITH_EXTPACK
-        mptrExtPackManager->dumpAllToReleaseLog();
-#endif
-
-#ifdef RT_OS_SOLARIS
-        /* setup host core dumper for the VM */
-        Bstr value;
-        HRESULT hrc = mMachine->GetExtraData(Bstr("VBoxInternal2/CoreDumpEnabled").raw(), value.asOutParam());
-        if (SUCCEEDED(hrc) && value == "1")
-        {
-            Bstr coreDumpDir, coreDumpReplaceSys, coreDumpLive;
-            mMachine->GetExtraData(Bstr("VBoxInternal2/CoreDumpDir").raw(), coreDumpDir.asOutParam());
-            mMachine->GetExtraData(Bstr("VBoxInternal2/CoreDumpReplaceSystemDump").raw(), coreDumpReplaceSys.asOutParam());
-            mMachine->GetExtraData(Bstr("VBoxInternal2/CoreDumpLive").raw(), coreDumpLive.asOutParam());
-
-            uint32_t fCoreFlags = 0;
-            if (   coreDumpReplaceSys.isEmpty() == false
-                && Utf8Str(coreDumpReplaceSys).toUInt32() == 1)
-            {
-                fCoreFlags |= RTCOREDUMPER_FLAGS_REPLACE_SYSTEM_DUMP;
-            }
-
-            if (   coreDumpLive.isEmpty() == false
-                && Utf8Str(coreDumpLive).toUInt32() == 1)
-            {
-                fCoreFlags |= RTCOREDUMPER_FLAGS_LIVE_CORE;
-            }
-
-            Utf8Str strDumpDir(coreDumpDir);
-            const char *pszDumpDir = strDumpDir.c_str();
-            if (   pszDumpDir
-                && *pszDumpDir == '\0')
-                pszDumpDir = NULL;
-
-            int vrc;
-            if (   pszDumpDir
-                && !RTDirExists(pszDumpDir))
-            {
-                /*
-                 * Try create the directory.
-                 */
-                vrc = RTDirCreateFullPath(pszDumpDir, 0700);
-                if (RT_FAILURE(vrc))
-                    throw setError(E_FAIL, "Failed to setup CoreDumper. Couldn't create dump directory '%s' (%Rrc)\n", pszDumpDir, vrc);
-            }
-
-            vrc = RTCoreDumperSetup(pszDumpDir, fCoreFlags);
-            if (RT_FAILURE(vrc))
-                throw setError(E_FAIL, "Failed to setup CoreDumper (%Rrc)", vrc);
-            else
-                LogRel(("CoreDumper setup successful. pszDumpDir=%s fFlags=%#x\n", pszDumpDir ? pszDumpDir : ".", fCoreFlags));
-        }
-#endif
-
-        /* pass the progress object to the caller if requested */
-        if (aProgress)
-        {
-            if (task->hardDiskProgresses.size() == 0)
-            {
-                /* there are no other operations to track, return the powerup
-                 * progress only */
-                pPowerupProgress.queryInterfaceTo(aProgress);
-            }
-            else
-            {
-                // Create a simple progress object
-                ComObjPtr<Progress> pProgress;
-                pProgress.createObject();
-
-                // Assign hard disk progresses to the progresses list
-                VMPowerUpTask::ProgressList progresses(task->hardDiskProgresses);
-
-                // Setup params to be used to initialize Progress object properties.
-                ULONG cOperations = 1;
-                ULONG ulTotalOperationsWeight = 1;
-
-                // Go round them and set number of operations and weight.
-                for (VMPowerUpTask::ProgressList::const_iterator it = progresses.begin(); it !=  progresses.end(); ++it)
-                {
-                    ++cOperations;
-                    ulTotalOperationsWeight += 1;
-                }
-
-                rc = pProgress->init(static_cast<IConsole *>(this),
-                                     progressDesc.raw(),
-                                     TRUE, // Cancelable
-                                     cOperations,
-                                     ulTotalOperationsWeight,
-                                     Bstr(tr("Starting Hard Disk operations")).raw(), // first sub-op decription
-                                     1 );
-                AssertComRCReturnRC(rc);
-
-                // Perform all the necessary operations.
-                for (VMPowerUpTask::ProgressList::const_iterator it = progresses.begin(); it !=  progresses.end(); ++it)
-                {
-                    rc = pProgress->SetNextOperation(BstrFmt(tr("Disk Image Reset Operation - Immutable Image")).raw(), 1);
-                    AssertComRCReturnRC(rc);
-                    rc = pProgress.queryInterfaceTo(aProgress);
-                    AssertComRCReturnRC(rc);
-                }
-
-                // Now do the power up.
+        if (aProgress){
                 rc = pPowerupProgress.queryInterfaceTo(aProgress);
                 AssertComRCReturnRC(rc);
-            }
         }
 
@@ -6757 +6740 @@
             setMachineState(MachineState_Restoring);
         else if (fTeleporterEnabled)
-            setMachineState(MachineState_TeleportingIn);
+           setMachineState(MachineState_TeleportingIn);
         else if (enmFaultToleranceState == FaultToleranceState_Standby)
             setMachineState(MachineState_FaultTolerantSyncing);
@@ -8812 +8795 @@
             HRESULT rc2 = (*it)->WaitForCompletion(-1);
             AssertComRC(rc2);
+
+            rc = task->mProgress->SetNextOperation(BstrFmt(tr("Disk Image Reset Operation - Immutable Image")).raw(), 1);
+            AssertComRCReturnRC(rc);
         }