Merge pull request nwjs#698 from GnorTech/master

rogerwang · rogerwang · commit 559ed477bce3 · 2013-05-07T19:05:04.000-07:00
fix out-of-fd issue on OSX
diff --git a/src/shell_browser_main_parts.cc b/src/shell_browser_main_parts.cc
@@ -27,6 +27,7 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/nw/src/api/app/app.h"
 #include "content/nw/src/browser/printing/print_job_manager.h"
 #include "content/nw/src/browser/shell_devtools_delegate.h"
@@ -41,12 +42,37 @@
 #include "net/proxy/proxy_resolver_v8.h"
 #include "ui/base/resource/resource_bundle.h"
 
+#if !defined(OS_WIN)
+#include <sys/resource.h>
+#endif
+
 #if defined(TOOLKIT_GTK)
 #include "content/nw/src/browser/printing/print_dialog_gtk.h"
 #endif
 
 namespace {
 
+#if !defined(OS_WIN)
+// Sets the file descriptor soft limit to |max_descriptors| or the OS hard
+// limit, whichever is lower.
+void SetFileDescriptorLimit(unsigned int max_descriptors) {
+  struct rlimit limits;
+  if (getrlimit(RLIMIT_NOFILE, &limits) == 0) {
+    unsigned int new_limit = max_descriptors;
+    if (limits.rlim_max > 0 && limits.rlim_max < max_descriptors) {
+      new_limit = limits.rlim_max;
+    }
+    limits.rlim_cur = new_limit;
+    if (setrlimit(RLIMIT_NOFILE, &limits) != 0) {
+      PLOG(INFO) << "Failed to set file descriptor limit";
+    }
+  } else {
+    PLOG(INFO) << "Failed to get file descriptor limit";
+  }
+}
+
+#endif
+
 base::StringPiece PlatformResourceProvider(int key) {
   if (key == IDR_DIR_HEADER_HTML) {
     base::StringPiece html_data =
@@ -203,4 +229,26 @@ printing::PrintJobManager* ShellBrowserMainParts::print_job_manager() {
   return print_job_manager_.get();
 }
 
+void ShellBrowserMainParts::PreEarlyInitialization() {
+#if !defined(OS_WIN)
+  // see chrome_browser_main_posix.cc
+  CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  const std::string fd_limit_string =
+      command_line.GetSwitchValueASCII(switches::kFileDescriptorLimit);
+  int fd_limit = 0;
+  if (!fd_limit_string.empty()) {
+    base::StringToInt(fd_limit_string, &fd_limit);
+  }
+#if defined(OS_MACOSX)
+  // We use quite a few file descriptors for our IPC, and the default limit on
+  // the Mac is low (256), so bump it up if there is no explicit override.
+  if (fd_limit == 0) {
+    fd_limit = 1024;
+  }
+#endif  // OS_MACOSX
+  if (fd_limit > 0)
+    SetFileDescriptorLimit(fd_limit);
+#endif // !OS_WIN
+}
+
 }  // namespace content
diff --git a/src/shell_browser_main_parts.h b/src/shell_browser_main_parts.h
@@ -38,6 +38,7 @@ class ShellBrowserMainParts : public BrowserMainParts {
   virtual ~ShellBrowserMainParts();
 
   // BrowserMainParts overrides.
+  virtual void PreEarlyInitialization() OVERRIDE;
   virtual void PreMainMessageLoopStart() OVERRIDE;
   virtual void PreMainMessageLoopRun() OVERRIDE;
   virtual void PostMainMessageLoopStart() OVERRIDE;
