From 2543e76bdd8604f65e12dcfb0fe326904a2167b8 Mon Sep 17 00:00:00 2001
From: Roman Zeyde <me@romanzey.de>
Date: Wed, 1 Jan 2025 18:45:28 +0200
Subject: [PATCH] Name scope threads properly

---
 src/index.rs | 50 ++++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/index.rs b/src/index.rs
index 87af13104..5c30d9c78 100644
--- a/src/index.rs
+++ b/src/index.rs
@@ -195,30 +195,36 @@ impl Index {
 
             let chunks = new_headers.chunks(self.batch_size);
             let index = &self; // to be moved into reader thread
-            let reader = scope.spawn(move || -> Result<()> {
-                for chunk in chunks {
-                    exit_flag.poll().with_context(|| {
-                        format!(
-                            "indexing interrupted at height: {}",
-                            chunk.first().unwrap().height()
-                        )
-                    })?;
-                    let batch = index.index_blocks(daemon, chunk)?;
-                    tx.send(batch).context("writer disconnected")?;
-                }
-                Ok(()) // `tx` is dropped, to stop the iteration on `rx`
-            });
+            let reader = thread::Builder::new()
+                .name("index_build".into())
+                .spawn_scoped(scope, move || -> Result<()> {
+                    for chunk in chunks {
+                        exit_flag.poll().with_context(|| {
+                            format!(
+                                "indexing interrupted at height: {}",
+                                chunk.first().unwrap().height()
+                            )
+                        })?;
+                        let batch = index.index_blocks(daemon, chunk)?;
+                        tx.send(batch).context("writer disconnected")?;
+                    }
+                    Ok(()) // `tx` is dropped, to stop the iteration on `rx`
+                })
+                .expect("spawn failed");
 
             let index = &self; // to be moved into writer thread
-            let writer = scope.spawn(move || {
-                let stats = &index.stats;
-                for mut batch in rx {
-                    stats.observe_duration("sort", || batch.sort()); // pre-sort to optimize DB writes
-                    stats.observe_batch(&batch);
-                    stats.observe_duration("write", || index.store.write(&batch));
-                    stats.observe_db(&index.store);
-                }
-            });
+            let writer = thread::Builder::new()
+                .name("index_write".into())
+                .spawn_scoped(scope, move || {
+                    let stats = &index.stats;
+                    for mut batch in rx {
+                        stats.observe_duration("sort", || batch.sort()); // pre-sort to optimize DB writes
+                        stats.observe_batch(&batch);
+                        stats.observe_duration("write", || index.store.write(&batch));
+                        stats.observe_db(&index.store);
+                    }
+                })
+                .expect("spawn failed");
 
             reader.join().expect("reader thread panic")?;
             writer.join().expect("writer thread panic");