From: "Joachim Schmitz" <jojo@schmitz-digital.de>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: <git@vger.kernel.org>
Subject: [PATCH] Prefer sysconf(_SC_OPEN_MAX) over getrlimit(RLIMIT_NOFILE,...)
Date: Wed, 22 Aug 2012 18:00:50 +0200 [thread overview]
Message-ID: <002301cd807f$4e19ad80$ea4d0880$@schmitz-digital.de> (raw)
Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de>
---
sha1_file.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sha1_file.c b/sha1_file.c
index af5cfbd..76714ad 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -747,6 +747,9 @@ static int open_packed_git_1(struct packed_git *p)
return error("packfile %s index unavailable", p->pack_name);
if (!pack_max_fds) {
+#ifdef _SC_OPEN_MAX
+ unsigned int max_fds = sysconf(_SC_OPEN_MAX);
+#else
struct rlimit lim;
unsigned int max_fds;
@@ -754,6 +757,7 @@ static int open_packed_git_1(struct packed_git *p)
die_errno("cannot get RLIMIT_NOFILE");
max_fds = lim.rlim_cur;
+#endif
/* Save 3 for stdin/stdout/stderr, 22 for work */
if (25 < max_fds)
--
1.7.12
next reply other threads:[~2012-08-22 16:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-22 16:00 Joachim Schmitz [this message]
2012-08-22 17:23 ` [PATCH] Prefer sysconf(_SC_OPEN_MAX) over getrlimit(RLIMIT_NOFILE,...) Junio C Hamano
2012-08-22 17:53 ` Joachim Schmitz
2012-08-22 18:07 ` Junio C Hamano
2012-08-22 18:06 ` Joachim Schmitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='002301cd807f$4e19ad80$ea4d0880$@schmitz-digital.de' \
--to=jojo@schmitz-digital.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).