mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-11-19 09:00:11 +01:00
[hle, service] fix errors related to race conditions triggering under SMG1 and SMG2 (#3927)
- service manager may add a service while someone else is finding it, so properly lock - nvhost doesn't properly account for the fact that iterators GET FUCKING INVALIDATED - use proper exit routine for mapping locked that failed (try/catch hell) the last two were introduced by #3858, but the first one has been present since ??? either way, remember that ankerl map has invalidated iterators upon erase/insert, so i accounted for that and SMG1 (and probably smg2) boot fine now Signed-off-by: lizzie <lizzie@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3927 Reviewed-by: crueter <crueter@eden-emu.dev> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
This commit is contained in:
parent
fee603f0b9
commit
4f4c298a39
3 changed files with 37 additions and 31 deletions
|
|
@ -67,22 +67,24 @@ public:
|
|||
Result GetServicePort(Kernel::KClientPort** out_client_port, const std::string& name);
|
||||
|
||||
template <std::derived_from<SessionRequestHandler> T>
|
||||
std::shared_ptr<T> GetService(const std::string& service_name, bool block = false) const {
|
||||
auto service = registered_services.find(service_name);
|
||||
if (service == registered_services.end() && !block) {
|
||||
LOG_DEBUG(Service, "Can't find service: {}", service_name);
|
||||
std::shared_ptr<T> GetService(const std::string& name, bool block = false) const {
|
||||
std::unique_lock l{lock};
|
||||
auto it = registered_services.find(name);
|
||||
if (it == registered_services.end() && !block) {
|
||||
LOG_DEBUG(Service, "Can't find service: {}", name);
|
||||
return nullptr;
|
||||
} else if (block) {
|
||||
using namespace std::literals::chrono_literals;
|
||||
while (service == registered_services.end()) {
|
||||
while (it == registered_services.end()) {
|
||||
l.unlock();
|
||||
Kernel::Svc::SleepThread(
|
||||
kernel.System(),
|
||||
std::chrono::duration_cast<std::chrono::nanoseconds>(100ms).count());
|
||||
service = registered_services.find(service_name);
|
||||
l.lock();
|
||||
it = registered_services.find(name);
|
||||
}
|
||||
}
|
||||
|
||||
return std::static_pointer_cast<T>(service->second());
|
||||
return std::static_pointer_cast<T>(it->second());
|
||||
}
|
||||
|
||||
void InvokeControlRequest(HLERequestContext& context);
|
||||
|
|
@ -96,7 +98,7 @@ private:
|
|||
std::unique_ptr<Controller> controller_interface;
|
||||
|
||||
/// Map of registered services, retrieved using GetServicePort.
|
||||
std::mutex lock;
|
||||
mutable std::mutex lock;
|
||||
ankerl::unordered_dense::map<std::string, SessionRequestHandlerFactory> registered_services;
|
||||
ankerl::unordered_dense::map<std::string, Kernel::KClientPort*> service_ports;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue