Changeset 26381 in vbox

Timestamp:

Feb 9, 2010 2:47:15 PM (15 years ago)

Author:

vboxsync

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

57474

Message:

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

File:

• trunk/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp (modified) (3 diffs)

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++)
-    {
+    for (int i = 0; i < SUPLIB_FLT_DUMMYFILES; i++)
+    {
+        pThis->hDummy[i] = -1;
         int hDummy = open("/dev/null", O_RDWR, 0);
-        fcntl(hDummy, F_SETFD, FD_CLOEXEC);
         if (hDummy >= 0)
-            pThis->hDummy[i] = hDummy;
+        {
+            if (fcntl(hDummy, F_SETFD, FD_CLOEXEC) == 0)
+                pThis->hDummy[i] = hDummy;
+            else
+            {
+                close(hDummy);
+                LogRel(("Failed to set close on exec [%d] /dev/null! errno=%d\n", i, errno));
+            }
+        }
         else
-        {
-            pThis->hDummy[i] = -1;
             LogRel(("Failed to open[%d] /dev/null! errno=%d\n", i, errno));
-        }
-    }
-#endif
+    }
 
     /*
@@ -144 +147 @@
 int suplibOsTerm(PSUPLIBDATA pThis)
 {
-#ifdef VBOXFLT_DUMMYFILES
     /*
      * Close the dummy files first.
      */
-    for (int i = 0; i < VBOXFLT_DUMMYFILES; i++)
+    for (int i = 0; i < SUPLIB_FLT_DUMMYFILES; i++)
     {
         if (pThis->hDummy[i] != -1)
@@ -156 +158 @@
         }
     }
-#endif
 
     /*