Changeset 72543 in vbox for trunk/src/VBox/Storage

Timestamp:

Jun 13, 2018 1:29:38 PM (7 years ago)

Author:

vboxsync

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

123033

Message:

Storage: Fix plugin cleanup (especially the missing filter bits), and use #ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS more aggressively, letting the compiler detect sloppy code.

File:

• trunk/src/VBox/Storage/VDPlugin.cpp (modified) (17 diffs)

trunk/src/VBox/Storage/VDPlugin.cpp

@@ -64 +64 @@
 *********************************************************************************************************************************/
 
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
 /** Head of loaded plugin list. */
 static RTLISTANCHOR g_ListPluginsLoaded;
+#endif
 
 /** Number of image backends supported. */
@@ -71 +73 @@
 /** Array of pointers to the image backends. */
 static PCVDIMAGEBACKEND *g_apBackends = NULL;
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
 /** Array of handles to the corresponding plugin. */
 static RTLDRMOD *g_ahBackendPlugins = NULL;
+#endif
 /** Builtin image backends. */
 static PCVDIMAGEBACKEND aStaticBackends[] =
@@ -94 +98 @@
 /** Array of pointers to the cache backends. */
 static PCVDCACHEBACKEND *g_apCacheBackends = NULL;
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
 /** Array of handles to the corresponding plugin.
  *
@@ -99 +104 @@
  */
 static RTLDRMOD *g_ahCacheBackendPlugins = NULL;
+#endif
 /** Builtin cache backends. */
 static PCVDCACHEBACKEND aStaticCacheBackends[] =
@@ -136 +142 @@
         return VERR_NO_MEMORY;
     g_apBackends = pTmp;
-
+    memcpy(&g_apBackends[g_cBackends], ppBackends, cBackends * sizeof(PCVDIMAGEBACKEND));
+
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
     RTLDRMOD *pTmpPlugins = (RTLDRMOD*)RTMemRealloc(g_ahBackendPlugins,
            (g_cBackends + cBackends) * sizeof(RTLDRMOD));
@@ -142 +150 @@
         return VERR_NO_MEMORY;
     g_ahBackendPlugins = pTmpPlugins;
-    memcpy(&g_apBackends[g_cBackends], ppBackends, cBackends * sizeof(PCVDIMAGEBACKEND));
     for (unsigned i = g_cBackends; i < g_cBackends + cBackends; i++)
         g_ahBackendPlugins[i] = hPlugin;
+#else
+    RT_NOREF(hPlugin);
+#endif
+
     g_cBackends += cBackends;
     return VINF_SUCCESS;
@@ -168 +179 @@
         return VERR_NO_MEMORY;
     g_apCacheBackends = pTmp;
-
+    memcpy(&g_apCacheBackends[g_cCacheBackends], ppBackends, cBackends * sizeof(PCVDCACHEBACKEND));
+
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
     RTLDRMOD *pTmpPlugins = (RTLDRMOD*)RTMemReallocTag(g_ahCacheBackendPlugins,
                                                        (g_cCacheBackends + cBackends) * sizeof(RTLDRMOD),
@@ -175 +188 @@
         return VERR_NO_MEMORY;
     g_ahCacheBackendPlugins = pTmpPlugins;
-    memcpy(&g_apCacheBackends[g_cCacheBackends], ppBackends, cBackends * sizeof(PCVDCACHEBACKEND));
     for (unsigned i = g_cCacheBackends; i < g_cCacheBackends + cBackends; i++)
         g_ahCacheBackendPlugins[i] = hPlugin;
+#else
+    RT_NOREF(hPlugin);
+#endif
+
     g_cCacheBackends += cBackends;
     return VINF_SUCCESS;
@@ -227 +243 @@
     g_apFilterBackends = pTmp;
 
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
     PRTLDRMOD pTmpPlugins = (PRTLDRMOD)RTMemRealloc(g_pahFilterBackendPlugins,
                                                     (g_cFilterBackends + cBackends) * sizeof(RTLDRMOD));
@@ -236 +253 @@
     for (unsigned i = g_cFilterBackends; i < g_cFilterBackends + cBackends; i++)
         g_pahFilterBackendPlugins[i] = hPlugin;
+#else
+    RT_NOREF(hPlugin);
+#endif
+
     g_cFilterBackends += cBackends;
     return VINF_SUCCESS;
@@ -719 +740 @@
 }
 
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
 /**
  * internal: scans plugin directory and loads found plugins.
@@ -724 +746 @@
 static int vdLoadDynamicBackends(void)
 {
-#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
     /*
      * Enumerate plugin backends from the application directory where the other
@@ -735 +756 @@
 
     return vdPluginLoadFromPath(szPath);
-#else
-    return VINF_SUCCESS;
-#endif
-}
+}
+#endif
 
 /**
@@ -854 +873 @@
     {
         rc = vdAddCacheBackends(NIL_RTLDRMOD, aStaticCacheBackends, RT_ELEMENTS(aStaticCacheBackends));
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
         if (RT_SUCCESS(rc))
         {
@@ -859 +879 @@
             rc = vdLoadDynamicBackends();
         }
+#endif
     }
 
@@ -875 +896 @@
         return VERR_INTERNAL_ERROR;
 
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
+    if (g_pahFilterBackendPlugins)
+        RTMemFree(g_pahFilterBackendPlugins);
+#endif
+    if (g_apFilterBackends)
+        RTMemFree(g_apFilterBackends);
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
     if (g_ahCacheBackendPlugins)
         RTMemFree(g_ahCacheBackendPlugins);
+#endif
     if (g_apCacheBackends)
         RTMemFree(g_apCacheBackends);
@@ -887 +916 @@
     g_cCacheBackends = 0;
     g_apCacheBackends = NULL;
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
     g_ahCacheBackendPlugins = NULL;
+#endif
+
+    /* Clear the supported filter backends. */
+    g_cFilterBackends = 0;
+    g_apFilterBackends = NULL;
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
+    g_pahFilterBackendPlugins = NULL;
+#endif
 
 #ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS