verify_uptodate(): add ce_uptodate(ce) test

diff --git a/symlinks.c b/symlinks.c
index 51672868d15e9aec30b82e7c88e46368448763b6..cb255a318720c711dab34f3012da1bb1908fdac1 100644 (file)
--- a/symlinks.c
+++ b/symlinks.c
@@ -51,6 +51,11 @@ static inline void reset_lstat_cache(void)
         */
 }
 
+#define SWITCHES_BEFORE_WARNING 10
+static unsigned int cache_switches, number_of_warnings;
+static unsigned int current_cache_func, last_cache_func;
+static unsigned int total_calls;
+
 #define FL_DIR      (1 << 0)
 #define FL_NOENT    (1 << 1)
 #define FL_SYMLINK  (1 << 2)
@@ -77,6 +82,7 @@ static int lstat_cache(const char *name, int len,
        int match_flags, ret_flags, save_flags, max_len, ret;
        struct stat st;
 
+       total_calls++;
        if (cache.track_flags != track_flags ||
            cache.prefix_len_stat_func != prefix_len_stat_func) {
                /*
@@ -88,6 +94,17 @@ static int lstat_cache(const char *name, int len,
                cache.track_flags = track_flags;
                cache.prefix_len_stat_func = prefix_len_stat_func;
                match_len = last_slash = 0;
+               cache_switches++;
+               if (cache_switches > SWITCHES_BEFORE_WARNING) {
+                       if (number_of_warnings < 10 || number_of_warnings % 1000 == 0)
+                               printf("warning from %s:%d cache_switches:%u > %u "\
+                                      "(current:%u last:%u total:%u)\n",
+                                      __FILE__, __LINE__,
+                                      cache_switches, SWITCHES_BEFORE_WARNING,
+                                      current_cache_func, last_cache_func,
+                                      total_calls);
+                       number_of_warnings++;
+               }
        } else {
                /*
                 * Check to see if we have a match from the cache for
@@ -216,6 +233,8 @@ void clear_lstat_cache(void)
  */
 int has_symlink_leading_path(const char *name, int len)
 {
+       last_cache_func = current_cache_func;
+       current_cache_func = 1;
        return lstat_cache(name, len,
                           FL_SYMLINK|FL_DIR, USE_ONLY_LSTAT) &
                FL_SYMLINK;
@@ -227,6 +246,8 @@ int has_symlink_leading_path(const char *name, int len)
  */
 int has_symlink_or_noent_leading_path(const char *name, int len)
 {
+       last_cache_func = current_cache_func;
+       current_cache_func = 2;
        return lstat_cache(name, len,
                           FL_SYMLINK|FL_NOENT|FL_DIR, USE_ONLY_LSTAT) &
                (FL_SYMLINK|FL_NOENT);
@@ -241,7 +262,68 @@ int has_symlink_or_noent_leading_path(const char *name, int len)
  */
 int has_dirs_only_path(const char *name, int len, int prefix_len)
 {
+       last_cache_func = current_cache_func;
+       current_cache_func = 3;
        return lstat_cache(name, len,
                           FL_DIR|FL_FULLPATH, prefix_len) &
                FL_DIR;
 }
+
+static struct removal_def {
+       char path[PATH_MAX];
+       int len;
+} removal;
+
+static void do_remove_scheduled_dirs(int new_len)
+{
+       while (removal.len > new_len) {
+               removal.path[removal.len] = '\0';
+               if (rmdir(removal.path))
+                       break;
+               do {
+                       removal.len--;
+               } while (removal.len > new_len &&
+                        removal.path[removal.len] != '/');
+       }
+       removal.len = new_len;
+       return;
+}
+
+void schedule_dir_for_removal(const char *name, int len)
+{
+       int match_len, last_slash, i, previous_slash;
+
+       match_len = last_slash = i =
+               longest_path_match(name, len, removal.path, removal.len,
+                                  &previous_slash);
+       /* Find last slash inside 'name' */
+       while (i < len) {
+               if (name[i] == '/')
+                       last_slash = i;
+               i++;
+       }
+
+       /*
+        * If we are about to go down the directory tree, we check if
+        * we must first go upwards the tree, such that we then can
+        * remove possible empty directories as we go upwards.
+        */
+       if (match_len < last_slash && match_len < removal.len)
+               do_remove_scheduled_dirs(match_len);
+       /*
+        * If we go deeper down the directory tree, we only need to
+        * save the new path components as we go down.
+        */
+       if (match_len < last_slash) {
+               memcpy(&removal.path[match_len], &name[match_len],
+                      last_slash - match_len);
+               removal.len = last_slash;
+       }
+       return;
+}
+
+void remove_scheduled_dirs(void)
+{
+       do_remove_scheduled_dirs(0);
+       return;
+}