Skip to content

Commit

Permalink
Simplify PPU exit
Browse files Browse the repository at this point in the history
  • Loading branch information
@elad335 @Nekotekina
elad335 authored and Nekotekina committed May 25, 2021
1 parent 338dc62 commit 44f0ca0
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 105 deletions.
3 changes: 1 addition & 2 deletions rpcs3/Emu/Cell/lv2/sys_cond.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,7 @@ error_code sys_cond_signal_to(ppu_thread& ppu, u32 cond_id, u32 thread_id)

const auto cond = idm::check<lv2_obj, lv2_cond>(cond_id, [&](lv2_cond& cond) -> int
{
if (const auto cpu = idm::check_unlocked<named_thread<ppu_thread>>(thread_id);
!cpu || cpu->joiner == ppu_join_status::exited)
if (!idm::check_unlocked<named_thread<ppu_thread>>(thread_id))
{
return -1;
}
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/Cell/lv2/sys_lwcond.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ error_code _sys_lwcond_signal(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id, u6
{
cpu = idm::check_unlocked<named_thread<ppu_thread>>(static_cast<u32>(ppu_thread_id));

if (!cpu || cpu->joiner == ppu_join_status::exited)
if (!cpu)
{
return -1;
}
Expand Down
142 changes: 45 additions & 97 deletions rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,18 @@ LOG_CHANNEL(sys_ppu_thread);
// Simple structure to cleanup previous thread, because can't remove its own thread
struct ppu_thread_cleaner
{
atomic_t<u32> old_id = 0;
std::shared_ptr<void> old;

void clean(u32 new_id)
std::shared_ptr<void> clean(std::shared_ptr<void> ptr)
{
if (old_id || new_id) [[likely]]
{
if (u32 id = old_id.exchange(new_id)) [[likely]]
{
auto ppu = idm::get<named_thread<ppu_thread>>(id);
return std::exchange(old, std::move(ptr));
}

if (ppu)
{
// Join thread
(*ppu)();
}
ppu_thread_cleaner() = default;

if (!ppu || !idm::remove_verify<named_thread<ppu_thread>>(id, std::move(ppu))) [[unlikely]]
{
sys_ppu_thread.fatal("Failed to remove detached thread 0x%x", id);
}
}
}
}
ppu_thread_cleaner(const ppu_thread_cleaner&) = delete;

ppu_thread_cleaner& operator=(const ppu_thread_cleaner&) = delete;
};

bool ppu_thread_exit(ppu_thread& ppu)
Expand Down Expand Up @@ -72,6 +61,9 @@ void _sys_ppu_thread_exit(ppu_thread& ppu, u64 errorcode)

ppu_join_status old_status;
{
// Avoid cases where cleaning causes the destructor to be called inside IDM lock scope (for performance)
std::shared_ptr<void> old_ppu;

std::lock_guard lock(id_manager::g_mutex);

// Get joiner ID
Expand All @@ -93,15 +85,19 @@ void _sys_ppu_thread_exit(ppu_thread& ppu, u64 errorcode)
lv2_obj::append(idm::check_unlocked<named_thread<ppu_thread>>(static_cast<u32>(old_status)));
}

if (old_status != ppu_join_status::joinable)
{
// Remove self ID from IDM, move owning ptr
old_ppu = g_fxo->get<ppu_thread_cleaner>().clean(std::move(idm::find_unlocked<named_thread<ppu_thread>>(ppu.id)->second));
}

// Unqueue
lv2_obj::sleep(ppu);

// Remove suspend state (TODO)
ppu.state -= cpu_flag::suspend;
}

g_fxo->get<ppu_thread_cleaner>().clean(old_status == ppu_join_status::detached ? ppu.id : 0);

while (ppu.joiner == ppu_join_status::zombie && !ppu.is_stopped())
{
// Wait for termination
Expand All @@ -127,9 +123,6 @@ error_code sys_ppu_thread_join(ppu_thread& ppu, u32 thread_id, vm::ptr<u64> vptr

sys_ppu_thread.trace("sys_ppu_thread_join(thread_id=0x%x, vptr=*0x%x)", thread_id, vptr);

// Clean some detached thread (hack)
g_fxo->get<ppu_thread_cleaner>().clean(0);

auto thread = idm::get<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread) -> CellError
{
if (&ppu == &thread)
Expand Down Expand Up @@ -184,16 +177,21 @@ error_code sys_ppu_thread_join(ppu_thread& ppu, u32 thread_id, vm::ptr<u64> vptr
// Wait for cleanup
(*thread.ptr)();

if (ppu.test_stopped())
if (thread->joiner != ppu_join_status::exited)
{
// Thread aborted, log it later
ppu.state += cpu_flag::exit;
return {};
}

// Get the exit status from the register
const u64 vret = thread->gpr[3];

// Cleanup
ensure(idm::remove_verify<named_thread<ppu_thread>>(thread_id, std::move(thread.ptr)));
if (thread.ret == CELL_EAGAIN)
{
// Cleanup
ensure(idm::remove_verify<named_thread<ppu_thread>>(thread_id, std::move(thread.ptr)));
}

if (!vptr)
{
Expand All @@ -210,12 +208,11 @@ error_code sys_ppu_thread_detach(ppu_thread& ppu, u32 thread_id)

sys_ppu_thread.trace("sys_ppu_thread_detach(thread_id=0x%x)", thread_id);

// Clean some detached thread (hack)
g_fxo->get<ppu_thread_cleaner>().clean(0);
CellError result = CELL_ESRCH;

const auto thread = idm::check<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread) -> CellError
idm::withdraw<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread)
{
CellError result = thread.joiner.atomic_op([](ppu_join_status& value) -> CellError
result = thread.joiner.atomic_op([](ppu_join_status& value) -> CellError
{
if (value == ppu_join_status::zombie)
{
Expand Down Expand Up @@ -247,23 +244,13 @@ error_code sys_ppu_thread_detach(ppu_thread& ppu, u32 thread_id)
thread.joiner.notify_one();
}

return result;
});

if (!thread)
{
return CELL_ESRCH;
}

if (thread.ret && thread.ret != CELL_EAGAIN)
{
return thread.ret;
}
// Remove ID on EAGAIN
return result != CELL_EAGAIN;
}).ptr;

if (thread.ret == CELL_EAGAIN)
if (result)
{
g_fxo->get<ppu_thread_cleaner>().clean(thread_id);
g_fxo->get<ppu_thread_cleaner>().clean(0);
return result;
}

return CELL_OK;
Expand Down Expand Up @@ -293,25 +280,15 @@ error_code sys_ppu_thread_set_priority(ppu_thread& ppu, u32 thread_id, s32 prio)
return CELL_EINVAL;
}

// Clean some detached thread (hack)
g_fxo->get<ppu_thread_cleaner>().clean(0);

const auto thread = idm::check<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread)
{
if (thread.joiner == ppu_join_status::exited)
{
return false;
}

if (thread.prio != prio)
{
lv2_obj::set_priority(thread, prio);
}

return true;
});

if (!thread || !thread.ret)
if (!thread)
{
return CELL_ESRCH;
}
Expand All @@ -325,23 +302,14 @@ error_code sys_ppu_thread_get_priority(ppu_thread& ppu, u32 thread_id, vm::ptr<s

sys_ppu_thread.trace("sys_ppu_thread_get_priority(thread_id=0x%x, priop=*0x%x)", thread_id, priop);

// Clean some detached thread (hack)
g_fxo->get<ppu_thread_cleaner>().clean(0);

u32 prio;

const auto thread = idm::check<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread)
{
if (thread.joiner == ppu_join_status::exited)
{
return false;
}

prio = thread.prio;
return true;
});

