From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH 5/8] get-repack --max-pack-size: write_object() takes 'limit' arg Date: Sun, 08 Apr 2007 17:03:35 -0700 Message-ID: <7v4pnq8ld4.fsf@assigned-by-dhcp.cox.net> References: <46197994.70009@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Git Mailing List To: Dana How X-From: git-owner@vger.kernel.org Mon Apr 09 02:05:52 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HahMI-00086H-Ul for gcvg-git@gmane.org; Mon, 09 Apr 2007 02:03:47 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752135AbXDIADh (ORCPT ); Sun, 8 Apr 2007 20:03:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752140AbXDIADg (ORCPT ); Sun, 8 Apr 2007 20:03:36 -0400 Received: from fed1rmmtao102.cox.net ([68.230.241.44]:56722 "EHLO fed1rmmtao102.cox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752135AbXDIADg (ORCPT ); Sun, 8 Apr 2007 20:03:36 -0400 Received: from fed1rmimpo02.cox.net ([70.169.32.72]) by fed1rmmtao102.cox.net (InterMail vM.7.05.02.00 201-2174-114-20060621) with ESMTP id <20070409000335.QLQC28911.fed1rmmtao102.cox.net@fed1rmimpo02.cox.net>; Sun, 8 Apr 2007 20:03:35 -0400 Received: from assigned-by-dhcp.cox.net ([68.5.247.80]) by fed1rmimpo02.cox.net with bizsmtp id ko3b1W00G1kojtg0000000; Sun, 08 Apr 2007 20:03:35 -0400 In-Reply-To: <46197994.70009@gmail.com> (Dana How's message of "Sun, 08 Apr 2007 16:24:04 -0700") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Dana How writes: > Accept new 'limit' argument and check against it > before each group of writes. Update delta usability rules > for possibility of delta base being in a previously- > written pack. Inline sha1write_compressed() so we know > the exact size of the written data when it needs to be compressed. > > Signed-off-by: Dana How My first reaction of open-coding sha1write_compressed() was "Ugh", but as you are removing the only user of that function, maybe this is not as bad as it looks. > @@ -407,6 +408,10 @@ static off_t write_object(struct sha1file *f, > if (revalidate_loose_object(entry, map, mapsize)) > die("corrupt loose object %s", > sha1_to_hex(entry->sha1)); > + if ( limit && mapsize + 20 >= limit ) { > + munmap(map, mapsize); > + return 0; > + } Our coding style guideline is similar to that of the kernel. No SP after '(' or before ')' in conditionals.