rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed EventHandler set in EventNotifier to shared_ptr

Browse Source
This commit is contained in:
Johannes Wendel
2019-12-06 13:12:31 +01:00
parent e6f9113b12
commit 8d4efaa463
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FlippR-Driver/include/input/EventHandler.h
View File

@@ -24,12 +24,12 @@ public:
explicit EventHandler(std::shared_ptr<InputDriver> input_driver) : explicit EventHandler(std::shared_ptr<InputDriver> input_driver) :
input_driver(std::move(input_driver)) input_driver(std::move(input_driver))
{ {
this->input_driver->register_event_handler(this); this->input_driver->register_event_handler(std::shared_ptr<EventHandler>(this));
} }
virtual ~EventHandler() virtual ~EventHandler()
{ {
this->input_driver->unregister_event_handler(this); this->input_driver->unregister_event_handler(std::shared_ptr<EventHandler>(this));
}; };
virtual void handle(flippR_driver::input::Event &event) = 0; virtual void handle(flippR_driver::input::Event &event) = 0;

4
FlippR-Driver/include/input/InputDriver.h
View File

@@ -25,9 +25,9 @@ class InputDriver {
public: public:
virtual ~InputDriver() = default; virtual ~InputDriver() = default;
virtual void register_event_handler(EventHandler *handler) = 0; virtual void register_event_handler(std::shared_ptr<EventHandler> handler) = 0;
virtual void unregister_event_handler(EventHandler *handler) = 0; virtual void unregister_event_handler(std::shared_ptr<EventHandler> handler) = 0;
virtual boost::optional<std::shared_ptr<Event>> get_event(std::string name) = 0; virtual boost::optional<std::shared_ptr<Event>> get_event(std::string name) = 0;
}; };

4
FlippR-Driver/src/input/EventNotifier.h
View File

@@ -22,8 +22,8 @@ class EventNotifier
public: public:
virtual ~EventNotifier() = default; virtual ~EventNotifier() = default;
virtual void register_event_handler(EventHandler* handler) = 0; virtual void register_event_handler(std::shared_ptr<EventHandler> handler) = 0;
virtual void unregister_event_handler(EventHandler* handler) = 0; virtual void unregister_event_handler(std::shared_ptr<EventHandler> handler) = 0;
virtual void distribute_event(const Event &event) = 0; virtual void distribute_event(const Event &event) = 0;
}; };

4
FlippR-Driver/src/input/detail/EventNotifier.cpp
View File

@@ -39,14 +39,14 @@ EventNotifier::~EventNotifier()
delete this->event_queue; delete this->event_queue;
} }
void EventNotifier::register_event_handler(EventHandler *handler) void EventNotifier::register_event_handler(std::shared_ptr<EventHandler> handler)
{ {
std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex); std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex);
this->event_handlers.insert(handler); this->event_handlers.insert(handler);
CLOG(INFO, INPUT_LOGGER) << "New Eventhandler at adress " << handler << " was registered."; CLOG(INFO, INPUT_LOGGER) << "New Eventhandler at adress " << handler << " was registered.";
} }
void EventNotifier::unregister_event_handler(EventHandler *handler) void EventNotifier::unregister_event_handler(std::shared_ptr<EventHandler> handler)
{ {
std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex); std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex);
this->event_handlers.erase(handler); this->event_handlers.erase(handler);

6
FlippR-Driver/src/input/detail/EventNotifier.h
View File

@@ -35,8 +35,8 @@ public:
explicit EventNotifier(utility::IBlockingQueue<Event> *queue); explicit EventNotifier(utility::IBlockingQueue<Event> *queue);
~EventNotifier() override; ~EventNotifier() override;
void register_event_handler(EventHandler *handler) override; void register_event_handler(std::shared_ptr<EventHandler> handler) override;
void unregister_event_handler(EventHandler *handler) override; void unregister_event_handler(std::shared_ptr<EventHandler> handler) override;
void distribute_event(const Event &event) override; void distribute_event(const Event &event) override;
@@ -45,7 +45,7 @@ private:
private: private:
utility::IBlockingQueue<Event> *event_queue; utility::IBlockingQueue<Event> *event_queue;
std::set<EventHandler *> event_handlers; std::set<std::shared_ptr<EventHandler>> event_handlers;
bool is_running; bool is_running;
std::thread notify_thread; std::thread notify_thread;

4
FlippR-Driver/src/input/detail/InputDriver.cpp
View File

@@ -22,12 +22,12 @@ event_notifier(std::move(event_notifier)), detector(std::move(detector)), events
CLOG(INFO, INPUT_LOGGER) << "Created InputDriver"; CLOG(INFO, INPUT_LOGGER) << "Created InputDriver";
} }
void InputDriver::register_event_handler(EventHandler *handler) void InputDriver::register_event_handler(std::shared_ptr<EventHandler> handler)
{ {
this->event_notifier->register_event_handler(handler); this->event_notifier->register_event_handler(handler);
} }
void InputDriver::unregister_event_handler(EventHandler *handler) void InputDriver::unregister_event_handler(std::shared_ptr<EventHandler> handler)
{ {
this->event_notifier->unregister_event_handler(handler); this->event_notifier->unregister_event_handler(handler);
} }

4
FlippR-Driver/src/input/detail/InputDriver.h
View File

@@ -27,8 +27,8 @@ class InputDriver : public input::InputDriver
public: public:
InputDriver(std::shared_ptr<EventNotifier> event_notifier, std::unique_ptr<Detector> detector, std::map<std::string, std::shared_ptr<Event>> events); InputDriver(std::shared_ptr<EventNotifier> event_notifier, std::unique_ptr<Detector> detector, std::map<std::string, std::shared_ptr<Event>> events);
void register_event_handler(EventHandler *handler) override; void register_event_handler(std::shared_ptr<EventHandler> handler) override;
void unregister_event_handler(EventHandler *handler) override; void unregister_event_handler(std::shared_ptr<EventHandler> handler) override;
boost::optional<std::shared_ptr<Event>> get_event(std::string name) override; boost::optional<std::shared_ptr<Event>> get_event(std::string name) override;