Changeset 76240 in vbox for trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

Timestamp:

Dec 14, 2018 8:34:20 PM (6 years ago)

Author:

vboxsync

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

127510

Message:

Main: bugref:6913: had to revert all changes for the defect because of crashing VBoxSVC on MacOS

File:

• trunk/src/VBox/Main/src-server/SnapshotImpl.cpp (modified) (13 diffs)

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

@@ -15 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-
-#include <set>
-#include <map>
 
 #include "Logging.h"
@@ -1640 +1637 @@
     BOOL fSuspendedBySave     = FALSE;
 
-    std::set<ComObjPtr<Medium> > pMediumsForNotify;
-    std::map<Guid, DeviceType_T> uIdsForNotify;
-
     try
     {
@@ -1779 +1773 @@
             if (FAILED(rc))
                 throw rc;
-        }
-
-        // store parent of newly created diffs before commit for notify
-        {
-            MediumAttachmentList &oldAtts = *mMediumAttachments.backedUpData();
-            for (MediumAttachmentList::const_iterator
-                 it = mMediumAttachments->begin();
-                 it != mMediumAttachments->end();
-                 ++it)
-            {
-                MediumAttachment *pAttach = *it;
-                Medium *pMedium = pAttach->i_getMedium();
-                if (!pMedium)
-                    continue;
-
-                bool fFound = false;
-                /* was this medium attached before? */
-                for (MediumAttachmentList::iterator
-                     oldIt = oldAtts.begin();
-                     oldIt != oldAtts.end();
-                     ++oldIt)
-                {
-                    MediumAttachment *pOldAttach = *oldIt;
-                    if (pOldAttach->i_getMedium() == pMedium)
-                    {
-                        fFound = true;
-                        break;
-                    }
-                }
-                if (!fFound)
-                {
-                    pMediumsForNotify.insert(pMedium->i_getParent());
-                    uIdsForNotify[pMedium->i_getId()] = pMedium->i_getDeviceType();
-                }
-            }
         }
 
@@ -1917 +1876 @@
     if (SUCCEEDED(rc))
         mParent->i_onSnapshotTaken(mData->mUuid, task.m_uuidSnapshot);
-
-    if (SUCCEEDED(rc))
-    {
-        for (std::map<Guid, DeviceType_T>::const_iterator it = uIdsForNotify.begin();
-             it != uIdsForNotify.end();
-             ++it)
-        {
-            mParent->i_onMediumRegistered(it->first, it->second, TRUE);
-        }
-
-        for (std::set<ComObjPtr<Medium> >::const_iterator it = pMediumsForNotify.begin();
-             it != pMediumsForNotify.end();
-             ++it)
-        {
-            if (it->isNotNull())
-                mParent->i_onMediumConfigChanged(*it);
-        }
-    }
     LogFlowThisFuncLeave();
 }
@@ -2179 +2120 @@
     HRESULT rc = S_OK;
     Guid snapshotId;
-    std::set<ComObjPtr<Medium> > pMediumsForNotify;
-    std::map<Guid, DeviceType_T> uIdsForNotify;
 
     try
@@ -2275 +2214 @@
             /* make the snapshot we restored from the current snapshot */
             mData->mCurrentSnapshot = task.m_pSnapshot;
-        }
-
-        // store parent of newly created diffs for notify
-        {
-            MediumAttachmentList &oldAtts = *mMediumAttachments.backedUpData();
-            for (MediumAttachmentList::const_iterator
-                 it = mMediumAttachments->begin();
-                 it != mMediumAttachments->end();
-                 ++it)
-            {
-                MediumAttachment *pAttach = *it;
-                Medium *pMedium = pAttach->i_getMedium();
-                if (!pMedium)
-                    continue;
-
-                bool fFound = false;
-                /* was this medium attached before? */
-                for (MediumAttachmentList::iterator
-                     oldIt = oldAtts.begin();
-                     oldIt != oldAtts.end();
-                     ++oldIt)
-                {
-                    MediumAttachment *pOldAttach = *oldIt;
-                    if (pOldAttach->i_getMedium() == pMedium)
-                    {
-                        fFound = true;
-                        break;
-                    }
-                }
-                if (!fFound)
-                {
-                    pMediumsForNotify.insert(pMedium->i_getParent());
-                    uIdsForNotify[pMedium->i_getId()] = pMedium->i_getDeviceType();
-                }
-            }
         }
 
@@ -2410 +2314 @@
             LogFlowThisFunc(("Deleting old current state in differencing image '%s'\n", pMedium->i_getName().c_str()));
 
-            ComObjPtr<Medium> pParent = pMedium->i_getParent();
             HRESULT rc2 = pMedium->i_deleteStorage(NULL /* aProgress */,
-                                                   true /* aWait */,
-                                                   false /* aNotify */);
+                                                   true /* aWait */);
             // ignore errors here because we cannot roll back after i_saveSettings() above
             if (SUCCEEDED(rc2))
