lstat_cache(): introduce has_dirs_only_path() function

The create_directories() function in entry.c currently calls stat()
or lstat() for each path component of the pathname 'path' each and every
time.  For the 'git checkout' command, this function is called on each
file for which we must do an update (ce->ce_flags & CE_UPDATE), so we get
lots and lots of calls.

To fix this, we make a new wrapper to the lstat_cache() function, and
call the wrapper function instead of the calls to the stat() or the
lstat() functions.  Since the paths given to the create_directories()
function, is sorted alphabetically, the new wrapper would be very
cache effective in this situation.

To support it we must update the lstat_cache() function to be able to
say that "please test the complete length of 'name'", and also to give
it the length of a prefix, where the cache should use the stat()
function instead of the lstat() function to test each path component.

Thanks to Junio C Hamano, Linus Torvalds and Rene Scharfe for valuable
comments to this patch!

Signed-off-by: Kjetil Barvik <barvik@broadpark.no>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 11181aa0079ce94bfbdb2bba77205f49aa3cbcb3..7c8c8e484259a69bdc2c75e9e820247b0df04d01 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -721,6 +721,7 @@ struct checkout {
 extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath);
 extern int has_symlink_leading_path(int len, const char *name);
 extern int has_symlink_or_noent_leading_path(int len, const char *name);
 extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath);
 extern int has_symlink_leading_path(int len, const char *name);
 extern int has_symlink_or_noent_leading_path(int len, const char *name);

