X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=modules%2Fevent%2Fsrc%2Fmain_event_dispatcher.cpp;fp=modules_wearable%2Fevent%2Fsrc%2Fmain_event_dispatcher.cpp;h=e63d296d4f88aa70c139f49e6f619a6e838b6469;hb=3a034abb4dca58ff0940687d8dd2b829ce2e226f;hp=c860398481d2578d5b05b59c6f37fd1bddef7d9a;hpb=58be0971049907f3166ce56a6ad509769565158f;p=framework%2Fweb%2Fwrt-commons.git

diff --git a/modules_wearable/event/src/main_event_dispatcher.cpp b/modules/event/src/main_event_dispatcher.cpp
similarity index 84%
rename from modules_wearable/event/src/main_event_dispatcher.cpp
rename to modules/event/src/main_event_dispatcher.cpp
index c860398..e63d296 100644
--- a/modules_wearable/event/src/main_event_dispatcher.cpp
+++ b/modules/event/src/main_event_dispatcher.cpp
@@ -22,7 +22,7 @@
  */
 #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>
 
@@ -55,7 +55,7 @@ MainEventDispatcher::MainEventDispatcher()
     // 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 =
@@ -82,7 +82,7 @@ MainEventDispatcher::MainEventDispatcher()
                  "Failed to register cross event handler!");
     }
 
-    LogPedantic("ECORE cross-event handler registered");
+    WrtLogD("ECORE cross-event handler registered");
 }
 
 MainEventDispatcher::~MainEventDispatcher()
@@ -90,7 +90,7 @@ 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;
@@ -114,7 +114,7 @@ void MainEventDispatcher::ResetCrossEventCallHandler()
     // 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;
@@ -134,12 +134,12 @@ void MainEventDispatcher::ResetCrossEventCallHandler()
                  "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 =
@@ -150,7 +150,7 @@ void MainEventDispatcher::StaticDeleteEvent(void *data, void *event)
 
     // 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);
@@ -161,7 +161,7 @@ Eina_Bool MainEventDispatcher::StaticDispatchEvent(void *data,
                                                    int type,
                                                    void *event)
 {
-    LogPedantic("Static ECORE dispatch event");
+    WrtLogD("Static ECORE dispatch event");
 
     MainEventDispatcher *This = static_cast<MainEventDispatcher *>(data);
     AbstractEventCall *abstractEventCall =
@@ -173,7 +173,7 @@ Eina_Bool MainEventDispatcher::StaticDispatchEvent(void *data,
 
     // Late EFL event handling
     if (g_lateMainEventDispatcher == NULL) {
-        LogPedantic("WARNING: Late EFL event dispatch!");
+        WrtLogD("WARNING: Late EFL event dispatch!");
     } else {
         This->DispatchEvent(abstractEventCall);
     }
@@ -184,7 +184,7 @@ Eina_Bool MainEventDispatcher::StaticDispatchEvent(void *data,
 
 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;
@@ -196,7 +196,7 @@ Eina_Bool MainEventDispatcher::StaticDispatchTimedEvent(void *data)
 
     // 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);
@@ -217,7 +217,7 @@ Eina_Bool MainEventDispatcher::StaticDispatchCrossInvoker(
     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;
@@ -226,7 +226,7 @@ Eina_Bool MainEventDispatcher::StaticDispatchCrossInvoker(
 
     // 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();
     }
@@ -236,13 +236,13 @@ Eina_Bool MainEventDispatcher::StaticDispatchCrossInvoker(
 
 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();
@@ -251,7 +251,7 @@ void MainEventDispatcher::DispatchEvent(AbstractEventCall *abstractEventCall)
 void MainEventDispatcher::DispatchTimedEvent(
     AbstractEventCall *abstractEventCall)
 {
-    LogPedantic("ECORE dispatch timed event");
+    WrtLogD("ECORE dispatch timed event");
 
     // Call event handler
     abstractEventCall->Call();
@@ -259,7 +259,7 @@ void MainEventDispatcher::DispatchTimedEvent(
 
 void MainEventDispatcher::DispatchCrossInvoker()
 {
-    LogPedantic("ECORE dispatch cross invoker");
+    WrtLogD("ECORE dispatch cross invoker");
 
     // Steal cross events list
     WrappedEventCallList stolenCrossEvents;
@@ -267,12 +267,11 @@ void MainEventDispatcher::DispatchCrossInvoker()
     // 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
@@ -283,33 +282,33 @@ void MainEventDispatcher::DispatchCrossInvoker()
          ++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");
     }
 }
 
@@ -318,21 +317,21 @@ void MainEventDispatcher::AddTimedEventCall(
     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");
     }
 }
 
@@ -340,7 +339,7 @@ void MainEventDispatcher::InternalAddEvent(AbstractEventCall *abstractEventCall,
                                            bool timed,
                                            double dueTime)
 {
-    LogPedantic("Adding base event");
+    WrtLogD("Adding base event");
 
     if (timed == true) {
         // Push timed event onto ecore stack
@@ -357,7 +356,7 @@ void MainEventDispatcher::InternalAddEvent(AbstractEventCall *abstractEventCall,
                      "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,
@@ -370,7 +369,7 @@ void MainEventDispatcher::InternalAddEvent(AbstractEventCall *abstractEventCall,
             ThrowMsg(Exception::AddEventFailed, "Failed to add ECORE event");
         }
 
-        LogPedantic("Wrapped event added");
+        WrtLogD("Wrapped event added");
     }
 }