if (!thread || !thread.ret)
if (!thread)
{
return CELL_ESRCH;
}
Expand Down Expand Up @@ -371,12 +339,9 @@ error_code sys_ppu_thread_stop(ppu_thread& ppu, u32 thread_id)
return CELL_ENOSYS;
}

const auto thread = idm::check<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread)
{
return thread.joiner != ppu_join_status::exited;
});
const auto thread = idm::check<named_thread<ppu_thread>>(thread_id);

if (!thread || !thread.ret)
if (!thread)
{
return CELL_ESRCH;
}
Expand Down Expand Up @@ -426,9 +391,6 @@ error_code _sys_ppu_thread_create(ppu_thread& ppu, vm::ptr<u64> thread_id, vm::p
const ppu_func_opd_t entry = param->entry.opd();
const u32 tls = param->tls;

// Clean some detached thread (hack)
g_fxo->get<ppu_thread_cleaner>().clean(0);

// Compute actual stack size and allocate
const u32 stack_size = utils::align<u32>(std::max<u32>(_stacksz, 4096), 4096);

Expand Down Expand Up @@ -490,11 +452,6 @@ error_code sys_ppu_thread_start(ppu_thread& ppu, u32 thread_id)

const auto thread = idm::get<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread) -> CellError
{
if (thread.joiner == ppu_join_status::exited)
{
return CELL_ESRCH;
}

if (!thread.state.test_and_reset(cpu_flag::stop))
{
// Already started
Expand Down Expand Up @@ -560,12 +517,9 @@ error_code sys_ppu_thread_rename(ppu_thread& ppu, u32 thread_id, vm::cptr<char>

sys_ppu_thread.warning("sys_ppu_thread_rename(thread_id=0x%x, name=*0x%x)", thread_id, name);

const auto thread = idm::get<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread)
{
return thread.joiner != ppu_join_status::exited;
});
const auto thread = idm::get<named_thread<ppu_thread>>(thread_id);

if (!thread || !thread.ret)
if (!thread)
{
return CELL_ESRCH;
}
Expand Down Expand Up @@ -593,17 +547,14 @@ error_code sys_ppu_thread_recover_page_fault(ppu_thread& ppu, u32 thread_id)

sys_ppu_thread.warning("sys_ppu_thread_recover_page_fault(thread_id=0x%x)", thread_id);

const auto thread = idm::get<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread)
{
return thread.joiner != ppu_join_status::exited;
});
const auto thread = idm::get<named_thread<ppu_thread>>(thread_id);

