From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kirill Smelkov Subject: Re: [PATCH v2 14/19] tree-diff: rework diff_tree interface to be sha1 based Date: Wed, 26 Mar 2014 23:52:01 +0400 Organization: NAVYTUX.SPB.RU Message-ID: <20140326195201.GB16002@mini.zxlink> References: <0b82e2de0edee4a590e7b4165c65938aef7090f5.1393257006.git.kirr@mns.spb.ru> <20140325092215.GB3777@mini.zxlink> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kirr@mns.spb.ru, git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Mar 26 20:59:33 2014 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 1WStyz-00021K-3f for gcvg-git-2@plane.gmane.org; Wed, 26 Mar 2014 20:59:29 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756248AbaCZT7W (ORCPT ); Wed, 26 Mar 2014 15:59:22 -0400 Received: from forward13.mail.yandex.net ([95.108.130.120]:36102 "EHLO forward13.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754369AbaCZT7T (ORCPT ); Wed, 26 Mar 2014 15:59:19 -0400 X-Greylist: delayed 639 seconds by postgrey-1.27 at vger.kernel.org; Wed, 26 Mar 2014 15:59:19 EDT Received: from smtp14.mail.yandex.net (smtp14.mail.yandex.net [95.108.131.192]) by forward13.mail.yandex.net (Yandex) with ESMTP id 42AAD1424BA; Wed, 26 Mar 2014 23:48:37 +0400 (MSK) Received: from smtp14.mail.yandex.net (localhost [127.0.0.1]) by smtp14.mail.yandex.net (Yandex) with ESMTP id DBD211B6013B; Wed, 26 Mar 2014 23:48:36 +0400 (MSK) Received: from unknown (unknown [78.25.121.36]) by smtp14.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RwV2LJ6rUl-mYYGHNiL; Wed, 26 Mar 2014 23:48:34 +0400 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (Client certificate not present) X-Yandex-Uniq: 43d1b964-199a-4148-b87d-fe1b8e15bc26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=navytux.spb.ru; s=mail; t=1395863316; bh=thoOI/OuV0QYuFAH8tWnpzw9tk9pMgxiTOV/I1dwUN0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To:Organization: User-Agent; b=AUazWOCw3fEBnqAbmGy8t6Ziw8tgFtZ0zKzquThQm84XORswOwLyRBOj3eTOeshX6 J8xXmT0MC6vefAHqGOeqk6ryJzaAb9trqvgBYin85+YqPnlH3YK3PgIdRk35KnQwrK SsvlCqRJZFwKeE0ZczbrYrpNhmUYjHh9AExRGBuA= Authentication-Results: smtp14.mail.yandex.net; dkim=pass header.i=@navytux.spb.ru Received: from kirr by mini.zxlink with local (Exim 4.82) (envelope-from ) id 1WStrm-0005tC-0C; Wed, 26 Mar 2014 23:52:02 +0400 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Tue, Mar 25, 2014 at 10:46:32AM -0700, Junio C Hamano wrote: > Kirill Smelkov writes: > > > What are the downsides of "__" prefix by the way? > > Aren't these names reserved for compiler/runtime implementations? Yes, but there are precedents when people don't obey it widely and in practice everything works :) Let it be something portable anyway - how about diff_tree_sha1_low() ? So corrected patch is below. If such suffixing will be accepted, I will send follow-up patches corrected similiary. ( or please pull them from git://repo.or.cz/git/kirr.git y6/tree-diff-walk-multitree ) Thanks, Kirill ---- 8< ---- From: Kirill Smelkov Date: Mon, 24 Feb 2014 20:21:46 +0400 Subject: [PATCH v3] tree-diff: rework diff_tree interface to be sha1 based In the next commit this will allow to reduce intermediate calls, when recursing into subtrees - at that stage we know only subtree sha1, and it is natural for tree walker to start from that phase. For now we do diff_tree show_path diff_tree_sha1 diff_tree ... and the change will allow to reduce it to diff_tree show_path diff_tree Also, it will allow to omit allocating strbuf for each subtree, and just reuse the common strbuf via playing with its len. The above-mentioned improvements go in the next 2 patches. The downside is that try_to_follow_renames(), if active, we cause re-reading of 2 initial trees, which was negligible based on my timings, and which is outweighed cogently by the upsides. NOTE To keep with the current interface and semantics, I needed to rename the function from diff_tree() to diff_tree_sha1(). As diff_tree_sha1() was already used, and the function we are talking here is its more low-level helper, let's use convention for suffixing such helpers with "_low". So the final renaming is diff_tree() -> diff_tree_sha1_low() Signed-off-by: Kirill Smelkov --- Changes since v2: - renamed __diff_tree_sha1() -> diff_tree_sha1_low() as the former overlaps with reserved-for-implementation identifiers namespace. tree-diff.c | 60 ++++++++++++++++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/tree-diff.c b/tree-diff.c index f137f39..0277c5c 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -141,12 +141,17 @@ static void skip_uninteresting(struct tree_desc *t, struct strbuf *base, } } -static int diff_tree(struct tree_desc *t1, struct tree_desc *t2, - const char *base_str, struct diff_options *opt) +static int diff_tree_sha1_low(const unsigned char *old, const unsigned char *new, + const char *base_str, struct diff_options *opt) { + struct tree_desc t1, t2; + void *t1tree, *t2tree; struct strbuf base; int baselen = strlen(base_str); + t1tree = fill_tree_descriptor(&t1, old); + t2tree = fill_tree_descriptor(&t2, new); + /* Enable recursion indefinitely */ opt->pathspec.recursive = DIFF_OPT_TST(opt, RECURSIVE); @@ -159,39 +164,41 @@ static int diff_tree(struct tree_desc *t1, struct tree_desc *t2, if (diff_can_quit_early(opt)) break; if (opt->pathspec.nr) { - skip_uninteresting(t1, &base, opt); - skip_uninteresting(t2, &base, opt); + skip_uninteresting(&t1, &base, opt); + skip_uninteresting(&t2, &base, opt); } - if (!t1->size && !t2->size) + if (!t1.size && !t2.size) break; - cmp = tree_entry_pathcmp(t1, t2); + cmp = tree_entry_pathcmp(&t1, &t2); /* t1 = t2 */ if (cmp == 0) { if (DIFF_OPT_TST(opt, FIND_COPIES_HARDER) || - hashcmp(t1->entry.sha1, t2->entry.sha1) || - (t1->entry.mode != t2->entry.mode)) - show_path(&base, opt, t1, t2); + hashcmp(t1.entry.sha1, t2.entry.sha1) || + (t1.entry.mode != t2.entry.mode)) + show_path(&base, opt, &t1, &t2); - update_tree_entry(t1); - update_tree_entry(t2); + update_tree_entry(&t1); + update_tree_entry(&t2); } /* t1 < t2 */ else if (cmp < 0) { - show_path(&base, opt, t1, /*t2=*/NULL); - update_tree_entry(t1); + show_path(&base, opt, &t1, /*t2=*/NULL); + update_tree_entry(&t1); } /* t1 > t2 */ else { - show_path(&base, opt, /*t1=*/NULL, t2); - update_tree_entry(t2); + show_path(&base, opt, /*t1=*/NULL, &t2); + update_tree_entry(&t2); } } strbuf_release(&base); + free(t2tree); + free(t1tree); return 0; } @@ -206,7 +213,7 @@ static inline int diff_might_be_rename(void) !DIFF_FILE_VALID(diff_queued_diff.queue[0]->one); } -static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt) +static void try_to_follow_renames(const unsigned char *old, const unsigned char *new, const char *base, struct diff_options *opt) { struct diff_options diff_opts; struct diff_queue_struct *q = &diff_queued_diff; @@ -244,7 +251,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co diff_opts.break_opt = opt->break_opt; diff_opts.rename_score = opt->rename_score; diff_setup_done(&diff_opts); - diff_tree(t1, t2, base, &diff_opts); + diff_tree_sha1_low(old, new, base, &diff_opts); diffcore_std(&diff_opts); free_pathspec(&diff_opts.pathspec); @@ -305,23 +312,12 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base, struct diff_options *opt) { - void *tree1, *tree2; - struct tree_desc t1, t2; - unsigned long size1, size2; int retval; - tree1 = fill_tree_descriptor(&t1, old); - tree2 = fill_tree_descriptor(&t2, new); - size1 = t1.size; - size2 = t2.size; - retval = diff_tree(&t1, &t2, base, opt); - if (!*base && DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename()) { - init_tree_desc(&t1, tree1, size1); - init_tree_desc(&t2, tree2, size2); - try_to_follow_renames(&t1, &t2, base, opt); - } - free(tree1); - free(tree2); + retval = diff_tree_sha1_low(old, new, base, opt); + if (!*base && DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename()) + try_to_follow_renames(old, new, base, opt); + return retval; } -- 1.9.rc0.143.g6fd479e