401138 - Raise file descriptor limit

Status: RESOLVED FIXED

(Camino Graveyard :: General, defect)

Description

[Stuart Morgan]

Attachment: limit boost

Bug 397053 puts us in a nasty position, because anyone who visits enough pages with Flash will eventually lose all functionality in Camino, and we can't fix it. Until we can get more traction on a real fix, boosting our fd limit to 1024 will at least make this less painful for our users.

Comment 1

[Mark Mentovai]

Comment on attachment 286190 [details] [diff] [review]
limit boost

Looks good to me with the following changes:

>Index: src/application/main.m

>+#include <sys/resource.h>

Looking at the 10.2 SDK, you need to #include <sys/types.h> too.

>+static void SetMaxFileDescriptors(int target_max)

Call the argument "target" - it's slightly confusing to call it target_max but to use it for rlim_cur (instead of rlim_max).

>+{
>+  struct rlimit rlp;

"p" means pointer, which this isn't.  Call it rl or something else.

>+  if (getrlimit(RLIMIT_NOFILE, &rlp) == 0) {
>+    if (rlp.rlim_max > 0 && rlp.rlim_max < target_max)
>+      target_max = rlp.rlim_max;
>+    if (target_max > rlp.rlim_cur) {
>+      rlp.rlim_cur = target_max;
>+      setrlimit(RLIMIT_NOFILE, &rlp);
>+    }
>+  }
>+}
>+
> int main(int argc, const char *argv[])
> {
>   SetupRuntimeOptions(argc, argv);

Put a blank line here, so it's clear that the comment applies to SetMaxFileDescriptors.

>+  // Because of a nasty file descriptor leak when viewing flash
>+  // (bug 397053), bump up our limit up to 1024 so that it takes longer for
>+  // the world to end.
>+  SetMaxFileDescriptors(1024);

Comment 2

[Stuart Morgan]

Attachment: v2

addresses comments

Comment 3

[Mike Pinkerton (not reading bugmail)]

Comment on attachment 286192 [details] [diff] [review]
v2

sr=pink

Comment 4

[Mark Mentovai]

Checked in, cuz I gots da treez.

Comment 5

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

I checked in a bustage fix for this on the 1_5 and 1_8 branches; 10.3.x SDK requires 

#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>