-            {
-                pMediumsForNotify.insert(pParent);
                 pMedium->uninit();
-            }
         }
     }
@@ -2446 +2345 @@
 
     if (SUCCEEDED(rc))
-    {
         mParent->i_onSnapshotRestored(mData->mUuid, snapshotId);
-        for (std::map<Guid, DeviceType_T>::const_iterator it = uIdsForNotify.begin();
-             it != uIdsForNotify.end();
-             ++it)
-        {
-            mParent->i_onMediumRegistered(it->first, it->second, TRUE);
-        }
-        for (std::set<ComObjPtr<Medium> >::const_iterator it = pMediumsForNotify.begin();
-             it != pMediumsForNotify.end();
-             ++it)
-        {
-            if (it->isNotNull())
-                mParent->i_onMediumConfigChanged(*it);
-        }
-    }
 
     LogFlowThisFunc(("Done restoring snapshot (rc=%08X)\n", rc));
@@ -2812 +2696 @@
     MediumDeleteRecList toDelete;
     Guid snapshotId;
-    std::set<ComObjPtr<Medium> > pMediumsForNotify;
-    std::map<Guid,DeviceType_T> uIdsForNotify;
 
     try
@@ -3188 +3070 @@
                     /* No need to hold the lock any longer. */
                     mLock.release();
-                    ComObjPtr<Medium> pParent = pMedium->i_getParent();
-                    Guid uMedium = pMedium->i_getId();
-                    DeviceType_T uMediumType = pMedium->i_getDeviceType();
                     rc = pMedium->i_deleteStorage(&task.m_pProgress,
-                                                  true /* aWait */,
-                                                  false /* aNotify */);
+                                                  true /* aWait */);
                     if (FAILED(rc))
                         throw rc;
-
-                    pMediumsForNotify.insert(pParent);
-                    uIdsForNotify[uMedium] = uMediumType;
 
                     // need to uninit the deleted medium
@@ -3206 +3081 @@
             else
             {
-                {
-                    //store ids before merging for notify
-                    pMediumsForNotify.insert(it->mpTarget);
-                    if (it->mfMergeForward)
-                        pMediumsForNotify.insert(it->mpSource->i_getParent());
-                    else
-                    {
-                        //children which will be reparented to target
-                        for (MediaList::const_iterator iit = it->mpSource->i_getChildren().begin();
-                             iit != it->mpSource->i_getChildren().end();
-                             ++iit)
-                        {
-                            pMediumsForNotify.insert(*iit);
-                        }
-                    }
-                    if (it->mfMergeForward)
-                    {
-                        for (ComObjPtr<Medium> pTmpMedium = it->mpTarget->i_getParent();
-                             pTmpMedium != it->mpSource;
-                             pTmpMedium = pTmpMedium->i_getParent())
-                        {
-                            uIdsForNotify[pTmpMedium->i_getId()] = pTmpMedium->i_getDeviceType();
-                        }
-                        uIdsForNotify[it->mpSource->i_getId()] = it->mpSource->i_getDeviceType();
-                    }
-                    else
-                    {
-                        for (ComObjPtr<Medium> pTmpMedium = it->mpSource->i_getParent();
-                             pTmpMedium != it->mpTarget;
-                             pTmpMedium = pTmpMedium->i_getParent())
-                        {
-                            uIdsForNotify[pTmpMedium->i_getId()] = pTmpMedium->i_getDeviceType();
-                        }
-                    }
-                }
-
                 bool fNeedsSave = false;
                 if (it->mfNeedsOnlineMerge)
@@ -3272 +3111 @@
                                                  it->mpMediumLockList,
                                                  &task.m_pProgress,
-                                                 true /* aWait */,
-                                                 false /* aNotify */);
+                                                 true /* aWait */);
                 }
 
@@ -3440 +3278 @@
 
     if (SUCCEEDED(mrc))
-    {
         mParent->i_onSnapshotDeleted(mData->mUuid, snapshotId);
-        for (std::map<Guid, DeviceType_T>::const_iterator it = uIdsForNotify.begin();
-             it != uIdsForNotify.end();
-             ++it)
-        {
-            mParent->i_onMediumRegistered(it->first, it->second, FALSE);
-        }
-        for (std::set<ComObjPtr<Medium> >::const_iterator it = pMediumsForNotify.begin();
-             it != pMediumsForNotify.end();
-             ++it)
-        {
-            if (it->isNotNull())
-                mParent->i_onMediumConfigChanged(*it);
-        }
-    }
 
     LogFlowThisFunc(("Done deleting snapshot (rc=%08X)\n", (HRESULT)mrc));