1 From 14c8842ed8a37fecbc70d46e27b49ae929b0c85f Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
3 Date: Fri, 1 Feb 2019 15:37:44 +0100
4 Subject: [PATCH] Avoid casting from "const T&" to "void*"
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 Latest version of g++ refuse the cast
11 reinterpret_cast<void (Service::*)(void*)>(serviceFunction)
13 I made no investigation to know if the problem
14 is coming from the const or not.
16 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
18 src/server/main/include/service-thread.h | 43 ++++++++++--------------
19 1 file changed, 18 insertions(+), 25 deletions(-)
21 diff --git a/src/server/main/include/service-thread.h b/src/server/main/include/service-thread.h
22 index 964d168..92b0ec8 100644
23 --- a/src/server/main/include/service-thread.h
24 +++ b/src/server/main/include/service-thread.h
25 @@ -9,78 +94,72 @@ public:
27 while (!m_eventQueue.empty()){
28 auto front = m_eventQueue.front();
29 - delete front.eventPtr;
36 void Event(const T &event,
38 void (Service::*serviceFunction)(const T &))
40 - EventDescription description;
41 - description.serviceFunctionPtr =
42 - reinterpret_cast<void (Service::*)(void*)>(serviceFunction);
43 - description.servicePtr = servicePtr;
44 - description.eventFunctionPtr = &ServiceThread::EventCall<T>;
45 - description.eventPtr = new T(event);
46 + EventCallerBase *ec = new EventCaller<T>(event, servicePtr, serviceFunction);
48 std::lock_guard<std::mutex> lock(m_eventQueueMutex);
49 - m_eventQueue.push(description);
50 + m_eventQueue.push(ec);
52 m_waitCondition.notify_one();
57 - struct EventDescription {
58 - void (Service::*serviceFunctionPtr)(void *);
59 - Service *servicePtr;
60 - void (ServiceThread::*eventFunctionPtr)(const EventDescription &event);
61 - GenericEvent* eventPtr;
65 - void EventCall(const EventDescription &desc) {
66 - auto fun = reinterpret_cast<void (Service::*)(const T&)>(desc.serviceFunctionPtr);
67 - const T& eventLocale = *(static_cast<T*>(desc.eventPtr));
68 - (desc.servicePtr->*fun)(eventLocale);
70 + struct EventCallerBase {
71 + virtual void fire() = 0;
72 + virtual ~EventCallerBase() {}
76 + struct EventCaller : public EventCallerBase {
77 + T *event; Service *target; void (Service::*function)(const T&);
78 + EventCaller(const T &e, Service *c, void (Service::*f)(const T&)) : event(new T(e)), target(c), function(f) {}
79 + ~EventCaller() { delete event; }
80 + void fire() { (target->*function)(*event); }
83 static void ThreadLoopStatic(ServiceThread *ptr) {
89 - EventDescription description = {NULL, NULL, NULL, NULL};
90 + EventCallerBase *ec = NULL;
92 std::unique_lock<std::mutex> ulock(m_eventQueueMutex);
95 if (!m_eventQueue.empty()) {
96 - description = m_eventQueue.front();
97 + ec = m_eventQueue.front();
100 m_waitCondition.wait(ulock);
104 - if (description.eventPtr != NULL) {
106 UNHANDLED_EXCEPTION_HANDLER_BEGIN
108 - (this->*description.eventFunctionPtr)(description);
109 - delete description.eventPtr;
112 UNHANDLED_EXCEPTION_HANDLER_END
118 std::thread m_thread;
119 std::mutex m_eventQueueMutex;
120 - std::queue<EventDescription> m_eventQueue;
121 + std::queue<EventCallerBase*> m_eventQueue;
122 std::condition_variable m_waitCondition;