Changeset 16370 in vbox

Timestamp:

Jan 29, 2009 2:49:44 PM (16 years ago)

Author:

vboxsync

Message:

#3575: Increase VBoxSVC file descriptor limit for Unix platforms.

Location:

trunk/src

Files:

• VBox/Main/xpcom/server.cpp (modified) (3 diffs)
• libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp (modified) (4 diffs)

trunk/src/VBox/Main/xpcom/server.cpp

@@ -61 +61 @@
 #include <getopt.h>
 
-#ifdef RT_OS_SOLARIS
+#ifndef RT_OS_OS2
 # include <sys/resource.h>
 #endif
@@ -1051 +1051 @@
     do
     {
-#ifdef RT_OS_SOLARIS
-        struct rlimit lim;
-        if (getrlimit(RLIMIT_NOFILE, &lim) == 0)
-        {
-            if (lim.rlim_cur < 2048)
-            {
-                lim.rlim_cur = 2048;
-                if (setrlimit(RLIMIT_NOFILE, &lim) != 0)
-                {
-                    getrlimit(RLIMIT_NOFILE, &lim);
-                    printf ("WARNING: failed to increase per-process file-descriptor limit to 2048.\n", lim.rlim_cur);
-                }
-            }
-        }
-        else
-            printf ("WARNING: failed to obtain per-process file-descriptor limit.\n");
-#endif
-
         rc = com::Initialize();
         if (NS_FAILED (rc))
@@ -1186 +1168 @@
         }
 
+#ifndef RT_OS_OS2
+        struct rlimit lim;
+        if (getrlimit(RLIMIT_NOFILE, &lim) == 0)
+        {
+            int k = 10240;
+            for (; k >= 2048; k -= 1024)
+            {
+                if (lim.rlim_cur < k)
+                {
+                    lim.rlim_cur = k;
+                    if (setrlimit(RLIMIT_NOFILE, &lim) == 0)
+                        break;
+                }
+                else
+                    break;
+            }
+            if (k <= 2048)
+                printf("WARNING: failed to increase file descriptor limit.\n");
+        }
+        else
+            printf ("WARNING: failed to obtain per-process file-descriptor limit.\n");
+#endif
+
         PLEvent *ev;
         while (gKeepRunning)

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp

@@ -45 +45 @@
 #include <string.h>
 
-#ifdef RT_OS_SOLARIS
+#ifdef RT_OS_OS2
 # include <sys/resource.h>
 #endif
@@ -397 +397 @@
                 PRFileDesc *clientFD;
 
+                // @todo : We need to handle errors from accept() especially something like 
+                //          EMFILE, which happens when we run out of file descriptors.
+                //          and puts XPCOMIPCD in a poll/accept endless loop!
                 clientFD = PR_Accept(listenFD, &clientAddr, PR_INTERVAL_NO_WAIT);
                 if (clientFD == NULL) {
@@ -478 +481 @@
         PL_strncpyz(addr.local.path, argv[1], sizeof(addr.local.path));
 
-#ifdef RT_OS_SOLARIS
-        struct rlimit lim;
-        if (getrlimit(RLIMIT_NOFILE, &lim) == 0)
-        {
-            if (lim.rlim_cur < 2048)
-            {
-                lim.rlim_cur = 2048;
-                if (setrlimit(RLIMIT_NOFILE, &lim) != 0)
-                {
-                    getrlimit(RLIMIT_NOFILE, &lim);
-                    printf ("WARNING: failed to increase per-process file-descriptor limit to 2048\n", lim.rlim_cur);
-                }
-            }
-        }
-        else
-            printf ("WARNING: failed to obtain per-process file-descriptor limit.\n");
-#endif
-
 #ifdef IPC_USE_FILE_LOCK
     Status status = InitDaemonDir(addr.local.path);
@@ -544 +529 @@
             IPC_NotifyParent();
 
+#if defined(VBOX) && !defined(XP_OS2)
+        struct rlimit lim;
+        if (getrlimit(RLIMIT_NOFILE, &lim) == 0)
+        {
+            int k = 10240;
+            for (; k >= 2048; k -= 1024)
+            {
+                if (lim.rlim_cur < k)
+                {
+                    lim.rlim_cur = k;
+                    if (setrlimit(RLIMIT_NOFILE, &lim) == 0)
+                        break;
+                }
+                else
+                    break;
+            }
+            if (k <= 2048)
+                printf("WARNING: failed to increase file descriptor limit.\n");
+        }
+        else
+            printf ("WARNING: failed to obtain per-process file-descriptor limit.\n");
+#endif
+
             PollLoop(listenFD);
         }