+extern int has_dirs_only_path(int len, const char *name, int prefix_len);

 
 extern struct alternate_object_database {
        struct alternate_object_database *next;
 
 extern struct alternate_object_database {
        struct alternate_object_database *next;

diff --git a/entry.c b/entry.c
index aa2ee46a84033585d8e07a585610c5a697af82c2..01a683ee5dedb6c191faa5c42d694ea8cbcf08a3 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -8,35 +8,25 @@ static void create_directories(const char *path, const struct checkout *state)
        const char *slash = path;
 
        while ((slash = strchr(slash+1, '/')) != NULL) {
        const char *slash = path;
 
        while ((slash = strchr(slash+1, '/')) != NULL) {

-               struct stat st;
-               int stat_status;
-

                len = slash - path;
                memcpy(buf, path, len);
                buf[len] = 0;
 
                len = slash - path;
                memcpy(buf, path, len);
                buf[len] = 0;
 

-               if (len <= state->base_dir_len)
-                       /*
-                        * checkout-index --prefix=<dir>; <dir> is
-                        * allowed to be a symlink to an existing
-                        * directory.
-                        */
-                       stat_status = stat(buf, &st);
-               else
-                       /*
-                        * if there currently is a symlink, we would
-                        * want to replace it with a real directory.
-                        */
-                       stat_status = lstat(buf, &st);
-
-               if (!stat_status && S_ISDIR(st.st_mode))
+               /*
+                * For 'checkout-index --prefix=<dir>', <dir> is
+                * allowed to be a symlink to an existing directory,
+                * and we set 'state->base_dir_len' below, such that
+                * we test the path components of the prefix with the
+                * stat() function instead of the lstat() function.
+                */
+               if (has_dirs_only_path(len, buf, state->base_dir_len))

                        continue; /* ok, it is already a directory. */
 
                /*
                        continue; /* ok, it is already a directory. */
 
                /*

-                * We know stat_status == 0 means something exists
-                * there and this mkdir would fail, but that is an
-                * error codepath; we do not care, as we unlink and
-                * mkdir again in such a case.
+                * If this mkdir() would fail, it could be that there
+                * is already a symlink or something else exists
+                * there, therefore we then try to unlink it and try
+                * one more time to create the directory.

                 */
                if (mkdir(buf, 0777)) {
                        if (errno == EEXIST && state->force &&
                 */
                if (mkdir(buf, 0777)) {
                        if (errno == EEXIST && state->force &&

diff --git a/symlinks.c b/symlinks.c
index c69556acf8d41cf0ccf728de732356105e7df0fa..918e24ad9e76454a34ba0d958630558d55b56517 100644 (file)
--- a/symlinks.c
+++ b/symlinks.c
@@ -1,10 +1,11 @@
 #include "cache.h"
 
 static struct cache_def {
 #include "cache.h"
 
 static struct cache_def {

-       char path[PATH_MAX];
+       char path[PATH_MAX + 1];

        int len;
        int flags;
        int track_flags;
        int len;
        int flags;
        int track_flags;

+       int prefix_len_stat_func;

 } cache;
 
 /*
 } cache;
 
 /*


@@ -31,12 +32,13 @@ static inline int longest_match_lstat_cache(int len, const char *name)
        return match_len;
 }
 
        return match_len;
 }
 

-static inline void reset_lstat_cache(int track_flags)
+static inline void reset_lstat_cache(int track_flags, int prefix_len_stat_func)

 {
        cache.path[0] = '\0';
        cache.len = 0;
        cache.flags = 0;
        cache.track_flags = track_flags;
 {
        cache.path[0] = '\0';
        cache.len = 0;
        cache.flags = 0;
        cache.track_flags = track_flags;

+       cache.prefix_len_stat_func = prefix_len_stat_func;

 }
 
 #define FL_DIR      (1 << 0)
 }
 
 #define FL_DIR      (1 << 0)


@@ -44,28 +46,35 @@ static inline void reset_lstat_cache(int track_flags)
 #define FL_SYMLINK  (1 << 2)
 #define FL_LSTATERR (1 << 3)
 #define FL_ERR      (1 << 4)
 #define FL_SYMLINK  (1 << 2)
 #define FL_LSTATERR (1 << 3)
 #define FL_ERR      (1 << 4)

+#define FL_FULLPATH (1 << 5)

 
 /*
  * Check if name 'name' of length 'len' has a symlink leading
  * component, or if the directory exists and is real, or not.
  *
  * To speed up the check, some information is allowed to be cached.
 
 /*
  * Check if name 'name' of length 'len' has a symlink leading
  * component, or if the directory exists and is real, or not.
  *
  * To speed up the check, some information is allowed to be cached.

- * This can be indicated by the 'track_flags' argument.
+ * This can be indicated by the 'track_flags' argument, which also can
+ * be used to indicate that we should check the full path.
+ *
+ * The 'prefix_len_stat_func' parameter can be used to set the length
+ * of the prefix, where the cache should use the stat() function
+ * instead of the lstat() function to test each path component.

  */
 static int lstat_cache(int len, const char *name,
  */
 static int lstat_cache(int len, const char *name,

-                      int track_flags)
+                      int track_flags, int prefix_len_stat_func)

 {
        int match_len, last_slash, last_slash_dir;
 {
        int match_len, last_slash, last_slash_dir;

-       int match_flags, ret_flags, save_flags, max_len;
+       int match_flags, ret_flags, save_flags, max_len, ret;

        struct stat st;
 
        struct stat st;
 

-       if (cache.track_flags != track_flags) {
+       if (cache.track_flags != track_flags ||
+           cache.prefix_len_stat_func != prefix_len_stat_func) {

                /*
                /*

-                * As a safeguard we clear the cache if the value of
-                * track_flags does not match with the last supplied
-                * value.
+                * As a safeguard we clear the cache if the values of
+                * track_flags and/or prefix_len_stat_func does not
+                * match with the last supplied values.

                 */
                 */

-               reset_lstat_cache(track_flags);
+               reset_lstat_cache(track_flags, prefix_len_stat_func);

                match_len = last_slash = 0;
        } else {
                /*
                match_len = last_slash = 0;
        } else {
                /*


@@ -101,12 +110,17 @@ static int lstat_cache(int len, const char *name,
                        cache.path[match_len] = name[match_len];
                        match_len++;
                } while (match_len < max_len && name[match_len] != '/');
                        cache.path[match_len] = name[match_len];
                        match_len++;
                } while (match_len < max_len && name[match_len] != '/');

-               if (match_len >= max_len)
+               if (match_len >= max_len && !(track_flags & FL_FULLPATH))

                        break;
                last_slash = match_len;
                cache.path[last_slash] = '\0';
 
                        break;
                last_slash = match_len;
                cache.path[last_slash] = '\0';
 

-               if (lstat(cache.path, &st)) {
+               if (last_slash <= prefix_len_stat_func)
+                       ret = stat(cache.path, &st);
+               else
+                       ret = lstat(cache.path, &st);
+
+               if (ret) {

                        ret_flags = FL_LSTATERR;
                        if (errno == ENOENT)
                                ret_flags |= FL_NOENT;
                        ret_flags = FL_LSTATERR;
                        if (errno == ENOENT)
                                ret_flags |= FL_NOENT;


@@ -127,12 +141,12 @@ static int lstat_cache(int len, const char *name,
         * for the moment!
         */
        save_flags = ret_flags & track_flags & (FL_NOENT|FL_SYMLINK);
         * for the moment!
         */
        save_flags = ret_flags & track_flags & (FL_NOENT|FL_SYMLINK);

-       if (save_flags && last_slash > 0 && last_slash < PATH_MAX) {
+       if (save_flags && last_slash > 0 && last_slash <= PATH_MAX) {

                cache.path[last_slash] = '\0';
                cache.len = last_slash;
                cache.flags = save_flags;
        } else if (track_flags & FL_DIR &&
                cache.path[last_slash] = '\0';
                cache.len = last_slash;
                cache.flags = save_flags;
        } else if (track_flags & FL_DIR &&

-                  last_slash_dir > 0 && last_slash_dir < PATH_MAX) {
+                  last_slash_dir > 0 && last_slash_dir <= PATH_MAX) {

                /*
                 * We have a separate test for the directory case,
                 * since it could be that we have found a symlink or a
                /*
                 * We have a separate test for the directory case,
                 * since it could be that we have found a symlink or a


@@ -148,18 +162,20 @@ static int lstat_cache(int len, const char *name,
                cache.len = last_slash_dir;
                cache.flags = FL_DIR;
        } else {
                cache.len = last_slash_dir;
                cache.flags = FL_DIR;
        } else {

-               reset_lstat_cache(track_flags);
+               reset_lstat_cache(track_flags, prefix_len_stat_func);

        }
        return ret_flags;
 }
 
        }
        return ret_flags;
 }
 

+#define USE_ONLY_LSTAT  0
+

 /*
  * Return non-zero if path 'name' has a leading symlink component
  */
 int has_symlink_leading_path(int len, const char *name)
 {
        return lstat_cache(len, name,
 /*
  * Return non-zero if path 'name' has a leading symlink component
  */
 int has_symlink_leading_path(int len, const char *name)
 {
        return lstat_cache(len, name,

-                          FL_SYMLINK|FL_DIR) &
+                          FL_SYMLINK|FL_DIR, USE_ONLY_LSTAT) &

                FL_SYMLINK;
 }
 
                FL_SYMLINK;
 }
 


@@ -170,6 +186,20 @@ int has_symlink_leading_path(int len, const char *name)
 int has_symlink_or_noent_leading_path(int len, const char *name)
 {
        return lstat_cache(len, name,
 int has_symlink_or_noent_leading_path(int len, const char *name)
 {
        return lstat_cache(len, name,

-                          FL_SYMLINK|FL_NOENT|FL_DIR) &
+                          FL_SYMLINK|FL_NOENT|FL_DIR, USE_ONLY_LSTAT) &

                (FL_SYMLINK|FL_NOENT);
 }
                (FL_SYMLINK|FL_NOENT);
 }

+
+/*
+ * Return non-zero if all path components of 'name' exists as a
+ * directory.  If prefix_len > 0, we will test with the stat()
+ * function instead of the lstat() function for a prefix length of
+ * 'prefix_len', thus we then allow for symlinks in the prefix part as
+ * long as those points to real existing directories.
+ */
+int has_dirs_only_path(int len, const char *name, int prefix_len)
+{
+       return lstat_cache(len, name,
+                          FL_DIR|FL_FULLPATH, prefix_len) &
+               FL_DIR;
+}