if (!thread || !thread.ret)
if (!thread)
{
return CELL_ESRCH;
}

return mmapper_thread_recover_page_fault(thread.ptr.get());
return mmapper_thread_recover_page_fault(thread.get());
}

error_code sys_ppu_thread_get_page_fault_context(ppu_thread& ppu, u32 thread_id, vm::ptr<sys_ppu_thread_icontext_t> ctxt)
Expand All @@ -612,12 +563,9 @@ error_code sys_ppu_thread_get_page_fault_context(ppu_thread& ppu, u32 thread_id,

sys_ppu_thread.todo("sys_ppu_thread_get_page_fault_context(thread_id=0x%x, ctxt=*0x%x)", thread_id, ctxt);

const auto thread = idm::get<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread)
{
return thread.joiner != ppu_join_status::exited;
});
const auto thread = idm::get<named_thread<ppu_thread>>(thread_id);

if (!thread || !thread.ret)
if (!thread)
{
return CELL_ESRCH;
}
Expand All @@ -626,7 +574,7 @@ error_code sys_ppu_thread_get_page_fault_context(ppu_thread& ppu, u32 thread_id,
auto& pf_events = g_fxo->get<page_fault_event_entries>();
reader_lock lock(pf_events.pf_mutex);

const auto evt = pf_events.events.find(thread.ptr.get());
const auto evt = pf_events.events.find(thread.get());
if (evt == pf_events.events.end())
{
return CELL_EINVAL;
Expand Down
7 changes: 2 additions & 5 deletions rpcs3/rpcs3qt/kernel_explorer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -555,11 +555,8 @@ void kernel_explorer::Update()
const auto func = ppu.last_function;
const ppu_thread_status status = lv2_obj::ppu_state(&ppu, false);

if (status != PPU_THREAD_STATUS_DELETED)
{
add_leaf(find_node(root, additional_nodes::ppu_threads), qstr(fmt::format(u8"PPU 0x%07x: “%s”, PRIO: %d, Joiner: %s, Status: %s, State: %s, %s func: “%s”", id, *ppu.ppu_tname.load(), +ppu.prio, ppu.joiner.load(), status, ppu.state.load()
, ppu.current_function ? "In" : "Last", func ? func : "")));
}
add_leaf(find_node(root, additional_nodes::ppu_threads), qstr(fmt::format(u8"PPU 0x%07x: “%s”, PRIO: %d, Joiner: %s, Status: %s, State: %s, %s func: “%s”", id, *ppu.ppu_tname.load(), +ppu.prio, ppu.joiner.load(), status, ppu.state.load()
, ppu.current_function ? "In" : "Last", func ? func : "")));
});

idm::select<named_thread<spu_thread>>([&](u32 /*id*/, spu_thread& spu)
Expand Down

0 comments on commit 44f0ca0

Please sign in to comment.