diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:06 -0700 |
| commit | 31190841049549b5daaffeb0b9888ebed0bbfc8a (patch) | |
| tree | 541449bc9c74d2924df3922e431b1cbcdd698b75 | |
| parent | 23328344a98c530c19ffc4ee0e851a437a1e3409 (diff) | |
| parent | a0788266d310dd3f6343c7ee754106784aa1e2af (diff) | |
| download | git-31190841049549b5daaffeb0b9888ebed0bbfc8a.tar.gz git-31190841049549b5daaffeb0b9888ebed0bbfc8a.tar.xz | |
Merge branch 'js/use-sc-open-max' into maint
* js/use-sc-open-max:
sha1_file.c: introduce get_max_fd_limit() helper
| -rw-r--r-- | sha1_file.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/sha1_file.c b/sha1_file.c index af5cfbde6..915297464 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -731,6 +731,24 @@ void free_pack_by_name(const char *pack_name) } } +static unsigned int get_max_fd_limit(void) +{ +#ifdef RLIMIT_NOFILE + struct rlimit lim; + + if (getrlimit(RLIMIT_NOFILE, &lim)) + die_errno("cannot get RLIMIT_NOFILE"); + + return lim.rlim_cur; +#elif defined(_SC_OPEN_MAX) + return sysconf(_SC_OPEN_MAX); +#elif defined(OPEN_MAX) + return OPEN_MAX; +#else + return 1; /* see the caller ;-) */ +#endif +} + /* * Do not call this directly as this leaks p->pack_fd on error return; * call open_packed_git() instead. @@ -747,13 +765,7 @@ static int open_packed_git_1(struct packed_git *p) return error("packfile %s index unavailable", p->pack_name); if (!pack_max_fds) { - struct rlimit lim; - unsigned int max_fds; - - if (getrlimit(RLIMIT_NOFILE, &lim)) - die_errno("cannot get RLIMIT_NOFILE"); - - max_fds = lim.rlim_cur; + unsigned int max_fds = get_max_fd_limit(); /* Save 3 for stdin/stdout/stderr, 22 for work */ if (25 < max_fds) |