Changeset 16382 in vbox

Timestamp:

Jan 29, 2009 5:16:22 PM (16 years ago)

Author:

vboxsync

Message:

ipcdUnix.cpp, xpcom/server.cpp: Fixed wrong loop. Changed my mind about trial error approach.

Location:

trunk/src

Files:

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

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

@@ -1169 +1169 @@
 
 #ifndef RT_OS_OS2
+        // Increase the file table size to 10240 or as high as possible.
         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");
+            if (    lim.rlim_cur < 10240
+                &&  lim.rlim_cur < lim.rlim_max)
+            {
+                lim.rlim_cur = RT_MIN(lim.rlim_max, 10240);
+                if (setrlimit(RLIMIT_NOFILE, &lim) == -1)
+                    printf("WARNING: failed to increase file descriptor limit. (%d)\n", errno);
+            }
         }
         else
-            printf ("WARNING: failed to obtain per-process file-descriptor limit.\n");
+            printf("WARNING: failed to obtain per-process file-descriptor limit (%d).\n", errno);
 #endif
 

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

@@ -47 +47 @@
 #if defined(VBOX) && !defined(XP_OS2)
 # include <sys/resource.h>
+# include <errno.h>
 #endif
 
@@ -397 +398 @@
                 PRFileDesc *clientFD;
 
-                // @todo : We need to handle errors from accept() especially something like 
+                // @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!
@@ -530 +531 @@
 
 #if defined(VBOX) && !defined(XP_OS2)
-        struct rlimit lim;
-        if (getrlimit(RLIMIT_NOFILE, &lim) == 0)
-        {
-            int k = 10240;
-            for (; k >= 2048; k -= 1024)
+            // Increase the file table size to 10240 or as high as possible.
+            struct rlimit lim;
+            if (getrlimit(RLIMIT_NOFILE, &lim) == 0)
             {
-                if (lim.rlim_cur < k)
+                if (    lim.rlim_cur < 10240
+                    &&  lim.rlim_cur < lim.rlim_max)
                 {
-                    lim.rlim_cur = k;
-                    if (setrlimit(RLIMIT_NOFILE, &lim) == 0)
-                        break;
+                    lim.rlim_cur = lim.rlim_max <= 10240 ? lim.rlim_max : 10240;
+                    if (setrlimit(RLIMIT_NOFILE, &lim) == -1)
+                        printf("WARNING: failed to increase file descriptor limit. (%d)\n", errno);
                 }
-                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");
+            else
+                printf("WARNING: failed to obtain per-process file-descriptor limit (%d).\n", errno);
 #endif