From f090b30e587c7af51fde86f36c67ef139ed2ce6f Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Fri, 5 Jan 2018 18:12:13 +0300 Subject: Tried to fix deadlock --- src/Event.cpp | 33 +++++++++++++++++++-------------- src/Event.hpp | 28 ++++++++++++++++------------ src/GlobalState.cpp | 3 ++- 3 files changed, 37 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/Event.cpp b/src/Event.cpp index c857947..e8531d4 100644 --- a/src/Event.cpp +++ b/src/Event.cpp @@ -1,50 +1,55 @@ #include "Event.hpp" std::list EventSystem::listeners; -std::mutex EventSystem::listenersMutex; +std::recursive_mutex EventSystem::listenersMutex; EventListener::EventListener() { - std::lock_guard listenersLock(EventSystem::listenersMutex); + EventSystem::listenersMutex.lock(); EventSystem::listeners.push_back(this); + EventSystem::listenersMutex.unlock(); } EventListener::~EventListener() { - std::lock_guard listenersLock(EventSystem::listenersMutex); + EventSystem::listenersMutex.lock(); EventSystem::listeners.remove(this); + EventSystem::listenersMutex.unlock(); } void EventListener::HandleEvent() { - std::lock_guard lock(eventsQueueMutex); - std::lock_guard lockHandlers(handlersMutex); + mutex.lock(); Event event = events.front(); events.pop(); if (handlers[event.id]) { handlers[event.id](event); } + mutex.unlock(); } void EventListener::HandleAllEvents() { - std::lock_guard lock(eventsQueueMutex); - std::lock_guard lockHandlers(handlersMutex); + if (!NotEmpty()) + return; + + mutex.lock(); while (!events.empty()) { Event event = events.front(); events.pop(); if (handlers[event.id]) { handlers[event.id](event); } - } + } + mutex.unlock(); } bool EventListener::NotEmpty() { - std::lock_guard lock(eventsQueueMutex); - return !events.empty(); + bool ret = !events.empty(); + return ret; } void EventListener::WaitEvent() { - eventsQueueMutex.lock(); + mutex.lock(); while (events.empty()) { - eventsQueueMutex.unlock(); - eventsQueueMutex.lock(); + mutex.unlock(); + mutex.lock(); } - eventsQueueMutex.unlock(); + mutex.unlock(); } \ No newline at end of file diff --git a/src/Event.hpp b/src/Event.hpp index 752fda4..38541a1 100644 --- a/src/Event.hpp +++ b/src/Event.hpp @@ -63,8 +63,7 @@ class EventListener { using HandlerType = std::function; std::queue events; std::map handlers; - std::mutex eventsQueueMutex; - std::mutex handlersMutex; + std::recursive_mutex mutex; public: EventListener(); @@ -79,8 +78,9 @@ public: void WaitEvent(); void RegisterHandler(size_t eventId, const HandlerType &data) { - std::lock_guard lock(handlersMutex); + mutex.lock(); handlers[eventId] = data; + mutex.unlock(); } void RegisterHandler(const char *eventId, const HandlerType & data) { @@ -91,22 +91,25 @@ public: class EventSystem { friend class EventListener; static std::list listeners; - static std::mutex listenersMutex; + static std::recursive_mutex listenersMutex; public: template static void PushEvent(size_t eventId, T data) { Event event(eventId, data); - std::lock_guard listenersLock(listenersMutex); for (auto& listener : listeners) { - std::lock_guard lock(listener->eventsQueueMutex); - std::lock_guard lockHandlers(listener->handlersMutex); + //if (!listener->mutex.try_lock()) throw std::runtime_error("WHY?!"); + listener->mutex.lock(); auto it = listener->handlers.find(eventId); - if (it == listener->handlers.end()) - continue; + if (it == listener->handlers.end()) { + listener->mutex.unlock(); + continue; + } listener->events.push(event); + + listener->mutex.unlock(); } } @@ -114,16 +117,17 @@ public: static void DirectEventCall(size_t eventId, T data) { Event event(eventId, data); - std::lock_guard listenersLock(listenersMutex); + listenersMutex.lock(); for (auto & listener : listeners) { - std::lock_guard lock(listener->eventsQueueMutex); - std::lock_guard lockHandlers(listener->handlersMutex); + listener->mutex.lock(); auto it = listener->handlers.find(eventId); if (it == listener->handlers.end()) continue; it->second(event); + listener->mutex.unlock(); } + listenersMutex.unlock(); } }; diff --git a/src/GlobalState.cpp b/src/GlobalState.cpp index 2bd4943..e947e01 100644 --- a/src/GlobalState.cpp +++ b/src/GlobalState.cpp @@ -45,7 +45,7 @@ void InitEvents() { } catch (std::exception &e) { LOG(WARNING) << "Connection failed"; - PUSH_EVENT("ConnectionFailed", e.what()); + PUSH_EVENT("ConnectionFailed", std::string(e.what())); return; } LOG(INFO) << "Connected to server"; @@ -177,6 +177,7 @@ void PhysExec() { } void GsExec() { + el::Helpers::setThreadName("Game"); LoopExecutionTimeController timer(std::chrono::milliseconds(16)); while (isRunning) { -- cgit v1.2.3