nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-09-19 22:59:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

kern/sm: fix debug port output

Browse source
This commit is contained in:
Michael Scire 2020-12-10 04:06:02 -08:00
parent 1a6e003a5d
commit 6df26d674c
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libraries/libmesosphere/source/kern_k_dump_object.cpp
View file

@ -181,21 +181,22 @@ namespace ams::kern::KDumpObject {
} }
} }
} }
MESOSPHERE_RELEASE_LOG("%-9s: Handle %08x Obj=%p Cur=%3d Peak=%3d Max=%3d\n", name, handle, obj.GetPointerUnsafe(), client->GetNumSessions(), client->GetPeakSessions(), client->GetMaxSessions()); }
/* Identify any sessions. */ MESOSPHERE_RELEASE_LOG("%-9s: Handle %08x Obj=%p Cur=%3d Peak=%3d Max=%3d\n", name, handle, obj.GetPointerUnsafe(), client->GetNumSessions(), client->GetPeakSessions(), client->GetMaxSessions());
{
for (auto it = accessor.begin(); it != end && client_port_process.IsNull(); ++it) { /* Identify any sessions. */
KProcess *cur = static_cast<KProcess *>(std::addressof(*it)); {
for (size_t j = 0; j < cur->GetHandleTable().GetMaxCount(); ++j) { for (auto it = accessor.begin(); it != end; ++it) {
ams::svc::Handle cur_h = ams::svc::InvalidHandle; KProcess *cur = static_cast<KProcess *>(std::addressof(*it));
KScopedAutoObject cur_o = cur->GetHandleTable().GetObjectByIndex(std::addressof(cur_h), j); for (size_t j = 0; j < cur->GetHandleTable().GetMaxCount(); ++j) {
if (cur_o.IsNull()) { ams::svc::Handle cur_h = ams::svc::InvalidHandle;
continue; KScopedAutoObject cur_o = cur->GetHandleTable().GetObjectByIndex(std::addressof(cur_h), j);
} if (cur_o.IsNull()) {
if (auto *session = cur_o->DynamicCast<KClientSession *>(); session != nullptr && session->GetParent()->GetParent() == client) { continue;
MESOSPHERE_RELEASE_LOG(" Client %p Server %p %-12s: PID=%3lu\n", session, std::addressof(session->GetParent()->GetServerSession()), cur->GetName(), cur->GetId()); }
} if (auto *session = cur_o->DynamicCast<KClientSession *>(); session != nullptr && session->GetParent()->GetParent() == client) {
MESOSPHERE_RELEASE_LOG(" Client %p Server %p %-12s: PID=%3lu\n", session, std::addressof(session->GetParent()->GetServerSession()), cur->GetName(), cur->GetId());
} }
} }
} }

3
stratosphere/sm/source/impl/sm_service_manager.cpp
View file

@ -628,8 +628,7 @@ namespace ams::sm::impl {
/* Create mitm handles. */ /* Create mitm handles. */
{ {
os::ManagedHandle hnd, port_hnd, qry_hnd, mitm_qry_hnd; os::ManagedHandle hnd, port_hnd, qry_hnd, mitm_qry_hnd;
u64 x = 0; R_TRY(svcCreatePort(hnd.GetPointer(), port_hnd.GetPointer(), service_info->max_sessions, service_info->is_light, service_info->name.name));
R_TRY(svcCreatePort(hnd.GetPointer(), port_hnd.GetPointer(), service_info->max_sessions, service_info->is_light, reinterpret_cast<char *>(&x)));
R_TRY(svcCreateSession(qry_hnd.GetPointer(), mitm_qry_hnd.GetPointer(), 0, 0)); R_TRY(svcCreateSession(qry_hnd.GetPointer(), mitm_qry_hnd.GetPointer(), 0, 0));
/* Copy to output. */ /* Copy to output. */