Skip to content

ps move tracker: only create threads on demand #19377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Megamouse wants to merge 1 commit into
base: master
Choose a base branch
from
+51 −48
Open

ps move tracker: only create threads on demand #19377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 49 additions & 47 deletions rpcs3/Input/ps_move_tracker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,14 @@ ps_move_tracker<DiagnosticsEnabled>::ps_move_tracker()
m_vc_attr.red_gain = 1.0f;
m_vc_attr.green_gain = 1.0f;
m_vc_attr.blue_gain = 1.0f;

init_workers();
}

template <bool DiagnosticsEnabled>
ps_move_tracker<DiagnosticsEnabled>::~ps_move_tracker()
{
for (u32 index = 0; index < CELL_GEM_MAX_NUM; index++)
{
if (auto& worker = m_workers[index])
{
auto& thread = *worker;
thread = thread_state::aborting;
m_wake_up_workers[index].release(1);
m_wake_up_workers[index].notify_one();
thread();
}
join_worker(index);
}
}

Expand Down Expand Up @@ -139,52 +130,61 @@ void ps_move_tracker<DiagnosticsEnabled>::set_saturation_threshold(u32 index, u1
}

template <bool DiagnosticsEnabled>
void ps_move_tracker<DiagnosticsEnabled>::init_workers()
void ps_move_tracker<DiagnosticsEnabled>::init_worker(u32 index)
{
for (u32 index = 0; index < CELL_GEM_MAX_NUM; index++)
auto& worker = ::at32(m_workers, index);
if (worker) return;

worker = std::make_unique<named_thread<std::function<void()>>>(fmt::format("PS Move Worker %d", index), [this, index]()
{
if (m_workers[index])
while (thread_ctrl::state() != thread_state::aborting)
{
continue;
}
// Wait for work
m_wake_up_workers[index].wait(0);
m_wake_up_workers[index].release(0);

m_workers[index] = std::make_unique<named_thread<std::function<void()>>>(fmt::format("PS Move Worker %d", index), [this, index]()
{
while (thread_ctrl::state() != thread_state::aborting)
if (thread_ctrl::state() == thread_state::aborting)
{
// Notify that all work is done
m_workers_finished[index].release(1);
m_workers_finished[index].notify_one();

// Wait for work
m_wake_up_workers[index].wait(0);
m_wake_up_workers[index].release(0);

if (thread_ctrl::state() == thread_state::aborting)
{
break;
}

// Find contours
ps_move_info& info = m_info[index];
ps_move_info new_info = info;
process_contours(new_info, index);

if (new_info.valid)
{
info = std::move(new_info);
}
else
{
info.valid = false;
}
break;
}

// Notify one last time that all work is done
// Find contours
ps_move_info& info = m_info[index];
ps_move_info new_info = info;
process_contours(new_info, index);

if (new_info.valid)
{
info = std::move(new_info);
}
else
{
info.valid = false;
}

// Notify that all work is done
m_workers_finished[index].release(1);
m_workers_finished[index].notify_one();
});
}
}

// Notify one last time that all work is done
m_workers_finished[index].release(1);
m_workers_finished[index].notify_one();
});
}

template <bool DiagnosticsEnabled>
void ps_move_tracker<DiagnosticsEnabled>::join_worker(u32 index)
{
auto& worker = ::at32(m_workers, index);
if (!worker) return;

auto& thread = *worker;
thread = thread_state::aborting;
m_wake_up_workers[index].release(1);
m_wake_up_workers[index].notify_one();
thread();
worker.reset();
}

template <bool DiagnosticsEnabled>
Expand All @@ -204,10 +204,12 @@ void ps_move_tracker<DiagnosticsEnabled>::process_image()

if (config.active)
{
init_worker(index);
active_devices.push_back(index);
}
else
{
join_worker(index);
ps_move_info& info = m_info[index];
info.valid = false;
m_fail_count[index] = 0;
Expand Down
3 changes: 2 additions & 1 deletion rpcs3/Input/ps_move_tracker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ class ps_move_tracker

void set_image_data(const void* buf, u64 size, u32 width, u32 height, s32 format);

void init_workers();
void init_worker(u32 index);
void join_worker(u32 index);
void process_image();
void convert_image(s32 output_format);
void process_hues();
Expand Down
Loading