*/
#include <stddef.h>
#include <dpl/event/main_event_dispatcher.h>
-#include <dpl/log/log.h>
+#include <dpl/log/wrt_log.h>
#include <dpl/assert.h>
#include <dpl/singleton_impl.h>
// Add new global ECORE event
m_eventId = ecore_event_type_new();
- LogPedantic("ECORE event class registered: " << m_eventId);
+ WrtLogD("ECORE event class registered: %i", m_eventId);
// Register event class handler
if ((m_eventCallHandler =
"Failed to register cross event handler!");
}
- LogPedantic("ECORE cross-event handler registered");
+ WrtLogD("ECORE cross-event handler registered");
}
MainEventDispatcher::~MainEventDispatcher()
// Remove cross event handler
ecore_main_fd_handler_del(m_crossEventCallHandler);
m_crossEventCallHandler = NULL;
- LogPedantic("ECORE cross-event handler unregistered");
+ WrtLogD("ECORE cross-event handler unregistered");
// Remove m_crossEventCallInvoker
delete m_crossEventCallInvoker;
// Remove cross event handler
ecore_main_fd_handler_del(m_crossEventCallHandler);
m_crossEventCallHandler = NULL;
- LogPedantic("ECORE cross-event handler unregistered");
+ WrtLogD("ECORE cross-event handler unregistered");
// Re-allocate WaitableEvent
delete m_crossEventCallInvoker;
"Failed to register cross event handler!");
}
- LogPedantic("ECORE cross-event handler re-registered");
+ WrtLogD("ECORE cross-event handler re-registered");
}
void MainEventDispatcher::StaticDeleteEvent(void *data, void *event)
{
- LogPedantic("Static ECORE delete event handler");
+ WrtLogD("Static ECORE delete event handler");
MainEventDispatcher *This = static_cast<MainEventDispatcher *>(data);
AbstractEventCall *abstractEventCall =
// Late EFL event handling
if (g_lateMainEventDispatcher == NULL) {
- LogPedantic("WARNING: Late EFL event delete!");
+ WrtLogD("WARNING: Late EFL event delete!");
delete abstractEventCall;
} else {
This->DeleteEvent(abstractEventCall);
int type,
void *event)
{
- LogPedantic("Static ECORE dispatch event");
+ WrtLogD("Static ECORE dispatch event");
MainEventDispatcher *This = static_cast<MainEventDispatcher *>(data);
AbstractEventCall *abstractEventCall =
// Late EFL event handling
if (g_lateMainEventDispatcher == NULL) {
- LogPedantic("WARNING: Late EFL event dispatch!");
+ WrtLogD("WARNING: Late EFL event dispatch!");
} else {
This->DispatchEvent(abstractEventCall);
}
Eina_Bool MainEventDispatcher::StaticDispatchTimedEvent(void *data)
{
- LogPedantic("Static ECORE dispatch timed event");
+ WrtLogD("Static ECORE dispatch timed event");
TimedEventStruct *timedEventStruct = static_cast<TimedEventStruct *>(data);
MainEventDispatcher *This = timedEventStruct->This;
// Late EFL event handling
if (g_lateMainEventDispatcher == NULL) {
- LogPedantic("WARNING: Late EFL timed event dispatch!");
+ WrtLogD("WARNING: Late EFL timed event dispatch!");
} else {
// Dispatch timed event
This->DispatchEvent(abstractEventCall);
Ecore_Fd_Handler *
fd_handler)
{
- LogPedantic("Static ECORE dispatch cross invoker");
+ WrtLogD("Static ECORE dispatch cross invoker");
MainEventDispatcher *This = static_cast<MainEventDispatcher *>(data);
(void)fd_handler;
// Late EFL event handling
if (g_lateMainEventDispatcher == NULL) {
- LogPedantic("WARNING: Late EFL cross invoker dispatch!");
+ WrtLogD("WARNING: Late EFL cross invoker dispatch!");
} else {
This->DispatchCrossInvoker();
}
void MainEventDispatcher::DeleteEvent(AbstractEventCall *abstractEventCall)
{
- LogPedantic("ECORE delete event");
+ WrtLogD("ECORE delete event");
delete abstractEventCall;
}
void MainEventDispatcher::DispatchEvent(AbstractEventCall *abstractEventCall)
{
- LogPedantic("ECORE dispatch event");
+ WrtLogD("ECORE dispatch event");
// Call event handler
abstractEventCall->Call();
void MainEventDispatcher::DispatchTimedEvent(
AbstractEventCall *abstractEventCall)
{
- LogPedantic("ECORE dispatch timed event");
+ WrtLogD("ECORE dispatch timed event");
// Call event handler
abstractEventCall->Call();
void MainEventDispatcher::DispatchCrossInvoker()
{
- LogPedantic("ECORE dispatch cross invoker");
+ WrtLogD("ECORE dispatch cross invoker");
// Steal cross events list
WrappedEventCallList stolenCrossEvents;
// Critical section
{
m_crossEventCallInvoker->Reset();
- Mutex::ScopedLock lock(&m_crossEventCallMutex);
+ std::lock_guard<std::mutex> lock(m_crossEventCallMutex);
m_wrappedCrossEventCallList.swap(stolenCrossEvents);
}
- LogPedantic(
- "Cross-thread event list stolen. Number of events: " <<
+ WrtLogD("Cross-thread event list stolen. Number of events: %i",
stolenCrossEvents.size());
// Repush all stolen events
++eventIterator)
{
// Unwrap events
- LogPedantic("Dispatching event from invoker");
+ WrtLogD("Dispatching event from invoker");
InternalAddEvent(eventIterator->abstractEventCall,
eventIterator->timed,
eventIterator->dueTime);
}
- LogPedantic("Cross-thread events dispatched");
+ WrtLogD("Cross-thread events dispatched");
}
void MainEventDispatcher::AddEventCall(AbstractEventCall *abstractEventCall)
{
if (pthread_equal(pthread_self(), g_threadMain)) {
- LogPedantic("Main thread ECORE event push");
+ WrtLogD("Main thread ECORE event push");
InternalAddEvent(abstractEventCall, false, 0.0);
} else {
- LogPedantic("Cross-thread ECORE event push");
+ WrtLogD("Cross-thread ECORE event push");
// Push event to cross event list
{
- Mutex::ScopedLock lock(&m_crossEventCallMutex);
+ std::lock_guard<std::mutex> lock(m_crossEventCallMutex);
m_wrappedCrossEventCallList.push_back(WrappedEventCall(
abstractEventCall, false,
0.0));
m_crossEventCallInvoker->Signal();
}
- LogPedantic("Event pushed to cross-thread event list");
+ WrtLogD("Event pushed to cross-thread event list");
}
}
double dueTime)
{
if (pthread_equal(pthread_self(), g_threadMain)) {
- LogPedantic("Main thread timed ECORE event push");
+ WrtLogD("Main thread timed ECORE event push");
InternalAddEvent(abstractEventCall, true, dueTime);
} else {
- LogPedantic("Cross-thread timed ECORE event push");
+ WrtLogD("Cross-thread timed ECORE event push");
// Push event to cross event list
{
- Mutex::ScopedLock lock(&m_crossEventCallMutex);
+ std::lock_guard<std::mutex> lock(m_crossEventCallMutex);
m_wrappedCrossEventCallList.push_back(WrappedEventCall(
abstractEventCall, true,
dueTime));
m_crossEventCallInvoker->Signal();
}
- LogPedantic("Event pushed to cross-thread event list");
+ WrtLogD("Event pushed to cross-thread event list");
}
}
bool timed,
double dueTime)
{
- LogPedantic("Adding base event");
+ WrtLogD("Adding base event");
if (timed == true) {
// Push timed event onto ecore stack
"Failed to add ECORE timed event");
}
- LogPedantic("Timed wrapped event added");
+ WrtLogD("Timed wrapped event added");
} else {
// Push immediate event onto ecore stack
Ecore_Event *event = ecore_event_add(m_eventId,
ThrowMsg(Exception::AddEventFailed, "Failed to add ECORE event");
}
- LogPedantic("Wrapped event added");
+ WrtLogD("Wrapped event added");
}
}