From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Joachim Schmitz" Subject: RE: [PATCH] Prefer sysconf(_SC_OPEN_MAX) over getrlimit(RLIMIT_NOFILE,...) Date: Wed, 22 Aug 2012 19:53:29 +0200 Message-ID: <003b01cd808f$0a5bf610$1f13e230$@schmitz-digital.de> References: <002301cd807f$4e19ad80$ea4d0880$@schmitz-digital.de> <7v4nnualjf.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: To: "'Junio C Hamano'" X-From: git-owner@vger.kernel.org Wed Aug 22 19:53:46 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1T4F7g-0005Zc-0F for gcvg-git-2@plane.gmane.org; Wed, 22 Aug 2012 19:53:44 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755313Ab2HVRxj (ORCPT ); Wed, 22 Aug 2012 13:53:39 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:61325 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755026Ab2HVRxh (ORCPT ); Wed, 22 Aug 2012 13:53:37 -0400 Received: from DualCore (dsdf-4d0a052e.pool.mediaWays.net [77.10.5.46]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0MaKQy-1TO6Nz3XOC-00Jt1O; Wed, 22 Aug 2012 19:53:36 +0200 In-Reply-To: <7v4nnualjf.fsf@alter.siamese.dyndns.org> X-Mailer: Microsoft Outlook 14.0 Thread-Index: AQHOiusSIXDAUa9faihh7VBbAY6g5wI3HcjRl1JN1RA= Content-Language: de X-Provags-ID: V02:K0:fh9PC/hS6Pw2cwclT7RPg0eG/CQwsuIhW85z8YzRKZU c0sAxh/IFRmA8JQ7Al6ql1ZQLsRHr4wGEiiAO6aOhNgfjcQ78R Uzspn2Bc+YLT9npbdPY+B+lbRJ8GrWlcAjeqqUoPhcw3eMb/Ou 7mO6CC3AVVnjIskcXcKLIZ09UbzjQyZr6wNK91NNCbquS+Vbj6 IzvZPI0ZhDwbaJtpUDKXQigPyI8pB/G/c6kjA8U6mGFMGSjDT1 ClpqkDqcbH6uZAz3Z+q5PVF/ymr3hNWbZMyAu4xz61k8/W/CQ2 N0y8od1Esgj8yQaT0lFHvn6zpkWqCMfmy5QkQrc2KZ+XA8TqAQ CjiagITlahPy2Ts6Ep42yZ/x//pyOrCr6ATtqMPlIfv9mr5P7T 3sTCO0g4F+CXQ== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: > From: Junio C Hamano [mailto:gitster@pobox.com] > Sent: Wednesday, August 22, 2012 7:23 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: [PATCH] Prefer sysconf(_SC_OPEN_MAX) over > getrlimit(RLIMIT_NOFILE,...) > > "Joachim Schmitz" writes: > > > Signed-off-by: Joachim Schmitz > > --- > > 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 > > Looks sane but it would be more readable to make this a small helper function, > so that we do not need to have #ifdef/#endif in the primary flow of the code. Hmm, in compat/? Worth the effort fort hat single occrence? > By the way, I noticed that you seem to be sending patches out of git, instead of > "diff -ru", which is a good sign ;-). Not quite, I'm generating them with "git format-patch origin", on the NonStop machine, but can't send email from there (a) behind a firewall and b) no email client available), so I copy/paste the resulting file into Outlook. >But all of your patches are whitespace > damaged and cannot be applied X-<. May well be Outlooks fault? How to solve?