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

Timestamp:

Nov 22, 2018 2:00:59 PM (6 years ago)

Author:

vboxsync

Message:

Main/ExtPackManager+CloudProviderManager+VirtualBox: Handle runtime install and uninstall of extension packs containing cloud providers. This is a safeguard against uninstalling active cloud providers (which would cause crashes), and makes the install more convcenient. At the same time it eliminated the need to have a special "detect all cloud providers" logic when VBoxSVC is started. It achieves perfect singleton property of the per-extpack CloudProviderManager and the related CloudProvider objects. Nothing is ever created twice (which would cause trouble with coordinating e.g. the profile file updates).

Location:

trunk/src/VBox/Main/include

Files:

• CloudProviderManagerImpl.h (modified) (3 diffs)
• ExtPackManagerImpl.h (modified) (1 diff)
• VirtualBoxImpl.h (modified) (3 diffs)

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

@@ -21 +21 @@
 
 #include "CloudProviderManagerWrap.h"
-#ifdef VBOX_WITH_EXTPACK
-class ExtPackManager;
-#endif
 
 
@@ -35 +32 @@
     void FinalRelease();
 
-    HRESULT init(VirtualBox *aParent);
+    HRESULT init();
     void uninit();
 
 #ifdef VBOX_WITH_EXTPACK
     // Safe helpers, take care of caller and lock themselves.
-    void i_refreshProviders();
+    bool i_canRemoveExtPack(IExtPack *aExtPack);
+    void i_addExtPack(IExtPack *aExtPack);
 #endif
 
@@ -55 +53 @@
 private:
 #ifdef VBOX_WITH_EXTPACK
-    ComObjPtr<ExtPackManager> mpExtPackMgr;
-    uint64_t mcExtPackMgrUpdate;
-    std::map<com::Utf8Str, ComPtr<ICloudProviderManager> > m_mapCloudProviderManagers;
+    typedef std::map<com::Utf8Str, ComPtr<ICloudProviderManager> > ExtPackNameCloudProviderManagerMap;
+    ExtPackNameCloudProviderManagerMap m_mapCloudProviderManagers;
+    typedef std::vector<com::Utf8Str> ExtPackNameVec;
+    ExtPackNameVec m_astrExtPackNames;
 #endif
 
-    std::vector<ComPtr<ICloudProvider> > m_apCloudProviders;
+    typedef std::vector<ComPtr<ICloudProvider> > CloudProviderVec;
+    CloudProviderVec m_apCloudProviders;
 };
 

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

@@ -131 +131 @@
     bool        i_wantsToBeDefaultVrde(void) const;
     HRESULT     i_refresh(bool *pfCanDelete);
+#ifndef VBOX_COM_INPROC
+    bool        i_areThereCloudProviderUninstallVetos();
+    void        i_notifyCloudProviderManager();
+#endif
     /** @}  */
 

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

@@ -40 +40 @@
 class DHCPServer;
 class PerformanceCollector;
+class CloudProviderManager;
 #ifdef VBOX_WITH_EXTPACK
 class ExtPackManager;
@@ -216 +217 @@
     const Guid &i_getGlobalRegistryId() const;
 
-    const ComObjPtr<Host>& i_host() const;
-    SystemProperties* i_getSystemProperties() const;
+    const ComObjPtr<Host> &i_host() const;
+    SystemProperties *i_getSystemProperties() const;
+    CloudProviderManager *i_getCloudProviderManager() const;
 #ifdef VBOX_WITH_EXTPACK
-    ExtPackManager* i_getExtPackManager() const;
+    ExtPackManager *i_getExtPackManager() const;
 #endif
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-    const ComObjPtr<PerformanceCollector>& i_performanceCollector() const;
+    const ComObjPtr<PerformanceCollector> &i_performanceCollector() const;
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
@@ -229 +231 @@
 
     /** Returns the VirtualBox home directory */
-    const Utf8Str& i_homeDir() const;
+    const Utf8Str &i_homeDir() const;
     int i_calculateFullPath(const Utf8Str &strPath, Utf8Str &aResult);
     void i_copyPathRelativeToConfig(const Utf8Str &strSource, Utf8Str &strTarget);