Make additional log for debugging

Change-Id: I4717efd16dbcfef7ec27a98d69dc03eca12f9774
Signed-off-by: Suyeon Hwang <stom.hwang@samsung.com>

diff --git a/src/mmimgr/iu/VoiceTouchEngine.cpp b/src/mmimgr/iu/VoiceTouchEngine.cpp
index 673d4b35e1c6a0936550226f3f2014c286150d09..2931dd2685c5b9940b8425b8e421c9012b69cfe1 100644 (file)
--- a/src/mmimgr/iu/VoiceTouchEngine.cpp
+++ b/src/mmimgr/iu/VoiceTouchEngine.cpp
@@ -110,7 +110,7 @@ VoiceTouchEngine::~VoiceTouchEngine()
 
 void VoiceTouchEngine::InitializeMembers()
 {
-       _I("[VoiceTouchEngine] Initialize all members");
+       _I("[VoiceTouchEngine] Initialize all members related with voice touch behavior");
        __touchModality.timestamp = -1;
        __touchModality.mode = MMI_VOICE_TOUCH_MODE_TOOLTIP;
        __touchModality.object_id = nullptr;
@@ -141,12 +141,14 @@ void VoiceTouchEngine::InitializeMembers()
 
 void VoiceTouchEngine::setDisplayInfo(int width, int height)
 {
+       _I("[VoiceTouchEngine] Set display information. w(%d), h(%d)", width, height);
        __displayWidth = width;
        __displayHeight = height;
 }
 
 void VoiceTouchEngine::setGridConfig(int numX, int numY, int step)
 {
+       _I("[VoiceTouchEngine] Set grid configuration. num of X(%d), num of Y(%d), step(%d)", numX, numY, step);
        __gridX[step] = numX;
        __gridY[step] = numY;
 }
@@ -155,23 +157,24 @@ long VoiceTouchEngine::getCurrentTimestamp()
 {
        auto currentTime = chrono::steady_clock::now();
        long timestamp = chrono::time_point_cast<chrono::milliseconds>(currentTime).time_since_epoch().count();
+       _D("[VoiceTouchEngine] current timestamp(%ld)", timestamp);
 
        return timestamp;
 }
 
 bool VoiceTouchEngine::setInputModalityData(int modalityType, void *data)
 {
-       _I("[VoiceTouchEngine] Set input modality data");
+       _I("[VoiceTouchEngine] Set input modality data. type(%d)", modalityType);
 
        if (modalityType == MMI_PROVIDER_EVENT_VOICE) {
-               _I("[VoiceTouchEngine] Voice modality");
+               _D("[VoiceTouchEngine] Voice modality");
                mmi_provider_event_voice *event = static_cast<mmi_provider_event_voice *>(data);
 
                return handleVoiceInput(event);
        }
 
        if (modalityType == MMI_PROVIDER_EVENT_SCREEN_ANALYZER) {
-               _I("[VoiceTouchEngine] Screen analyzer modality");
+               _D("[VoiceTouchEngine] Screen analyzer modality");
                mmi_provider_event_screen_analyzer *event = static_cast<mmi_provider_event_screen_analyzer *>(data);
 
                return handleScreenAnalyzerInput(event);
@@ -189,9 +192,10 @@ static void __refresh_screen_inform_event_free(void *data EINA_UNUSED, void *eve
 
 static void __invoke_event_for_refreshing_window()
 {
+       _I("[VoiceTouchEngine] Invoke window refresh event");
        mmi_event_refresh_screen_inform *ev = (mmi_event_refresh_screen_inform *)calloc(1, sizeof(mmi_event_refresh_screen_inform));
        if (ev == NULL) {
-               LOGE("mmi_event_refresh_screen_inform malloc failed");
+               _E("mmi_event_refresh_screen_inform malloc failed");
                return;
        }
 
@@ -201,7 +205,6 @@ static void __invoke_event_for_refreshing_window()
 
 bool VoiceTouchEngine::handleVoiceInput(mmi_provider_event_voice *voiceEvent)
 {
-       _I("[VoiceTouchEngine] Voice modality");
        if (voiceEvent == nullptr) {
                _E("[VoiceTouchEngine] Parameter is null");
                return false;
@@ -237,6 +240,7 @@ bool VoiceTouchEngine::handleVoiceInput(mmi_provider_event_voice *voiceEvent)
        }
 
        if (preDefinedCommand == __PRE_DEFINED_REQUEST_TURNING_OFF) {
+               _I("[VoiceTouchEngine] Request to turning off the client");
                JsonProvider finishProvider;
                finishProvider.setInputEvent(MMI_KEY_VOICE_TOUCH);
                setTurnOffEventResult(timestamp, finishProvider);
@@ -248,6 +252,8 @@ bool VoiceTouchEngine::handleVoiceInput(mmi_provider_event_voice *voiceEvent)
        auto operationIterator = __OPERATION_REQUEST.find(preDefinedCommand);
        if (operationIterator != __OPERATION_REQUEST.end()) {
                int operation = operationIterator->second;
+               _I("[VoiceTouchEngine] Request pre-defined operaion. operation(%d)", operation);
+
                setAndSendPreDefinedCommandResult(timestamp, operation);
                makeOperation(timestamp, operation);
                invokeOutputModalityCallback(&__touchModality);
@@ -346,6 +352,7 @@ Eina_Bool VoiceTouchEngine::findCommandCallback(void *data)
        engine->invokeOutputResultCallback(provider.jsonToString());
 
        if (command == nullptr) {
+               _E("[VoiceTouchEngine] Fail to find command");
                return ECORE_CALLBACK_CANCEL;
        }
 
@@ -698,6 +705,7 @@ void VoiceTouchEngine::iterateObjectCallback(gpointer data, gpointer userData)
 void VoiceTouchEngine::invokeOutputResultCallback(std::string outputResult)
 {
        if (__outputResultCallback == nullptr) {
+               _W("[VoiceTouchEngine] output result callback is not set. Please check it");
                return;
        }
 
@@ -708,6 +716,7 @@ void VoiceTouchEngine::invokeOutputResultCallback(std::string outputResult)
 void VoiceTouchEngine::invokeOutputModalityCallback(void* outputModality)
 {
        if (__outputModalityCallback == nullptr) {
+               _W("[VoiceTouchEngine] output modality callback is not set. Please check it");
                return;
        }
 
@@ -717,14 +726,14 @@ void VoiceTouchEngine::invokeOutputModalityCallback(void* outputModality)
 
 void VoiceTouchEngine::setOutputResultCallback(voice_touch_engine_output_result_cb callback, void *userData)
 {
-       _I("[VoiceTouchEngine] setOutputResultCallback(%p)", callback);
+       _I("[VoiceTouchEngine] Set output result callback");
        __outputResultCallback = callback;
        __outputResultUserData = userData;
 }
 
 void VoiceTouchEngine::setOutputModalityCallback(voice_touch_engine_output_modality_cb callback, void *userData)
 {
-       _I("[VoiceTouchEngine] setOutputModalityCallback(%p)", callback);
+       _I("[VoiceTouchEngine] Set output modality callback");
        __outputModalityCallback = callback;
        __outputModalityUserData = userData;
 }

diff --git a/src/mmimgr/iu/mmi_iu.cpp b/src/mmimgr/iu/mmi_iu.cpp
index db5ae03b5dc52b280fc78c2217f21f98e91e064b..3db2c3acc490582769a1e0baaf8f148c506a37ce 100644 (file)
--- a/src/mmimgr/iu/mmi_iu.cpp
+++ b/src/mmimgr/iu/mmi_iu.cpp
@@ -60,7 +60,6 @@ void __mmi_iu_voice_touch_engine_output_result_cb(const char *output_result, voi
         return;
     }
 
-    _E("[MMI IU] __mmi_iu_voice_touch_engine_output_result_cb");
     iu_output_result_received_callback(MMI_INPUT_EVENT_TYPE_VOICE_TOUCH, output_result, iu_output_result_user_data);
 }
 
@@ -71,12 +70,12 @@ void __mmi_iu_voice_touch_engine_output_modality_cb(void *output_modality, void
         return;
     }
 
-    _E("[MMI IU] __mmi_iu_voice_touch_engine_output_modality_cb");
     iu_output_modality_received_callback(MMI_PROVIDER_EVENT_VOICE_TOUCH, output_modality, iu_output_modality_user_data);
 }
 
 EXPORT_API int mmi_iu_init()
 {
+    _I("[MMI IU] Initialize IU module.");
     init();
 
     try {
@@ -96,6 +95,7 @@ EXPORT_API int mmi_iu_init()
 
 EXPORT_API int mmi_iu_shutdown()
 {
+    _I("[MMI IU] Shut down IU module.");
     init();
 
     delete g_VoiceTouchEngine;

diff --git a/src/mmimgr/iu/mmi_iu_log.h b/src/mmimgr/iu/mmi_iu_log.h
index eb89c1f488159b9538b9077f5218ea1a626a54a6..4bf455b6cf62c260dbc520abbbf069c210a2a8e1 100644 (file)
--- a/src/mmimgr/iu/mmi_iu_log.h
+++ b/src/mmimgr/iu/mmi_iu_log.h
@@ -49,9 +49,9 @@
 #undef _D
 #endif
 
-#define _D LOGD
-#define _E LOGE
-#define _I LOGI
-#define _W LOGW
+#define _D SLOGD
+#define _E SLOGE
+#define _I SLOGI
+#define _W SLOGW
 
 #endif /* __TIZEN_UIX_MMI_IU_LOG_H__ */