summaryrefslogtreecommitdiffstats
path: root/src/Event.cpp
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-08-03 17:03:59 +0200
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-08-03 17:03:59 +0200
commitf7decf41d8d0062901cd39c42a3669a80537c7df (patch)
treed3032265df11eee6e3eaf8b4b081524bef5e72b2 /src/Event.cpp
parent2017-07-29 (diff)
downloadAltCraft-f7decf41d8d0062901cd39c42a3669a80537c7df.tar
AltCraft-f7decf41d8d0062901cd39c42a3669a80537c7df.tar.gz
AltCraft-f7decf41d8d0062901cd39c42a3669a80537c7df.tar.bz2
AltCraft-f7decf41d8d0062901cd39c42a3669a80537c7df.tar.lz
AltCraft-f7decf41d8d0062901cd39c42a3669a80537c7df.tar.xz
AltCraft-f7decf41d8d0062901cd39c42a3669a80537c7df.tar.zst
AltCraft-f7decf41d8d0062901cd39c42a3669a80537c7df.zip
Diffstat (limited to '')
-rw-r--r--src/Event.cpp129
1 files changed, 68 insertions, 61 deletions
diff --git a/src/Event.cpp b/src/Event.cpp
index ff16178..19c93f2 100644
--- a/src/Event.cpp
+++ b/src/Event.cpp
@@ -1,100 +1,107 @@
#include "Event.hpp"
#include <easylogging++.h>
-std::queue <Event> EventAgregator::eventsToHandle;
+std::queue<Event> EventAgregator::eventsToHandle;
std::mutex EventAgregator::queueMutex;
bool EventAgregator::isStarted = false;
-std::vector<EventListener*> EventAgregator::listeners;
+std::vector<EventListener *> EventAgregator::listeners;
std::mutex EventAgregator::listenersMutex;
EventListener::EventListener() {
- EventAgregator::RegisterListener(*this);
+ EventAgregator::RegisterListener(*this);
}
EventListener::~EventListener() {
- EventAgregator::UnregisterListener(*this);
+ EventAgregator::UnregisterListener(*this);
}
void EventListener::PushEvent(Event event) {
- eventsMutex.lock();
- events.push(event);
- eventsMutex.unlock();
+ eventsMutex.lock();
+ handlersMutex.lock();
+ if (handlers[event.type]) {
+ //LOG(ERROR) << "Listener notified about event " << int(event.type);
+ events.push(event);
+ }
+ handlersMutex.unlock();
+ eventsMutex.unlock();
}
bool EventListener::IsEventsQueueIsNotEmpty() {
- eventsMutex.lock();
- bool value = !events.empty();
- eventsMutex.unlock();
- return value;
+ eventsMutex.lock();
+ bool value = !events.empty();
+ eventsMutex.unlock();
+ return value;
}
void EventListener::RegisterHandler(EventType type, EventListener::HandlerFunc handler) {
+ handlersMutex.lock();
handlers[type] = handler;
+ handlersMutex.unlock();
}
void EventListener::HandleEvent() {
- eventsMutex.lock();
- if (events.empty()) {
- eventsMutex.unlock();
- return;
- }
- Event event = events.front();
- events.pop();
- eventsMutex.unlock();
- auto function = handlers[event.type];
- function(event.data);
+ eventsMutex.lock();
+ if (events.empty()) {
+ eventsMutex.unlock();
+ return;
+ }
+ Event event = events.front();
+ events.pop();
+ eventsMutex.unlock();
+ handlersMutex.lock();
+ auto function = handlers[event.type];
+ handlersMutex.unlock();
+ function(event.data);
}
-
void EventAgregator::RegisterListener(EventListener &listener) {
- listenersMutex.lock();
- LOG(WARNING)<<"Registered handler "<<&listener;
- listeners.push_back(&listener);
- listenersMutex.unlock();
+ listenersMutex.lock();
+ LOG(WARNING) << "Registered handler " << &listener;
+ listeners.push_back(&listener);
+ listenersMutex.unlock();
}
void EventAgregator::UnregisterListener(EventListener &listener) {
- listenersMutex.lock();
- LOG(WARNING)<<"Unregistered handler "<<&listener;
- listeners.erase(std::find(listeners.begin(), listeners.end(), &listener));
- listenersMutex.unlock();
+ listenersMutex.lock();
+ LOG(WARNING) << "Unregistered handler " << &listener;
+ listeners.erase(std::find(listeners.begin(), listeners.end(), &listener));
+ listenersMutex.unlock();
}
void EventAgregator::PushEvent(EventType type, EventData data) {
- Event event;
- event.type = type;
- event.data = data;
- eventsToHandle.push(event);
- if (!isStarted) {
- isStarted = true;
- std::thread(&EventAgregator::EventHandlingLoop).detach();
- }
+ Event event;
+ event.type = type;
+ event.data = data;
+ eventsToHandle.push(event);
+ if (!isStarted) {
+ isStarted = true;
+ std::thread(&EventAgregator::EventHandlingLoop).detach();
+ }
}
void EventAgregator::EventHandlingLoop() {
- while (true) {
- queueMutex.lock();
- if (!eventsToHandle.empty()) {
- auto queue = eventsToHandle;
- while (!eventsToHandle.empty())
- eventsToHandle.pop();
- queueMutex.unlock();
-
- while (!queue.empty()) {
- auto event = queue.front();
- listenersMutex.lock();
- for (auto& listener : listeners) {
- LOG(ERROR)<<"Listener notified about event";
- listener->PushEvent(event);
- }
- listenersMutex.unlock();
- queue.pop();
- }
-
- queueMutex.lock();
- }
- queueMutex.unlock();
- }
+ while (true) {
+ queueMutex.lock();
+ if (!eventsToHandle.empty()) {
+ auto queue = eventsToHandle;
+ while (!eventsToHandle.empty())
+ eventsToHandle.pop();
+ queueMutex.unlock();
+
+ while (!queue.empty()) {
+ auto event = queue.front();
+ listenersMutex.lock();
+ for (auto &listener : listeners) {
+ listener->PushEvent(event);
+ }
+ listenersMutex.unlock();
+ queue.pop();
+ }
+
+ queueMutex.lock();
+ }
+ queueMutex.unlock();
+ }
}