Skip to content
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

Jump to bottom

kernel_explorer: Fix VM object formatting #10666

Merged
merged 8 commits into from Aug 7, 2021
Merged

kernel_explorer: Fix VM object formatting #10666

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3cd2dac
kernel_explorer: Fix VM object formatting
elad335 Aug 6, 2021
9bbef46
kernel-explorer: Fix type of tree_item_names
elad335 Aug 6, 2021
13a2aed
kernel_explorer: ?
elad335 Aug 6, 2021
413da34
kernel_explorer: Add control data ptr info (lwcond/lwmutex)
elad335 Aug 6, 2021
381e2f4
kernel_explorer: Restrict lwmutex data reading furthher
elad335 Aug 7, 2021
48027ef
Update kernel_explorer.cpp
elad335 Aug 7, 2021
12a1673
Merge branch 'master' into patch-23
Megamouse Aug 7, 2021
7e1cdfd
Merge branch 'master' into patch-23
Megamouse Aug 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions rpcs3/rpcs3qt/kernel_explorer.cpp
View file
Open in desktop
Expand Up @@ -217,7 +217,7 @@ void kernel_explorer::update()
return;
}

const std::unordered_map<u32, QString> tree_item_names =
const std::initializer_list<std::pair<u32, QString>> tree_item_names =
{
{ process_info , tr("Process Info")},

Expand All @@ -238,7 +238,7 @@ void kernel_explorer::update()
{ SYS_LWMUTEX_OBJECT , tr("Light Weight Mutexes")},
{ SYS_TIMER_OBJECT , tr("Timers")},
{ SYS_SEMAPHORE_OBJECT , tr("Semaphores")},
{ SYS_FS_FD_OBJECT , tr("File Descriptors ?")},
{ SYS_FS_FD_OBJECT , tr("File Descriptors")},
{ SYS_LWCOND_OBJECT , tr("Light Weight Condition Variables")},
{ SYS_EVENT_FLAG_OBJECT , tr("Event Flags")},

Expand Down Expand Up @@ -467,7 +467,7 @@ void kernel_explorer::update()
std::string owner_str = "unknown"; // Either invalid state or the lwmutex control data was moved from
sys_lwmutex_t lwm_data{};

if (lwm.control.try_read(lwm_data))
if (lwm.control.try_read(lwm_data) && lwm_data.sleep_queue == id)
{
switch (const u32 owner = lwm_data.vars.owner)
{
Expand All @@ -491,12 +491,12 @@ void kernel_explorer::update()
}
else
{
add_leaf(node, qstr(fmt::format(u8"LWMutex 0x%08x: “%s”, %s, Signal: %#x, Wq: %zu (Couldn't extract control data)", id, lv2_obj::name64(lwm.name), lwm.protocol, +lwm.signaled, lwm.sq.size())));
add_leaf(node, qstr(fmt::format(u8"LWMutex 0x%08x: “%s”, %s, Signal: %#x, Wq: %zu (unmapped/invalid control data at *0x%x)", id, lv2_obj::name64(lwm.name), lwm.protocol, +lwm.signaled, lwm.sq.size(), lwm.control)));
break;
}

add_leaf(node, qstr(fmt::format(u8"LWMutex 0x%08x: “%s”, %s,%s Owner: %s, Locks: %u, Signal: %#x, Wq: %zu", id, lv2_obj::name64(lwm.name), lwm.protocol,
(lwm_data.attribute & SYS_SYNC_RECURSIVE) ? " Recursive," : "", owner_str, lwm_data.recursive_count, +lwm.signaled, lwm.sq.size())));
add_leaf(node, qstr(fmt::format(u8"LWMutex 0x%08x: “%s”, %s,%s Owner: %s, Locks: %u, Signal: %#x, Control: *0x%x, Wq: %zu", id, lv2_obj::name64(lwm.name), lwm.protocol,
(lwm_data.attribute & SYS_SYNC_RECURSIVE) ? " Recursive," : "", owner_str, lwm_data.recursive_count, +lwm.signaled, lwm.control, lwm.sq.size())));
break;
}
case SYS_TIMER_OBJECT:
Expand All @@ -521,7 +521,7 @@ void kernel_explorer::update()
case SYS_LWCOND_OBJECT:
{
auto& lwc = static_cast<lv2_lwcond&>(obj);
add_leaf(node, qstr(fmt::format(u8"LWCond 0x%08x: “%s”, %s, OG LWMutex: 0x%08x, Wq: %zu", id, lv2_obj::name64(lwc.name), lwc.protocol, lwc.lwid, +lwc.waiters)));
add_leaf(node, qstr(fmt::format(u8"LWCond 0x%08x: “%s”, %s, OG LWMutex: 0x%08x, Control: *0x%x, Wq: %zu", id, lv2_obj::name64(lwc.name), lwc.protocol, lwc.lwid, lwc.control, +lwc.waiters)));
break;
}
case SYS_EVENT_FLAG_OBJECT:
Expand All @@ -542,7 +542,7 @@ void kernel_explorer::update()
{
const u32 psize = vmo.psize;
add_leaf(find_node(root, additional_nodes::virtual_memory), qstr(fmt::format("Virtual Mem 0x%08x: Virtual Size: 0x%x (%0.2f MB), Physical Size: 0x%x (%0.2f MB), Mem Container: %s", vmo.addr
, vmo.size, vmo.size * 1. / (1024 * 1024), psize, psize * 1. / (1024 * 1024))), vmo.ct->id);
, vmo.size, vmo.size * 1. / (1024 * 1024), psize, psize * 1. / (1024 * 1024), vmo.ct->id)));
});

idm::select<lv2_socket>([&](u32 id, lv2_socket& sock)
Expand Down