From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Elijah Newren <newren@gmail.com>
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 3/6] pathspec: cache string length when initialize pathspec
Date: Mon, 20 Sep 2010 09:21:51 +1000 [thread overview]
Message-ID: <1284938514-16663-4-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1284938514-16663-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 | 11 ++++++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/cache.h b/cache.h
index 6227ddb..045c9fc 100644
--- a/cache.h
+++ b/cache.h
@@ -495,6 +495,9 @@ extern int ie_modified(const struct index_state *, struct cache_entry *, struct
struct pathspec {
const char **raw;
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 5815b64..80b2df2 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,18 @@ 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++) {
+ pathspec->items[i].len = strlen(paths[i]);
+ }
return 0;
}
void free_pathspec(struct pathspec *pathspec)
{
- /* do nothing */
+ free(pathspec->items);
+ pathspec->items = NULL;
}
--
1.7.1.rc1.70.g788ca
next prev parent reply other threads:[~2010-09-19 23:22 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-19 23:21 [PATCH 0/6] Introduce pathspec struct Nguyễn Thái Ngọc Duy
2010-09-19 23:21 ` [PATCH 1/6] Add struct pathspec Nguyễn Thái Ngọc Duy
2010-09-27 22:19 ` Junio C Hamano
2010-09-29 6:11 ` yj2133011
2010-09-19 23:21 ` [PATCH 2/6] diff-no-index: use diff_tree_setup_paths() Nguyễn Thái Ngọc Duy
2010-09-19 23:21 ` Nguyễn Thái Ngọc Duy [this message]
2010-09-27 22:19 ` [PATCH 3/6] pathspec: cache string length when initialize pathspec Junio C Hamano
2010-09-28 1:08 ` Nguyen Thai Ngoc Duy
2010-09-19 23:21 ` [PATCH 4/6] Convert struct diff_options to use struct pathspec Nguyễn Thái Ngọc Duy
2010-09-27 22:19 ` Junio C Hamano
2010-09-19 23:21 ` [PATCH 5/6] tree_entry_interesting(): remove dependency on struct diff_options Nguyễn Thái Ngọc Duy
2010-09-27 22:20 ` Junio C Hamano
2010-09-28 22:00 ` Nguyen Thai Ngoc Duy
2010-09-19 23:21 ` [PATCH 6/6] Move tree_entry_interesting() to tree-walk.c and export it Nguyễn Thái Ngọc Duy
2010-09-20 8:31 ` [PATCH 0/6] Introduce pathspec struct Elijah Newren
2010-09-20 22:15 ` Nguyen Thai Ngoc Duy
2010-09-28 9:37 ` Junio C Hamano
2010-09-28 13:56 ` Bo Yang
2010-09-28 22:31 ` Nguyen Thai Ngoc Duy
2010-09-29 4:26 ` Junio C Hamano
2010-09-28 23:22 ` David Ripton
2010-09-29 4:29 ` Junio C Hamano
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=1284938514-16663-4-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.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).