Merge remote-tracking branch 'origin/main' into ckmalloc

ClaytonKnittel · Nov 2, 2024 · 3909235 · 3909235
2 parents 27c428d + 6791798
commit 3909235
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/tracefile_executor.cc b/src/tracefile_executor.cc
@@ -196,7 +196,7 @@ absl::Status TracefileExecutor::ProcessTracefileMultithreaded(
     absl::Mutex queue_mutex;
     std::deque<uint64_t> queued_idxs;
 
-    std::vector<std::jthread> threads;
+    std::vector<std::thread> threads;
     threads.reserve(options.n_threads);
 
     for (uint32_t i = 0; i < options.n_threads; i++) {
@@ -215,6 +215,10 @@ absl::Status TracefileExecutor::ProcessTracefileMultithreaded(
         }
       });
     }
+
+    for (uint32_t i = 0; i < options.n_threads; i++) {
+      threads[i].join();
+    }
   }
 
   return status;