Changeset 54948 in vbox for trunk/src/VBox/Main/include

Timestamp:

Mar 25, 2015 4:56:48 PM (10 years ago)

Author:

vboxsync

Message:

Main/Medium+Snapshot: make all code recursing over trees (objects containing lists of child objects) use as little stack as possible, and establish safe depth limits to avoid crashes, plus related cleanups in related code areas

Location:

trunk/src/VBox/Main/include

Files:

• MediumImpl.h (modified) (5 diffs)
• SnapshotImpl.h (modified) (2 diffs)
• VirtualBoxImpl.h (modified) (2 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
- *
  * VirtualBox COM class implementation
  */
@@ -72 +70 @@
 
     // initializer used when loading settings
+    HRESULT initOne(Medium *aParent,
+                    DeviceType_T aDeviceType,
+                    const Guid &uuidMachineRegistry,
+                    const settings::Medium &data,
+                    const Utf8Str &strMachineFolder);
     HRESULT init(VirtualBox *aVirtualBox,
                  Medium *aParent,
@@ -77 +80 @@
                  const Guid &uuidMachineRegistry,
                  const settings::Medium &data,
-                 const Utf8Str &strMachineFolder);
+                 const Utf8Str &strMachineFolder,
+                 AutoWriteLock &mediaTreeLock);
 
     // initializer for host floppy/DVD
@@ -109 +113 @@
 
     /* handles caller/locking itself */
-    bool i_addRegistry(const Guid& id, bool fRecurse);
+    bool i_addRegistry(const Guid &id);
+    /* handles caller/locking itself, caller is responsible for tree lock */
+    bool i_addRegistryRecursive(const Guid &id);
     /* handles caller/locking itself */
-    bool i_removeRegistry(const Guid& id, bool fRecurse);
+    bool i_removeRegistry(const Guid& id);
+    /* handles caller/locking itself, caller is responsible for tree lock */
+    bool i_removeRegistryRecursive(const Guid& id);
     bool i_isInRegistry(const Guid& id);
     bool i_getFirstRegistryMachineId(Guid &uuid) const;
@@ -135 +143 @@
     HRESULT i_updatePath(const Utf8Str &strOldPath, const Utf8Str &strNewPath);
 
+    /* handles caller/locking itself */
     ComObjPtr<Medium> i_getBase(uint32_t *aLevel = NULL);
+    /* handles caller/locking itself */
+    uint32_t i_getDepth();
 
     bool i_isReadOnly();
     void i_updateId(const Guid &id);
 
+    void i_saveSettingsOne(settings::Medium &data,
+                           const Utf8Str &strHardDiskFolder);
     HRESULT i_saveSettings(settings::Medium &data,
                            const Utf8Str &strHardDiskFolder);

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

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
- *
  * VirtualBox COM class implementation
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -92 +90 @@
                                 Snapshot *pSnapshotToIgnore);
 
-    HRESULT i_saveSnapshot(settings::Snapshot &data, bool aAttrsOnly);
-    HRESULT i_saveSnapshotImpl(settings::Snapshot &data, bool aAttrsOnly);
+    HRESULT i_saveSnapshot(settings::Snapshot &data) const;
+    HRESULT i_saveSnapshotImpl(settings::Snapshot &data) const;
+    HRESULT i_saveSnapshotImplOne(settings::Snapshot &data) const;
 
+    HRESULT i_uninitOne(AutoWriteLock &writeLock,
+                        CleanupMode_T cleanupMode,
+                        MediaList &llMedia,
+                        std::list<Utf8Str> &llFilenames);
     HRESULT i_uninitRecursively(AutoWriteLock &writeLock,
                                 CleanupMode_T cleanupMode,

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

@@ -93 +93 @@
     HRESULT initMachines();
     HRESULT initMedia(const Guid &uuidMachineRegistry,
-                      const settings::MediaRegistry mediaRegistry,
+                      const settings::MediaRegistry &mediaRegistry,
                       const Utf8Str &strMachineFolder);
     void uninit();
@@ -230 +230 @@
     HRESULT i_saveSettings();
     void i_markRegistryModified(const Guid &uuid);
+    void i_unmarkRegistryModified(const Guid &uuid);
     void i_saveModifiedRegistries();
     static const com::Utf8Str &i_getVersionNormalized();