Changeset 46316 in vbox for trunk/src/VBox/Main

Timestamp:

May 30, 2013 6:29:22 AM (12 years ago)

Author:

vboxsync

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

86082

Message:

Main/Metrics: Solaris file descriptor leak fix (#6788)

File:

• trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp

@@ -49 +49 @@
 
     typedef libzfs_handle_t *(*PFNZFSINIT)(void);
+    typedef void (*PFNZFSFINI)(libzfs_handle_t *);
     typedef zfs_handle_t *(*PFNZFSOPEN)(libzfs_handle_t *, const char *, int);
     typedef void (*PFNZFSCLOSE)(zfs_handle_t *);
@@ -91 +92 @@
     libzfs_handle_t  *mZfsLib;
     PFNZFSINIT        mZfsInit;
+    PFNZFSFINI        mZfsFini;
     PFNZFSOPEN        mZfsOpen;
     PFNZFSCLOSE       mZfsClose;
@@ -140 +142 @@
     {
         mZfsInit        =        (PFNZFSINIT)dlsym(mZfsSo, "libzfs_init");
+        mZfsFini        =        (PFNZFSFINI)dlsym(mZfsSo, "libzfs_fini");
         mZfsOpen        =        (PFNZFSOPEN)dlsym(mZfsSo, "zfs_open");
         mZfsClose       =       (PFNZFSCLOSE)dlsym(mZfsSo, "zfs_close");
@@ -164 +167 @@
     if (mKC)
         kstat_close(mKC);
+    /* Not calling libzfs_fini() causes file descriptor leaks (#6788). */
+    if (mZfsFini && mZfsLib)
+        mZfsFini(mZfsLib);
     if (mZfsSo)
         dlclose(mZfsSo);