From f92dfd202a225be8b662f479cb4c2c6868d837b3 Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Mon, 2 Aug 2021 22:33:16 +0900 Subject: [PATCH] Fix log not printed bug and add more log messages Change-Id: I922eeb94469d52a8b47882a3f51412687e6877e2 --- plugins/wakeup-manager/inc/wakeup_settings.h | 2 +- plugins/wakeup-manager/src/wakeup_policy_default.cpp | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/plugins/wakeup-manager/inc/wakeup_settings.h b/plugins/wakeup-manager/inc/wakeup_settings.h index 7155c33..4e2caef 100644 --- a/plugins/wakeup-manager/inc/wakeup_settings.h +++ b/plugins/wakeup-manager/inc/wakeup_settings.h @@ -82,7 +82,7 @@ private: float mConversationTimeout{5.0}; bool mMultipleMode{false}; vector mEnabledAssistants; - float mWakeupPolicyDelay{0.1}; + float mWakeupPolicyDelay{0.0}; vector mWakeupPolicyPriority; // No priority by default float mStreamingDurationMax{10.0}; string mVoiceInputLanguage; diff --git a/plugins/wakeup-manager/src/wakeup_policy_default.cpp b/plugins/wakeup-manager/src/wakeup_policy_default.cpp index 45b5caa..1199b26 100644 --- a/plugins/wakeup-manager/src/wakeup_policy_default.cpp +++ b/plugins/wakeup-manager/src/wakeup_policy_default.cpp @@ -1,5 +1,6 @@ #include "wakeup_policy_default.h" #include "wakeup_policy_impl.h" +#include "wakeup_manager_main.h" #include @@ -35,13 +36,13 @@ void CWakeupPolicyDefault::set_assistant_priority(string appid, int priority) info.appid = appid; info.priority = priority; - LOGD("Setting assistant priority : %s %d", appid.c_str(), priority); + MWR_LOGD("Setting assistant priority : %s %d", appid.c_str(), priority); mPriorityInfos.push_back(info); } void CWakeupPolicyDefault::set_delay(float seconds) { - LOGD("Setting delay : %f", seconds); + MWR_LOGD("Setting delay : %f", seconds); mDelaySeconds = seconds; } @@ -62,7 +63,7 @@ Ecore_Timer* CWakeupPolicyDefault::get_timer() static Eina_Bool timer_func(void *data) { - LOGD("[ENTER]"); + MWR_LOGD("[ENTER]"); if (data) { CWakeupPolicyDefault *policy = static_cast(data); policy->timer_expired(); @@ -73,6 +74,7 @@ static Eina_Bool timer_func(void *data) void CWakeupPolicyDefault::wakeup_candidate(mas_wakeup_event_info wakeup_info) { + MWR_LOGI("[ENTER]"); mWakeupInfos.push_back(wakeup_info); if (nullptr == mTimer) { ecore_main_loop_thread_safe_call_async([](void* data) { @@ -80,6 +82,7 @@ void CWakeupPolicyDefault::wakeup_candidate(mas_wakeup_event_info wakeup_info) if (!policy) return; Ecore_Timer* timer = ecore_timer_add(policy->get_delay(), timer_func, data); + MWR_LOGI("Adding timer : %f", policy->get_delay()); policy->set_timer(timer); }, this); } @@ -87,12 +90,12 @@ void CWakeupPolicyDefault::wakeup_candidate(mas_wakeup_event_info wakeup_info) void CWakeupPolicyDefault::select_candidate(mas_wakeup_event_info wakeup_info) { - LOGE("Default wakeup policy does not support selecting candidate"); + MWR_LOGE("Default wakeup policy does not support selecting candidate"); } void CWakeupPolicyDefault::timer_expired() { - LOGD("[ENTER]"); + MWR_LOGD("[ENTER]"); if (0 == mWakeupInfos.size()) return; mas_wakeup_event_info selected = mWakeupInfos.front(); @@ -101,7 +104,7 @@ void CWakeupPolicyDefault::timer_expired() for (const auto &info : mPriorityInfos) { if (0 == info.appid.compare(wakeup.wakeup_appid)) { if (info.priority > selected_priority || -1 == selected_priority) { - LOGD("Wakeup with higher priority found : %s, %d", + MWR_LOGD("Wakeup with higher priority found : %s, %d", info.appid.c_str(), info.priority); selected = wakeup; selected_priority = info.priority; @@ -113,7 +116,7 @@ void CWakeupPolicyDefault::timer_expired() mWakeupInfos.clear(); if (mTimer) { - LOGD("Now deleting timer"); + MWR_LOGD("Now deleting timer"); ecore_timer_del(mTimer); mTimer = nullptr; } -- 2.7.4