Changeset 2641 in MondoRescue

Timestamp:

Jun 10, 2010, 12:05:36 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Attempt to fix problem of slowdown in filelist creation by re-introducing a limit to the find command

File:

• branches/2.2.9/mondo/src/common/libmondo-filelist.c (modified) (2 diffs)

branches/2.2.9/mondo/src/common/libmondo-filelist.c

@@ -1373 +1373 @@
           mr_free(token);
         }
+
+/**
+ * The maximum depth of directories to put in the skeleton filelist.
+ * This is a balance between performance and a good progress indicator.
+ */
+#define MAX_SKEL_DEPTH  3
+
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        mr_asprintf(&strtmp, "find '%s' -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o -fstype none -prune -o %s -type d -print > %s 2> /dev/null", dir, find_excludes, g_skeleton_filelist);
+        mr_asprintf(&strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o -fstype none -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
-        mr_asprintf(&strtmp, "find '%s' -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null", dir, find_excludes, g_skeleton_filelist);
+        mr_asprintf(&strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #endif
         paranoid_free(find_excludes);
@@ -1394 +1401 @@
         log_msg(5, "entries = %ld", g_skeleton_entries);
         percentage = 0;
-    } else  // update evalcall form if appropriate
+    } else if (depth <= MAX_SKEL_DEPTH) // update evalcall form if appropriate
     {
         sprintf(find_skeleton_marker,