git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 03/19] pathspec: cache string length when initializing pathspec
Date: Mon, 13 Dec 2010 16:46:40 +0700	[thread overview]
Message-ID: <1292233616-27692-4-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1292233616-27692-1-git-send-email-pclouds@gmail.com>

This field will be used when tree_entry_interesting() is converted to
use struct pathspec. Currently it uses pathlens[] in struct
diff_options to avoid calculating string over and over again.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 cache.h |    3 +++
 dir.c   |   13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/cache.h b/cache.h
index 3330769..36819b6 100644
--- a/cache.h
+++ b/cache.h
@@ -496,6 +496,9 @@ extern int ie_modified(const struct index_state *, struct cache_entry *, struct
 struct pathspec {
 	const char **raw; /* get_pathspec() result, not freed by free_pathspec() */
 	int nr;
+	struct pathspec_item {
+		int len;
+	} *items;
 };
 
 extern int init_pathspec(struct pathspec *, const char **);
diff --git a/dir.c b/dir.c
index 205adc4..646c79f 100644
--- a/dir.c
+++ b/dir.c
@@ -1074,6 +1074,7 @@ int remove_path(const char *name)
 int init_pathspec(struct pathspec *pathspec, const char **paths)
 {
 	const char **p = paths;
+	int i;
 
 	memset(pathspec, 0, sizeof(*pathspec));
 	if (!p)
@@ -1082,10 +1083,20 @@ int init_pathspec(struct pathspec *pathspec, const char **paths)
 		p++;
 	pathspec->raw = paths;
 	pathspec->nr = p - paths;
+	if (!pathspec->nr)
+		return 0;
+
+	pathspec->items = xmalloc(sizeof(struct pathspec_item)*pathspec->nr);
+	for (i = 0; i < pathspec->nr; i++) {
+		struct pathspec_item *item = pathspec->items+i;
+
+		item->len = strlen(paths[i]);
+	}
 	return 0;
 }
 
 void free_pathspec(struct pathspec *pathspec)
 {
-	; /* do nothing */
+	free(pathspec->items);
+	pathspec->items = NULL;
 }
-- 
1.7.3.3.476.g10a82

  parent reply	other threads:[~2010-12-13  9:48 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-13  9:46 [PATCH 00/19] nd/struct-pathspec (or pathspec unification [1]) Nguyễn Thái Ngọc Duy
2010-12-13  9:46 ` [PATCH 01/19] Add struct pathspec Nguyễn Thái Ngọc Duy
2010-12-13 17:31   ` Thiago Farina
2010-12-14 12:50     ` Nguyen Thai Ngoc Duy
2010-12-13  9:46 ` [PATCH 02/19] diff-no-index: use diff_tree_setup_paths() Nguyễn Thái Ngọc Duy
2010-12-13  9:46 ` Nguyễn Thái Ngọc Duy [this message]
2010-12-13  9:46 ` [PATCH 04/19] Convert struct diff_options to use struct pathspec Nguyễn Thái Ngọc Duy
2010-12-13 19:00   ` Junio C Hamano
2010-12-14  5:02     ` Nguyen Thai Ngoc Duy
2010-12-13  9:46 ` [PATCH 05/19] tree_entry_interesting(): remove dependency on struct diff_options Nguyễn Thái Ngọc Duy
2010-12-13 19:11   ` Junio C Hamano
2010-12-13  9:46 ` [PATCH 06/19] Move tree_entry_interesting() to tree-walk.c and export it Nguyễn Thái Ngọc Duy
2010-12-13  9:46 ` [PATCH 07/19] glossary: define pathspec Nguyễn Thái Ngọc Duy
2010-12-13  9:46 ` [PATCH 08/19] pathspec: mark wildcard pathspecs from the beginning Nguyễn Thái Ngọc Duy
2010-12-13 18:09   ` Junio C Hamano
2010-12-13  9:46 ` [PATCH 09/19] tree-diff.c: reserve space in "base" for pathname concatenation Nguyễn Thái Ngọc Duy
2010-12-13 18:10   ` Junio C Hamano
2010-12-14  5:00     ` Nguyen Thai Ngoc Duy
2010-12-14  5:32       ` Junio C Hamano
2010-12-14  7:10         ` Nguyen Thai Ngoc Duy
2010-12-14  7:32         ` Johannes Sixt
2010-12-14  7:43           ` Nguyen Thai Ngoc Duy
2010-12-14  8:21             ` Johannes Sixt
2010-12-14 13:01               ` Nguyen Thai Ngoc Duy
2010-12-14 17:11                 ` Junio C Hamano
2010-12-13  9:46 ` [PATCH 10/19] tree_entry_interesting(): factor out most matching logic Nguyễn Thái Ngọc Duy
2010-12-13 18:10   ` Junio C Hamano
2010-12-13  9:46 ` [PATCH 11/19] tree_entry_interesting: support depth limit Nguyễn Thái Ngọc Duy
2010-12-13 18:10   ` Junio C Hamano
2010-12-14 14:44     ` Nguyen Thai Ngoc Duy
2010-12-13  9:46 ` [PATCH 12/19] tree_entry_interesting(): support wildcard matching Nguyễn Thái Ngọc Duy
2010-12-13 18:10   ` Junio C Hamano
2010-12-14 15:04     ` Nguyen Thai Ngoc Duy
2010-12-13  9:46 ` [PATCH 13/19] tree_entry_interesting(): optimize fnmatch when base is matched Nguyễn Thái Ngọc Duy
2010-12-13 18:10   ` Junio C Hamano
2010-12-13  9:46 ` [PATCH 14/19] Convert ce_path_match() use to match_pathspec() Nguyễn Thái Ngọc Duy
2010-12-13 19:31   ` Junio C Hamano
2010-12-14 15:14     ` Nguyen Thai Ngoc Duy
2010-12-13  9:46 ` [PATCH 15/19] pathspec: add match_pathspec_depth() Nguyễn Thái Ngọc Duy
2010-12-13 19:28   ` Junio C Hamano
2010-12-14  5:07     ` Nguyen Thai Ngoc Duy
2010-12-13  9:46 ` [PATCH 16/19] grep: convert to use struct pathspec Nguyễn Thái Ngọc Duy
2010-12-13  9:46 ` [PATCH 17/19] grep: use match_pathspec_depth() for cache/worktree grepping Nguyễn Thái Ngọc Duy
2010-12-13  9:46 ` [PATCH 18/19] grep: use preallocated buffer for grep_tree() Nguyễn Thái Ngọc Duy
2010-12-13  9:46 ` [PATCH 19/19] grep: drop pathspec_matches() in favor of tree_entry_interesting() Nguyễn Thái Ngọc Duy

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1292233616-27692-4-git-send-email-pclouds@gmail.com \
    --to=pclouds@gmail.com \
    --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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).