mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-04-20 01:48:58 +02:00
[core/hle/service] use single lambda dispatcher as opposed to spamming 48+6 tiny cold cloned capturing lambdas (#2880)
Cold clones suck This is a very insignificant change that shouldn't even affect anything except the removal of some cold clones (also it will make your backtraces a bit nicer) Signed-off-by: lizzie <lizzie@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2880 Reviewed-by: Caio Oliveira <caiooliveirafarias0@gmail.com> Reviewed-by: MaranBr <maranbr@eden-emu.dev> Co-authored-by: lizzie <lizzie@eden-emu.dev> Co-committed-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie
crueter
parent
cf9f78636a
commit
9582dfffee
2 changed files with 82 additions and 65 deletions
|
|
@ -1,3 +1,6 @@
|
||||||
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
|
@ -70,67 +73,80 @@ Services::Services(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system
|
||||||
|
|
||||||
system.GetFileSystemController().CreateFactories(*system.GetFilesystem(), false);
|
system.GetFileSystemController().CreateFactories(*system.GetFilesystem(), false);
|
||||||
|
|
||||||
// clang-format off
|
// Just a quick C++ lesson
|
||||||
kernel.RunOnHostCoreProcess("audio", [&] { Audio::LoopProcess(system); }).detach();
|
// Capturing lambdas will silently create new variables for the objects referenced via <ident> = <expr>
|
||||||
kernel.RunOnHostCoreProcess("FS", [&] { FileSystem::LoopProcess(system); }).detach();
|
// and create a `auto&` sorts of for `&`; with all your usual reference shenanigans.
|
||||||
kernel.RunOnHostCoreProcess("jit", [&] { JIT::LoopProcess(system); }).detach();
|
// Do not be confused, `std::function<>` will allocate into the heap and will do so most of the time
|
||||||
kernel.RunOnHostCoreProcess("ldn", [&] { LDN::LoopProcess(system); }).detach();
|
// The heap is where we'd expect our "stored" values to be placed at.
|
||||||
kernel.RunOnHostCoreProcess("Loader", [&] { LDR::LoopProcess(system); }).detach();
|
//
|
||||||
kernel.RunOnHostCoreProcess("nvservices", [&] { Nvidia::LoopProcess(system); }).detach();
|
// Eventually we'd need a "heapless" solution so the overhead is nil - but again a good starting point
|
||||||
kernel.RunOnHostCoreProcess("bsdsocket", [&] { Sockets::LoopProcess(system); }).detach();
|
// is removing all the cold clones ;)
|
||||||
kernel.RunOnHostCoreProcess("vi", [&, token] { VI::LoopProcess(system, token); }).detach();
|
|
||||||
|
|
||||||
kernel.RunOnGuestCoreProcess("sm", [&] { SM::LoopProcess(system); });
|
// BEGONE cold clones of lambdas, for I have merged you all into a SINGLE lambda instead of
|
||||||
kernel.RunOnGuestCoreProcess("account", [&] { Account::LoopProcess(system); });
|
// spamming lambdas like it's some kind of lambda calculus class
|
||||||
kernel.RunOnGuestCoreProcess("am", [&] { AM::LoopProcess(system); });
|
for (auto const& e : std::vector<std::pair<std::string_view, void (*)(Core::System&)>>{
|
||||||
kernel.RunOnGuestCoreProcess("aoc", [&] { AOC::LoopProcess(system); });
|
{"audio", &Audio::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("apm", [&] { APM::LoopProcess(system); });
|
{"FS", &FileSystem::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("bcat", [&] { BCAT::LoopProcess(system); });
|
{"jit", &JIT::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("bpc", [&] { BPC::LoopProcess(system); });
|
{"ldn", &LDN::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("btdrv", [&] { BtDrv::LoopProcess(system); });
|
{"Loader", &LDR::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("btm", [&] { BTM::LoopProcess(system); });
|
{"nvservices", &Nvidia::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("capsrv", [&] { Capture::LoopProcess(system); });
|
{"bsdsocket", &Sockets::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("erpt", [&] { ERPT::LoopProcess(system); });
|
})
|
||||||
kernel.RunOnGuestCoreProcess("es", [&] { ES::LoopProcess(system); });
|
kernel.RunOnHostCoreProcess(std::string(e.first), [&system, f = e.second] { f(system); }).detach();
|
||||||
kernel.RunOnGuestCoreProcess("eupld", [&] { EUPLD::LoopProcess(system); });
|
kernel.RunOnHostCoreProcess("vi", [&, token] { VI::LoopProcess(system, token); }).detach();
|
||||||
kernel.RunOnGuestCoreProcess("fatal", [&] { Fatal::LoopProcess(system); });
|
// Avoid cold clones of lambdas -- succintly
|
||||||
kernel.RunOnGuestCoreProcess("fgm", [&] { FGM::LoopProcess(system); });
|
for (auto const& e : std::vector<std::pair<std::string_view, void (*)(Core::System&)>>{
|
||||||
kernel.RunOnGuestCoreProcess("friends", [&] { Friend::LoopProcess(system); });
|
{"sm", &SM::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("settings", [&] { Set::LoopProcess(system); });
|
{"account", &Account::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("psc", [&] { PSC::LoopProcess(system); });
|
{"am", &AM::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("glue", [&] { Glue::LoopProcess(system); });
|
{"aoc", &AOC::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("grc", [&] { GRC::LoopProcess(system); });
|
{"apm", &APM::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("hid", [&] { HID::LoopProcess(system); });
|
{"bcat", &BCAT::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("lbl", [&] { LBL::LoopProcess(system); });
|
{"bpc", &BPC::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("LogManager.Prod", [&] { LM::LoopProcess(system); });
|
{"btdrv", &BtDrv::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("mig", [&] { Migration::LoopProcess(system); });
|
{"btm", &BTM::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("mii", [&] { Mii::LoopProcess(system); });
|
{"capsrv", &Capture::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("mm", [&] { MM::LoopProcess(system); });
|
{"erpt", &ERPT::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("mnpp", [&] { MNPP::LoopProcess(system); });
|
{"es", &ES::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("nvnflinger", [&] { Nvnflinger::LoopProcess(system); });
|
{"eupld", &EUPLD::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("NCM", [&] { NCM::LoopProcess(system); });
|
{"fatal", &Fatal::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("nfc", [&] { NFC::LoopProcess(system); });
|
{"fgm", &FGM::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("nfp", [&] { NFP::LoopProcess(system); });
|
{"friends", &Friend::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("ngc", [&] { NGC::LoopProcess(system); });
|
{"settings", &Set::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("nifm", [&] { NIFM::LoopProcess(system); });
|
{"psc", &PSC::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("nim", [&] { NIM::LoopProcess(system); });
|
{"glue", &Glue::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("npns", [&] { NPNS::LoopProcess(system); });
|
{"grc", &GRC::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("ns", [&] { NS::LoopProcess(system); });
|
{"hid", &HID::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("olsc", [&] { OLSC::LoopProcess(system); });
|
{"lbl", &LBL::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("omm", [&] { OMM::LoopProcess(system); });
|
{"LogManager.Prod", &LM::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("pcie", [&] { PCIe::LoopProcess(system); });
|
{"mig", &Migration::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("pctl", [&] { PCTL::LoopProcess(system); });
|
{"mii", &Mii::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("pcv", [&] { PCV::LoopProcess(system); });
|
{"mm", &MM::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("prepo", [&] { PlayReport::LoopProcess(system); });
|
{"mnpp", &MNPP::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("ProcessManager", [&] { PM::LoopProcess(system); });
|
{"nvnflinger", &Nvnflinger::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("ptm", [&] { PTM::LoopProcess(system); });
|
{"NCM", &NCM::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("ro", [&] { RO::LoopProcess(system); });
|
{"nfc", &NFC::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("spl", [&] { SPL::LoopProcess(system); });
|
{"nfp", &NFP::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("ssl", [&] { SSL::LoopProcess(system); });
|
{"ngc", &NGC::LoopProcess},
|
||||||
kernel.RunOnGuestCoreProcess("usb", [&] { USB::LoopProcess(system); });
|
{"nifm", &NIFM::LoopProcess},
|
||||||
// clang-format on
|
{"nim", &NIM::LoopProcess},
|
||||||
|
{"npns", &NPNS::LoopProcess},
|
||||||
|
{"ns", &NS::LoopProcess},
|
||||||
|
{"olsc", &OLSC::LoopProcess},
|
||||||
|
{"omm", &OMM::LoopProcess},
|
||||||
|
{"pcie", &PCIe::LoopProcess},
|
||||||
|
{"pctl", &PCTL::LoopProcess},
|
||||||
|
{"pcv", &PCV::LoopProcess},
|
||||||
|
{"prepo", &PlayReport::LoopProcess},
|
||||||
|
{"ProcessManager", &PM::LoopProcess},
|
||||||
|
{"ptm", &PTM::LoopProcess},
|
||||||
|
{"ro", &RO::LoopProcess},
|
||||||
|
{"spl", &SPL::LoopProcess},
|
||||||
|
{"ssl", &SSL::LoopProcess},
|
||||||
|
{"usb", &USB::LoopProcess}
|
||||||
|
})
|
||||||
|
kernel.RunOnGuestCoreProcess(std::string(e.first), [&system, f = e.second] { f(system); });
|
||||||
}
|
}
|
||||||
|
|
||||||
Services::~Services() = default;
|
|
||||||
|
|
||||||
} // namespace Service
|
} // namespace Service
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,6 @@
|
||||||
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
|
@ -8,15 +11,13 @@
|
||||||
|
|
||||||
namespace Service {
|
namespace Service {
|
||||||
|
|
||||||
/**
|
/// @brief The purpose of this class is to own any objects that need to be shared across the other service
|
||||||
* The purpose of this class is to own any objects that need to be shared across the other service
|
/// implementations. Will be torn down when the global system instance is shutdown.
|
||||||
* implementations. Will be torn down when the global system instance is shutdown.
|
|
||||||
*/
|
|
||||||
class Services final {
|
class Services final {
|
||||||
public:
|
public:
|
||||||
explicit Services(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system,
|
explicit Services(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system,
|
||||||
std::stop_token token);
|
std::stop_token token);
|
||||||
~Services();
|
~Services() = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Service
|
} // namespace Service
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue