From: Linus Torvalds <torvalds@linux-foundation.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Dmitry Potapov <dpotapov@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Kjetil Barvik <barvik@broadpark.no>
Subject: [PATCH 6/3] Export thread-safe version of 'has_symlink_leading_path()'
Date: Thu, 9 Jul 2009 13:48:41 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.2.01.0907091347080.3352@localhost.localdomain> (raw)
In-Reply-To: <alpine.LFD.2.01.0907091344530.3352@localhost.localdomain>
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Jul 2009 13:35:31 -0700
Subject: [PATCH 6/3] Export thread-safe version of 'has_symlink_leading_path()'
The threaded index preloading will want it, so that it can avoid
locking by simply using a per-thread symlink/directory cache.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
This just exposes a thread-safe version of the symlink checking by
allowing a caller to pass in its own local 'struct cache_def' to the
function.
No users of this yet, but the next step is trivial and obvious..
cache.h | 10 ++++++++++
symlinks.c | 21 ++++++++++-----------
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/cache.h b/cache.h
index 871c984..f1e5ede 100644
--- a/cache.h
+++ b/cache.h
@@ -744,7 +744,17 @@ struct checkout {
};
extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath);
+
+struct cache_def {
+ char path[PATH_MAX + 1];
+ int len;
+ int flags;
+ int track_flags;
+ int prefix_len_stat_func;
+};
+
extern int has_symlink_leading_path(const char *name, int len);
+extern int threaded_has_symlink_leading_path(struct cache_def *, const char *, int);
extern int has_symlink_or_noent_leading_path(const char *name, int len);
extern int has_dirs_only_path(const char *name, int len, int prefix_len);
extern void invalidate_lstat_cache(const char *name, int len);
diff --git a/symlinks.c b/symlinks.c
index 08ad353..4bdded3 100644
--- a/symlinks.c
+++ b/symlinks.c
@@ -32,13 +32,7 @@ static int longest_path_match(const char *name_a, int len_a,
return match_len;
}
-static struct cache_def {
- char path[PATH_MAX + 1];
- int len;
- int flags;
- int track_flags;
- int prefix_len_stat_func;
-} default_cache;
+static struct cache_def default_cache;
static inline void reset_lstat_cache(struct cache_def *cache)
{
@@ -217,12 +211,17 @@ void clear_lstat_cache(void)
/*
* Return non-zero if path 'name' has a leading symlink component
*/
+int threaded_has_symlink_leading_path(struct cache_def *cache, const char *name, int len)
+{
+ return lstat_cache(cache, name, len, FL_SYMLINK|FL_DIR, USE_ONLY_LSTAT) & FL_SYMLINK;
+}
+
+/*
+ * Return non-zero if path 'name' has a leading symlink component
+ */
int has_symlink_leading_path(const char *name, int len)
{
- struct cache_def *cache = &default_cache; /* FIXME */
- return lstat_cache(cache, name, len,
- FL_SYMLINK|FL_DIR, USE_ONLY_LSTAT) &
- FL_SYMLINK;
+ return threaded_has_symlink_leading_path(&default_cache, name, len);
}
/*
--
1.6.3.3.415.ga8877
next prev parent reply other threads:[~2009-07-09 20:49 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-07 0:05 Too many 'stat' calls by git-status on Windows Dmitry Potapov
2009-07-08 19:49 ` Ramsay Jones
2009-07-09 2:04 ` Linus Torvalds
2009-07-09 2:35 ` Linus Torvalds
2009-07-09 2:40 ` [PATCH 1/3] Add 'fill_directory()' helper function for directory traversal Linus Torvalds
2009-07-09 2:42 ` [PATCH 2/3] Simplify read_directory[_recursive]() arguments Linus Torvalds
2009-07-09 2:43 ` [PATCH 3/3] Avoid doing extra 'lstat()'s for d_type if we have an up-to-date cache entry Linus Torvalds
2009-07-09 8:18 ` Junio C Hamano
2009-07-09 15:52 ` Linus Torvalds
2009-07-09 16:32 ` Junio C Hamano
2009-07-09 16:59 ` Linus Torvalds
2009-07-09 18:34 ` Junio C Hamano
2009-07-09 17:13 ` Linus Torvalds
2009-07-09 17:18 ` Linus Torvalds
2009-07-09 18:37 ` Junio C Hamano
2009-07-09 18:53 ` Linus Torvalds
2009-07-09 20:44 ` [PATCH 4/3] Avoid using 'lstat()' to figure out directories Linus Torvalds
2009-07-09 20:47 ` [PATCH 5/3] Prepare symlink caching for thread-safety Linus Torvalds
2009-07-09 20:48 ` Linus Torvalds [this message]
2009-07-09 20:50 ` [PATCH 7/3] Make index preloading check the whole path to the file Linus Torvalds
2009-07-09 20:56 ` Linus Torvalds
2009-07-10 3:12 ` Junio C Hamano
2009-07-10 3:29 ` Linus Torvalds
2009-07-10 3:40 ` Linus Torvalds
2009-07-11 2:53 ` Junio C Hamano
2009-07-11 3:04 ` Linus Torvalds
2009-07-12 0:09 ` [PATCH 6/3] Export thread-safe version of 'has_symlink_leading_path()' Kjetil Barvik
2009-07-12 21:33 ` Junio C Hamano
2009-07-09 22:36 ` [PATCH 4/3] Avoid using 'lstat()' to figure out directories Paolo Bonzini
2009-07-09 23:26 ` Linus Torvalds
2009-07-09 23:52 ` Linus Torvalds
2009-07-10 0:13 ` Linus Torvalds
2009-07-09 23:37 ` Junio C Hamano
2009-07-09 21:05 ` [PATCH 3/3] Avoid doing extra 'lstat()'s for d_type if we have an up-to-date cache entry Dmitry Potapov
2009-07-09 21:52 ` Eric Blake
2009-07-09 23:30 ` [PATCH 3/3] Avoid doing extra 'lstat()'s for d_type if we have?an " Dmitry Potapov
2009-07-10 13:04 ` Dmitry Potapov
2009-07-09 23:29 ` [PATCH 3/3] Avoid doing extra 'lstat()'s for d_type if we have an " Dmitry Potapov
2009-07-09 13:50 ` Dmitry Potapov
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=alpine.LFD.2.01.0907091347080.3352@localhost.localdomain \
--to=torvalds@linux-foundation.org \
--cc=barvik@broadpark.no \
--cc=dpotapov@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.
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).