Changeset 26362 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Feb 9, 2010 1:20:03 PM (15 years ago)

Author:

vboxsync

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

57455

Message:

Solaris/SUPLib: fix for #4650 (fix fd table from growing on vboxflt close)

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPLibInternal.h (modified) (2 diffs)
• solaris/SUPLib-solaris.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLibInternal.h

@@ -50 +50 @@
 #else
 # define SUPLIB_DLL_SUFF    ".so"
+#endif
+
+#ifdef RT_OS_SOLARIS
+/** Number of dummy files to open (2:ip4, 1:ip6, 1:extra) see #4650 */
+#define SUPLIB_FLT_DUMMYFILES 4
 #endif
 
@@ -188 +193 @@
     /** Indicates whether madvise(,,MADV_DONTFORK) works. */
     bool                fSysMadviseWorks;
+#elif defined(RT_OS_SOLARIS)
+    /** Extra dummy file descriptors to prevent growing file-descriptor table on clean up (see #4650) */
+    int                 hDummy[SUPLIB_FLT_DUMMYFILES];
 #elif defined(RT_OS_WINDOWS)
 #endif

trunk/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp

@@ -82 +82 @@
         return VINF_SUCCESS;
 
+#ifdef VBOXFLT_DUMMYFILES
+    /*
+     * Open dummy files to preallocate file descriptors, see #4650.
+     */
+    for (int i = 0; i < VBOXFLT_DUMMYFILES; i++)
+    {
+        int hDummy = open("/dev/null", O_RDWR, 0);
+        fcntl(hDummy, F_SETFD, FD_CLOEXEC);
+        if (hDummy >= 0)
+            pThis->hDummy[i] = hDummy;
+        else
+        {
+            pThis->hDummy[i] = -1;
+            LogRel(("Failed to open[%d] /dev/null! errno=%d\n", i, errno));
+        }
+    }
+#endif
 
     /*
@@ -127 +144 @@
 int suplibOsTerm(PSUPLIBDATA pThis)
 {
+#ifdef VBOXFLT_DUMMYFILES
+    /*
+     * Close the dummy files first.
+     */
+    for (int i = 0; i < VBOXFLT_DUMMYFILES; i++)
+    {
+        if (pThis->hDummy[i] != -1)
+        {
+            close(pThis->hDummy[i]);
+            pThis->hDummy[i] = -1;
+        }
+    }
+#endif
+
     /*
      * Check if we're initialized