Tweak thread startup

Signed-off-by: Alex Saveau <[email protected]>
suchoudh · Mar 23, 2023 · d70539b · d70539b
1 parent 23033f7
commit d70539b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/fuc_engine/src/ops/copy.rs b/fuc_engine/src/ops/copy.rs
@@ -177,15 +177,16 @@ mod compat {
                 let mut buf = [MaybeUninit::<u8>::uninit(); 8192];
                 let symlink_buf_cache = Cell::new(Vec::new());
                 for node in &tasks {
-                    let maybe_spawn = || {
-                        if available_parallelism > 0 {
+                    let mut maybe_spawn = || {
+                        if available_parallelism > 0 && !tasks.is_empty() {
                             available_parallelism -= 1;
                             threads.push(scope.spawn({
                                 let tasks = tasks.clone();
                                 || worker_thread(tasks)
                             }));
                         }
                     };
+                    maybe_spawn();
 
                     copy_dir(&node, &mut buf, &symlink_buf_cache, maybe_spawn)?;
                 }
@@ -249,6 +250,7 @@ mod compat {
                 t => t,
             };
             if file_type == FileType::Directory {
+                maybe_spawn();
                 messages
                     .send(TreeNode {
                         from: concat_cstrs(from, file.file_name()),
@@ -257,7 +259,6 @@ mod compat {
                         root_to_inode: Some(root_to_inode),
                     })
                     .map_err(|_| Error::Internal)?;
-                maybe_spawn();
             } else {
                 copy_one_file(
                     &from_dir,

diff --git a/fuc_engine/src/ops/remove.rs b/fuc_engine/src/ops/remove.rs
@@ -161,15 +161,16 @@ mod compat {
             {
                 let mut buf = [MaybeUninit::<u8>::uninit(); 8192];
                 for message in &tasks {
-                    let maybe_spawn = || {
-                        if available_parallelism > 0 {
+                    let mut maybe_spawn = || {
+                        if available_parallelism > 0 && !tasks.is_empty() {
                             available_parallelism -= 1;
                             threads.push(scope.spawn({
                                 let tasks = tasks.clone();
                                 || worker_thread(tasks)
                             }));
                         }
                     };
+                    maybe_spawn();
 
                     match message {
                         Message::Node(node) => delete_dir(node, &mut buf, maybe_spawn)?,
@@ -228,14 +229,14 @@ mod compat {
                 t => t,
             };
             if file_type == FileType::Directory {
+                maybe_spawn();
                 node.messages
                     .send(Message::Node(TreeNode {
                         path: concat_cstrs(&node.path, file.file_name()),
                         _parent: Some(node.clone()),
                         messages: node.messages.clone(),
                     }))
                     .map_err(|_| Error::Internal)?;
-                maybe_spawn();
             } else {
                 unlinkat(&dir, file.file_name(), AtFlags::empty()).map_io_err(|| {
                     format!(