aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuta Doi <yuta-d@witz-inc.co.jp>2018-06-21 10:10:06 +0900
committerYuta Doi <yuta-d@witz-inc.co.jp>2018-06-21 10:10:06 +0900
commit8cc9f3df7148df1406b88fc50e9ef59ae6aed91e (patch)
treee65c95a84867870cea009b576f43cef62e83c197
parenta8edb67ada57540c67cb3c4dcb840509173bef81 (diff)
Modify debug log
Change-Id: Idca7758b7f86a6004546ba37713360d9bac864db Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
-rw-r--r--src/policy_manager/policy_manager.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/policy_manager/policy_manager.cpp b/src/policy_manager/policy_manager.cpp
index 0dd5974..6f80131 100644
--- a/src/policy_manager/policy_manager.cpp
+++ b/src/policy_manager/policy_manager.cpp
@@ -281,7 +281,7 @@ static void updateLocalLayerState(int event_data, stm::stm_state_t crr_state) {
// store current state for state of restriction mode off
if ((crr_state.car_element[stm::gStmCarElementNoRestrictionMode].changed)
&& (stm::gStmRestrictionModeStateNoOn == crr_state.car_element[stm::gStmCarElementNoRestrictionMode].state)) {
- HMI_DEBUG("wm:lm", "Store current state for state of restriction mode off");
+ HMI_DEBUG("wm:pm", "Store current state for state of restriction mode off");
pm::g_prv_layers_car_stop[layer_name] = pm::g_crr_layers[layer_name];
}
#else
@@ -289,7 +289,7 @@ static void updateLocalLayerState(int event_data, stm::stm_state_t crr_state) {
// store current state for state of car stop
if ((crr_state.car.changed)
&& (stm::gStmRunningNoRun == crr_state.car.state)) {
- HMI_DEBUG("wm:lm", "Store current state for state of car stop");
+ HMI_DEBUG("wm:pm", "Store current state for state of car stop");
pm::g_prv_layers_car_stop[layer_name] = pm::g_crr_layers[layer_name];
}
#endif
@@ -311,14 +311,14 @@ static void updateLocalLayerState(int event_data, stm::stm_state_t crr_state) {
&& (stm::gStmRestrictionModeStateNoOff == crr_state.car_element[stm::gStmCarElementNoRestrictionMode].state)) {
// If restriction mode is changed on -> off,
// restore state of restriction mode off
- HMI_DEBUG("wm:lm", "Restriction mode is changed on -> off, so restore state of restriction mode off");
+ HMI_DEBUG("wm:pm", "Restriction mode is changed on -> off, so restore state of restriction mode off");
crr_layout_state = pm::g_prv_layers_car_stop[layer_name].layout_state;
#else
if ((crr_state.car_element[gStmCarElementNoRunning].changed)
&& (stm::gStmCarElementNoStop == crr_state.car_element[gStmCarElementNoRunning].state)) {
// If car state is changed car_run -> car_stop,
// restore state of car stop
- HMI_DEBUG("wm:lm", "Car state is changed car_run -> car_stop, so restore state of car stop");
+ HMI_DEBUG("wm:pm", "Car state is changed car_run -> car_stop, so restore state of car stop");
crr_layout_state = pm::g_prv_layers_car_stop[layer_name].layout_state;
#endif
}
@@ -327,12 +327,12 @@ static void updateLocalLayerState(int event_data, stm::stm_state_t crr_state) {
crr_layout_state = prv_layout_state;
if (prv_layout_name == crr_layout_name) {
- HMI_DEBUG("wm:lm", "Previous layout is same with current");
+ HMI_DEBUG("wm:pm", "Previous layout is same with current");
}
else {
// If previous layout is NOT same with current,
// current areas is set with default value
- HMI_DEBUG("wm:lm", "Previous layout is NOT same with current");
+ HMI_DEBUG("wm:pm", "Previous layout is NOT same with current");
crr_layout_state.name = pm::g_default_layouts[crr_layout_name].name;
crr_layout_state.category_num = pm::g_default_layouts[crr_layout_name].category_num;
crr_layout_state.area_list = pm::g_default_layouts[crr_layout_name].area_list;
@@ -734,11 +734,12 @@ int PolicyManager::setInputEventData(json_object* json_in) {
int area_no = 0;
if (nullptr != area) {
area_no = this->areaname2no[area];
+ HMI_DEBUG("wm:pm", "area(%s:%d)", area, area_no);
}
else if (nullptr != role) {
area_no = this->areaname2no[this->role2defaultarea[role]];
+ HMI_DEBUG("wm:pm", "area(%s:%d)", this->role2defaultarea[role].c_str(), area_no);
}
- HMI_DEBUG("wm:pm", "area(%s:%d)", area, area_no);
// Set event info to the queue
EventInfo event_info;
@@ -875,7 +876,7 @@ int PolicyManager::loadRoleDb() {
extern const char* kDefaultLayoutDb;
int PolicyManager::loadLayoutDb() {
- HMI_DEBUG("wm:lm", "Call");
+ HMI_DEBUG("wm:pm", "Call");
// Get afm application installed dir
char const *afm_app_install_dir = getenv("AFM_APP_INSTALL_DIR");