From 0e30eeb7d489a9c15f16a7eb886d91a1a0f477ff Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sebastian.thiel@icloud.com>
Date: Tue, 1 Jun 2021 11:15:27 +0800
Subject: =?UTF-8?q?See=20if=20non-overhead=20recursive=20descent=20is=20fa?=
 =?UTF-8?q?ster=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is, but the M1 issue is stronger than the few milliseconds that are
gained.
---
 Cargo.lock       |   1 +
 Cargo.toml       |   1 +
 src/aggregate.rs | 106 +++++++++++++++++++++++++++++++++++++------------------
 3 files changed, 73 insertions(+), 35 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ca3f693..6989e7c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -241,6 +241,7 @@ dependencies = [
  "open",
  "petgraph",
  "pretty_assertions",
+ "rayon",
  "tui",
  "tui-react",
  "unicode-segmentation",
diff --git a/Cargo.toml b/Cargo.toml
index 32fd77a..f6ad2ed 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,6 +35,7 @@ tui = { version = "0.15.0", optional = true, default-features = false }
 tui-react = { version = "0.15.0", optional = true }
 open = { version = "1.2.2", optional = true }
 wild = "2.0.4"
+rayon = "1.5.1"
 
 [[bin]]
 name="dua"
diff --git a/src/aggregate.rs b/src/aggregate.rs
index dacaaa7..dcddf85 100644
--- a/src/aggregate.rs
+++ b/src/aggregate.rs
@@ -55,46 +55,82 @@ pub fn aggregate(
         });
     }
 
+    rayon::ThreadPoolBuilder::new()
+        .num_threads(8)
+        .build_global()
+        .unwrap();
+    fn recursive_descent(
+        root: impl AsRef<Path>,
+        cb: impl Fn(&Path, std::fs::Metadata) + Send + Sync + Copy,
+    ) {
+        use rayon::prelude::*;
+        let root = root.as_ref();
+        match std::fs::symlink_metadata(root).map(|m| {
+            let is_dir = m.file_type().is_dir();
+            (m, is_dir)
+        }) {
+            Ok((metadata, is_dir)) => {
+                if is_dir {
+                    std::fs::read_dir(root)
+                        .map({
+                            |iter| {
+                                iter.filter_map(Result::ok)
+                                    .collect::<Vec<_>>()
+                                    .into_par_iter()
+                                    .map({ |entry| recursive_descent(entry.path(), cb) })
+                                    .for_each(|_| {})
+                            }
+                        })
+                        .unwrap_or_default()
+                } else {
+                    cb(root, metadata);
+                }
+            }
+            Err(_) => {}
+        };
+    }
+
     for path in paths.into_iter() {
         num_roots += 1;
         let mut num_bytes = 0u128;
         let mut num_errors = 0u64;
         let device_id = crossdev::init(path.as_ref())?;
-        for entry in walk_options.iter_from_path(path.as_ref()) {
-            stats.entries_traversed += 1;
-            shared_count.fetch_add(1, Ordering::Relaxed);
-            match entry {
-                Ok(entry) => {
-                    let file_size = match entry.client_state {
-                        Some(Ok(ref m))
-                            if !m.is_dir()
-                                && (walk_options.count_hard_links || inodes.add(m))
-                                && (walk_options.cross_filesystems
-                                    || crossdev::is_same_device(device_id, m)) =>
-                        {
-                            if walk_options.apparent_size {
-                                m.len()
-                            } else {
-                                entry.path().size_on_disk_fast(m).unwrap_or_else(|_| {
-                                    num_errors += 1;
-                                    0
-                                })
-                            }
-                        }
-                        Some(Ok(_)) => 0,
-                        Some(Err(_)) => {
-                            num_errors += 1;
-                            0
-                        }
-                        None => 0, // ignore directory
-                    } as u128;
-                    stats.largest_file_in_bytes = stats.largest_file_in_bytes.max(file_size);
-                    stats.smallest_file_in_bytes = stats.smallest_file_in_bytes.min(file_size);
-                    num_bytes += file_size;
-                }
-                Err(_) => num_errors += 1,
-            }
-        }
+        recursive_descent(path.as_ref(), |_path, _m| {});
+        // for entry in walk_options.iter_from_path(path.as_ref()) {
+        //     stats.entries_traversed += 1;
+        //     shared_count.fetch_add(1, Ordering::Relaxed);
+        //     match entry {
+        //         Ok(entry) => {
+        //             let file_size = match entry.client_state {
+        //                 Some(Ok(ref m))
+        //                     if !m.is_dir()
+        //                         && (walk_options.count_hard_links || inodes.add(m))
+        //                         && (walk_options.cross_filesystems
+        //                             || crossdev::is_same_device(device_id, m)) =>
+        //                 {
+        //                     if walk_options.apparent_size {
+        //                         m.len()
+        //                     } else {
+        //                         entry.path().size_on_disk_fast(m).unwrap_or_else(|_| {
+        //                             num_errors += 1;
+        //                             0
+        //                         })
+        //                     }
+        //                 }
+        //                 Some(Ok(_)) => 0,
+        //                 Some(Err(_)) => {
+        //                     num_errors += 1;
+        //                     0
+        //                 }
+        //                 None => 0, // ignore directory
+        //             } as u128;
+        //             stats.largest_file_in_bytes = stats.largest_file_in_bytes.max(file_size);
+        //             stats.smallest_file_in_bytes = stats.smallest_file_in_bytes.min(file_size);
+        //             num_bytes += file_size;
+        //         }
+        //         Err(_) => num_errors += 1,
+        //     }
+        // }
 
         if sort_by_size_in_bytes {
             aggregates.push((path.as_ref().to_owned(), num_bytes, num_errors));
-- 
cgit v1.2.3