mirror of
https://github.com/odin-lang/Odin.git
synced 2026-01-02 03:02:37 +00:00
Merge pull request #1786 from Kelimion/thread_fix
Fix thread pool join.
This commit is contained in:
@@ -39,6 +39,7 @@ Pool :: struct {
|
||||
|
||||
threads: []^Thread,
|
||||
|
||||
|
||||
tasks: [dynamic]Task,
|
||||
tasks_done: [dynamic]Task,
|
||||
}
|
||||
@@ -102,8 +103,19 @@ pool_join :: proc(pool: ^Pool) {
|
||||
|
||||
yield()
|
||||
|
||||
for t in pool.threads {
|
||||
join(t)
|
||||
// Because we already stopped the pool, there's no need to take a lock here.
|
||||
|
||||
started_count: int
|
||||
for started_count < len(pool.threads) {
|
||||
started_count = 0
|
||||
for t in pool.threads {
|
||||
if .Started in t.flags {
|
||||
started_count += 1
|
||||
}
|
||||
if .Joined not_in t.flags {
|
||||
join(t)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user