Files
ppsspp/Common/Thread/ParallelLoop.h
T
Henrik RydgårdandClaude Sonnet 5 973a10473a ParallelLoop: make loop tasks cancellable to avoid hang on Teardown
SimpleParallelTask/LoopRangeTask never overrode Cancellable(), so a
ThreadManager::Teardown() racing with an in-flight parallel loop would
drop them without ever calling counter_->Count(), leaving anyone
blocked in WaitableCounter::Wait() stuck forever. Cancel() now counts
down the same as a normal completion.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01L4QAoxV2KY7ek4PcZw3WvY
2026-08-09 19:03:28 +02:00

103 lines
2.6 KiB
C++

#pragma once
#include <functional>
#include <mutex>
#include <condition_variable>
#include "Common/Thread/ThreadManager.h"
// Same as the latch from C++21.
struct WaitableCounter : public Waitable {
public:
WaitableCounter(int count) : count_(count) {}
void Count() {
std::unique_lock<std::mutex> lock(mutex_);
if (count_ == 0) {
return;
}
count_--;
if (count_ == 0) {
// We were the last one to increment
cond_.notify_all();
}
}
void Wait() override {
std::unique_lock<std::mutex> lock(mutex_);
while (count_ != 0) {
cond_.wait(lock);
}
}
int count_;
std::mutex mutex_;
std::condition_variable cond_;
};
// Note that upper bounds are non-inclusive: range is [lower, upper)
WaitableCounter *ParallelRangeLoopWaitable(ThreadManager *threadMan, const std::function<void(int, int)> &loop, int lower, int upper, int minSize, TaskPriority priority);
// Note that upper bounds are non-inclusive: range is [lower, upper)
void ParallelRangeLoop(ThreadManager *threadMan, const std::function<void(int, int)> &loop, int lower, int upper, int minSize, TaskPriority priority = TaskPriority::NORMAL);
// Common utilities for large (!) memory copies.
// Will only fall back to threads if it seems to make sense.
void ParallelMemcpy(ThreadManager *threadMan, void *dst, const void *src, size_t bytes, TaskPriority priority = TaskPriority::NORMAL);
template<class T>
class SimpleParallelTask : public Task {
public:
SimpleParallelTask(WaitableCounter *counter, T func, int index, int count, TaskPriority p)
: counter_(counter), func_(func), index_(index), count_(count), priority_(p) {
}
TaskType Type() const override {
return TaskType::CPU_COMPUTE;
}
TaskPriority Priority() const override {
return priority_;
}
void Run() override {
func_(index_, count_);
counter_->Count();
}
// Cancellable so a Teardown() racing with an in-flight parallel loop still
// counts down the waiter's counter instead of leaving it blocked forever.
bool Cancellable() const override {
return true;
}
void Cancel() override {
counter_->Count();
}
T func_;
WaitableCounter *counter_;
int index_;
int count_;
const TaskPriority priority_;
};
template<class T>
WaitableCounter *RunParallel(ThreadManager *threadMan, T func, int count, TaskPriority priority = TaskPriority::NORMAL) {
if (count == 1) {
func(0, 1);
return nullptr;
}
WaitableCounter *counter = new WaitableCounter(count);
for (int i = 0; i < count; i++) {
threadMan->EnqueueTaskOnThread(i, new SimpleParallelTask<T>(counter, func, i, count, priority));
}
return counter;
}
// To wait for all tasks to finish: if (counter) counter->WaitAndRelease();