X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fpolicy_manager%2Fpolicy_manager.cpp;h=bb5b14c12d0d04e900a137c746375023bb52a8be;hb=f509e0a79eef109e77532b9e391f07609e296b87;hp=0af8398366d94b855c6cb7c3345dc84c687a29ad;hpb=7dd08d9c507f595d3b7a786c3375ad5c67235522;p=apps%2Fagl-service-windowmanager.git diff --git a/src/policy_manager/policy_manager.cpp b/src/policy_manager/policy_manager.cpp index 0af8398..bb5b14c 100644 --- a/src/policy_manager/policy_manager.cpp +++ b/src/policy_manager/policy_manager.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include "policy_manager.hpp" @@ -39,12 +40,12 @@ typedef struct AreaState { std::string role; } AreaState; +typedef std::vector AreaList; typedef struct LayoutState { std::string name; std::map category_num; -// int category_num[stm::gStmCategoryNoNum]; - std::vector area_list; - std::map last_invisibled_role; + AreaList area_list; + std::map> role_history; } LayoutState; typedef struct LayerState { @@ -52,10 +53,17 @@ typedef struct LayerState { LayoutState layout_state; } LayerState; +typedef struct EventInfo { + int event; + std::string role; + uint64_t delay; +} EventInfo; + struct sd_event* event_loop; std::map event_source_list; -std::map g_event_info_list; +std::map g_req_role_list; PolicyManager::CallbackTable callback; +std::queue g_event_info_queue; std::unordered_map g_prv_layers; std::unordered_map g_crr_layers; @@ -81,7 +89,7 @@ int PolicyManager::initialize() { int ret = 0; // Create convert map - for (unsigned int i=0; ieventname2no_[stm::gStmEventName[i]] = stm::gStmEventNo[i]; } @@ -91,7 +99,7 @@ int PolicyManager::initialize() { this->categoryname2no_[stm::gStmCategoryName[i]] = stm::gStmCategoryNo[i]; } - for (unsigned int i=0; iareaname2no_[stm::gStmAreaName[i]] = stm::gStmAreaNo[i]; } @@ -174,80 +182,44 @@ static void addStateToJson( json_object_object_add(*json_out, key, json_obj); } -static int checkPolicyEntry(int event, uint64_t delay_ms, const char* role); -static int checkPolicy(sd_event_source *source, void *data) { - HMI_DEBUG("wm:pm", "Call"); - HMI_DEBUG("wm:pm", ">>>>>>>>>> START CHECK POLICY"); +static void addStateToJson(const char* layer_name, unsigned int changed, + pm::AreaList area_list, json_object** json_out) { + if ((nullptr == layer_name) || (1 < changed) || (nullptr == json_out)) { + HMI_ERROR("wm:pm", "Invalid argument!!!"); + return; + } - int event_data = *((int*)data); + json_object* json_areas = json_object_new_array(); + json_object* json_tmp; + for (pm::AreaState as : area_list) { + json_tmp = json_object_new_object(); + json_object_object_add(json_tmp, "name", json_object_new_string(as.name.c_str())); + json_object_object_add(json_tmp, "role", json_object_new_string(as.role.c_str())); + json_object_array_add(json_areas, json_tmp); + } + json_object_object_add(*json_out, "name", json_object_new_string(layer_name)); + json_object_object_add(*json_out, "changed", json_object_new_boolean(changed)); + json_object_object_add(*json_out, "areas", json_areas); +} + +static void updateLocalState(int event_data, stm::stm_state_t crr_state) { int event_no, category_no, area_no; + event_no = (event_data & STM_MSK_EVT_NO) - 1; category_no = ((event_data & STM_MSK_CTG_NO) >> 8) - 1; area_no = ((event_data & STM_MSK_ARA_NO) >> 16) - 1; - HMI_DEBUG("wm:pm", ">>>>>>>>>> event:%s category:%s area:%s", - stm::gStmEventName[event_no], - stm::gStmCategoryName[category_no], - stm::gStmAreaName[area_no]); - // Transition state - stm::stm_state_t crr_state; - int ret = stm::stmTransitionState(event_data, &crr_state); - if (0 > ret) { - HMI_ERROR("wm:pm", "Error!!"); - return -1; - } - - HMI_DEBUG("wm:pm", "parking brake state (is_changed:%d state:%d:%s)", - crr_state.parking_brake.is_changed, - crr_state.parking_brake.state, - stm::gStmParkingBrakeStateNo2Name[crr_state.parking_brake.state]); - HMI_DEBUG("wm:pm", "accelerator pedal state (is_changed:%d state:%d:%s)", - crr_state.accel_pedal.is_changed, - crr_state.accel_pedal.state, - stm::gStmAccelPedalStateNo2Name[crr_state.accel_pedal.state]); - HMI_DEBUG("wm:pm", "lightstatus brake state (is_changed:%d state:%d:%s)", - crr_state.lightstatus_brake.is_changed, - crr_state.lightstatus_brake.state, - stm::gStmLightstatusBrakeStateNo2Name[crr_state.lightstatus_brake.state]); - HMI_DEBUG("wm:pm", "car state (is_changed:%d state:%d:%s)", - crr_state.car.is_changed, - crr_state.car.state, - stm::gStmCarStateNo2Name[crr_state.car.state]); - HMI_DEBUG("wm:pm", "lamp state (is_changed:%d state:%d:%s)", - crr_state.lamp.is_changed, - crr_state.lamp.state, - stm::gStmLampStateNo2Name[crr_state.lamp.state]); - HMI_DEBUG("wm:pm", "restriction mode state (is_changed:%d state:%d:%s)", - crr_state.restriction_mode.is_changed, - crr_state.restriction_mode.state, - stm::gStmRestrictionModeStateNo2Name[crr_state.restriction_mode.state]); - HMI_DEBUG("wm:pm", "homescreen state (is_changed:%d state:%d:%s)", - crr_state.layer[stm::gStmLayerNoHomescreen].is_changed, - crr_state.layer[stm::gStmLayerNoHomescreen].state, - stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoHomescreen].state]); - HMI_DEBUG("wm:pm", "apps state (is_changed:%d state:%d:%s)", - crr_state.layer[stm::gStmLayerNoApps].is_changed, - crr_state.layer[stm::gStmLayerNoApps].state, - stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoApps].state]); - HMI_DEBUG("wm:pm", "restriction state (is_changed:%d state:%d:%s)", - crr_state.layer[stm::gStmLayerNoRestriction].is_changed, - crr_state.layer[stm::gStmLayerNoRestriction].state, - stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoRestriction].state]); - HMI_DEBUG("wm:pm", "on_screen state (is_changed:%d state:%d:%s)", - crr_state.layer[stm::gStmLayerNoOnScreen].is_changed, - crr_state.layer[stm::gStmLayerNoOnScreen].state, - stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoOnScreen].state]); + std::string req_evt = std::string(stm::gStmEventName[event_no]); + std::string req_ctg = std::string(stm::gStmCategoryName[category_no]); + std::string req_area = std::string(stm::gStmAreaName[area_no]); + std::string req_role = pm::g_req_role_list[event_data]; + HMI_DEBUG("wm:pm", "REQ: event:%s role:%s category:%s area:%s", + req_evt.c_str(), req_role.c_str(), req_ctg.c_str(), req_area.c_str()); -#if 1 // @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ // Store previous layers pm::g_prv_layers = pm::g_crr_layers; - std::string role = pm::g_event_info_list[event_data]; - std::string event = std::string(stm::gStmEventName[event_no]); - std::string category = std::string(stm::gStmCategoryName[category_no]); - std::string area = std::string(stm::gStmAreaName[area_no]); - // Update layers for (int layer_no = stm::gStmLayerNoMin; layer_no <= stm::gStmLayerNoMax; layer_no++) { @@ -300,19 +272,6 @@ static int checkPolicy(sd_event_source *source, void *data) { crr_layout_state = pm::g_prv_layers_car_stop[layer_name].layout_state; #endif } -#if 0 - else if ("none" == crr_layout_name) { - // If current layout is "none", - // current areas is set with "none" - HMI_DEBUG("wm:pm", "Current layout is \"none\""); - pm::AreaState crr_area_state; - crr_area_state.name = "none"; - crr_area_state.category = "none"; - crr_area_state.role = "none"; - crr_layout_state.name = "none"; - crr_layout_state.area_list.push_back(crr_area_state); - } -#endif else { // Copy previous layout state for current crr_layout_state = prv_layout_state; @@ -329,108 +288,45 @@ static int checkPolicy(sd_event_source *source, void *data) { crr_layout_state.area_list = pm::g_default_layouts[crr_layout_name].area_list; } - // Update role in new area -#if 1 - if (crr_state.restriction_mode.is_changed) { - // Updating role is not necessary - // because new_role is not specified - // when restriction mode is changed - HMI_DEBUG("wm:lm", "Updating role is not necessary because new_role is not specified when restriction mode is changed"); -#else - if (crr_state.car.is_changed) { - // Updating role is not necessary - // because new_role is not specified - // when car state is changed - HMI_DEBUG("wm:lm", "Updating role is not necessary because new_role is not specified when car state is changed"); -#endif - } - else { - - std::map> ctg_list; - for (int ctg_no=stm::gStmCategoryNoMin; - ctg_no<=stm::gStmCategoryNoMax; ctg_no++) { - const char* ctg = stm::gStmCategoryName[ctg_no]; - HMI_DEBUG("wm:pm", "ctg:%s", ctg); - - // Create area list of previous app - std::vector area_list; - for (pm::AreaState area_state : prv_layout_state.area_list) { - if (std::string(ctg) == area_state.category) { - // If there is the category which is same with new category in previous layout, - // push it to area list - HMI_DEBUG("wm:pm", "push area_state to prv list"); - area_list.push_back(area_state); - } - } - - int prv_ctg_num = prv_layout_state.category_num[ctg]; - int crr_ctg_num = crr_layout_state.category_num[ctg]; - HMI_DEBUG("wm:pm", "crr_ctg_num:%d prv_ctg_num:%d", crr_ctg_num, prv_ctg_num); - - // Remove state of area which is used no longer from area list - if (crr_ctg_num < prv_ctg_num) { - HMI_DEBUG("wm:pm", "crr_ctg_num < prv_ctg_num"); - if (0 == strcmp(ctg, category.c_str())) { - for (auto i = area_list.begin(); i != area_list.end(); ++i) { - if ((role == i->role) && (area == i->name)) { - HMI_DEBUG("wm:pm", "store removed role:%s", i->role.c_str()); - crr_layout_state.last_invisibled_role[category] = i->role; - - HMI_DEBUG("wm:pm", "remove area state which have same role with requested role"); - area_list.erase(i); - - prv_ctg_num--; - - if (crr_ctg_num == prv_ctg_num) { - break; - } - } - } - } - else { - HMI_DEBUG("wm:pm", "store removed role:%s", area_list.begin()->role.c_str()); - crr_layout_state.last_invisibled_role[ctg] = area_list.begin()->role; - - HMI_DEBUG("wm:pm", "remove the oldest area data"); - area_list.erase(area_list.begin()); - } + // Create candidate list + std::map cand_list; + for (int ctg_no=stm::gStmCategoryNoMin; + ctg_no<=stm::gStmCategoryNoMax; ctg_no++) { + const char* ctg = stm::gStmCategoryName[ctg_no]; + HMI_DEBUG("wm:pm", "ctg:%s", ctg); + + // Create candidate list for category from the previous displayed categories + pm::AreaList tmp_cand_list; + for (pm::AreaState area_state : prv_layout_state.area_list) { + if (std::string(ctg) == area_state.category) { + // If there is the category which is same with new category in previous layout, + // push it to list + HMI_DEBUG("wm:pm", "Push to candidate list category:%s role:%s", + area_state.category.c_str(), area_state.role.c_str()); + tmp_cand_list.push_back(area_state); } - else if (crr_ctg_num >= prv_ctg_num) { - HMI_DEBUG("wm:pm", "crr_ctg_num >= prv_ctg_num"); - if (0 == strcmp(ctg, category.c_str())) { - HMI_DEBUG("wm:pm", "category of requested role is same"); - if ((crr_ctg_num == prv_ctg_num) && (0 != prv_ctg_num)) { - HMI_DEBUG("wm:pm", "store removed role:%s", area_list.begin()->role.c_str()); - crr_layout_state.last_invisibled_role[ctg] = area_list.begin()->role; - - HMI_DEBUG("wm:pm", "remove the oldest area data for adding requested role"); - area_list.erase(area_list.begin()); - } - } - } - - // Check - for (pm::AreaState area_state : area_list) { - HMI_DEBUG("wm:pm", "area_list name:%s category:%s role:%s", - area_state.name.c_str(), - area_state.category.c_str(), - area_state.role.c_str()); - } - - ctg_list[ctg] = area_list; } - if (event == "activate") { - HMI_DEBUG("wm:pm", "event is activate"); - // First, update area for requested role - bool request_for_this_layer = false; - bool updated = false; + int candidate_num = prv_layout_state.category_num[ctg]; + int blank_num = crr_layout_state.category_num[ctg]; + HMI_DEBUG("wm:pm", "blank_num:%d candidate_num:%d", blank_num, candidate_num); + + // If requested event is "activate" + // and there are requested category and area, + // update area with requested role in current layout. + bool request_for_this_layer = false; + bool updated = false; + if ((ctg == req_ctg) && ("activate" == req_evt) ) { + HMI_DEBUG("wm:pm", "requested event is activate"); for (pm::AreaState &as : crr_layout_state.area_list) { - if (as.category == category) { + if (as.category == req_ctg) { request_for_this_layer = true; - if (as.name == area) { - HMI_DEBUG("wm:pm", "update area for requested category:%s role:%s area:%s", category.c_str(), role.c_str(), area.c_str()); - as.role = role; + + if (as.name == req_area) { + HMI_DEBUG("wm:pm", "Update current layout: area:%s category:%s role:%s", + as.name.c_str(), as.category.c_str(), as.role.c_str()); + as.role = req_role; + blank_num--; updated = true; break; } @@ -438,34 +334,72 @@ static int checkPolicy(sd_event_source *source, void *data) { } // If NOT updated: there is not requested area in new layout, - // requested role is used later. + // so push requested role to candidate list if (request_for_this_layer && (!updated)) { - HMI_DEBUG("wm:pm", "requested role is used later category:%s role:%s area:%s", category.c_str(), role.c_str(), area.c_str()); + HMI_DEBUG("wm:pm", "Push request to candidate list"); pm::AreaState area_state; - area_state.name = area; - area_state.category = category; - area_state.role = role; - ctg_list[category].push_back(area_state); + area_state.name = req_area; + area_state.category = req_ctg; + area_state.role = req_role; + tmp_cand_list.push_back(area_state); } } - // Update areas - for (pm::AreaState &as : crr_layout_state.area_list) { - if (as.role != role) { // This conditional expression is useful in only when requested activate event - HMI_DEBUG("wm:pm", "update areas for category:%s", as.category.c_str()); - if (0 != ctg_list[as.category].size()) { - HMI_DEBUG("wm:pm", "update role to %s by using area list this category", - ctg_list[as.category].begin()->role); - as.role = ctg_list[as.category].begin()->role; - ctg_list[as.category].erase(ctg_list[as.category].begin()); + // Compare number of candidate/blank, + // And remove role in order of the oldest as necessary + if (candidate_num < blank_num) { + // Refer history stack + // and add to the top of tmp_cand_list in order to the newest + while (candidate_num != blank_num) { + pm::AreaState area_state; + area_state.name = ""; + area_state.category = ctg; + if (0 != crr_layout_state.role_history[ctg].size()) { + HMI_ERROR("wm:pm", "Use role in history stack:%s", + crr_layout_state.role_history[ctg].back().c_str()); + area_state.role = crr_layout_state.role_history[ctg].back(); + crr_layout_state.role_history[ctg].pop_back(); } else { - HMI_DEBUG("wm:pm", "there is no area list for this category, so update area by last invisibled role:", crr_layout_state.last_invisibled_role[as.category]); - as.role = crr_layout_state.last_invisibled_role[as.category]; - crr_layout_state.last_invisibled_role.erase(as.category); + HMI_ERROR("wm:pm", "There is no role in history stack!!"); + area_state.role = ""; } + tmp_cand_list.push_back(area_state); + candidate_num++; + } + } + else if (candidate_num > blank_num) { + HMI_DEBUG("wm:pm", "candidate_num > blank_num"); + + // Remove the oldest role from candidate list + while (candidate_num != blank_num) { + std::string removed_role = tmp_cand_list.begin()->role; + HMI_DEBUG("wm:pm", "Remove the oldest data(role:%s) from tmp_cand_list", + removed_role.c_str()); + tmp_cand_list.erase(tmp_cand_list.begin()); + candidate_num--; + + // Push removed data to history stack + crr_layout_state.role_history[ctg].push_back(removed_role); } } + else { // (candidate_num == blank_num) + // nop + } + + cand_list[ctg] = tmp_cand_list; + } + + // Update areas + for (pm::AreaState &as : crr_layout_state.area_list) { + HMI_DEBUG("wm:pm", "Current area info area:%s category:%s", + as.name.c_str(), as.category.c_str()); + if ("" == as.role) { + HMI_DEBUG("wm:pm", "Update this area with role:%s", + cand_list[as.category].begin()->role.c_str()); + as.role = cand_list[as.category].begin()->role; + cand_list[as.category].erase(cand_list[as.category].begin()); + } } } // Update current layout of this layer @@ -473,6 +407,9 @@ static int checkPolicy(sd_event_source *source, void *data) { } } + // Erase role for the event_data from list + pm::g_req_role_list.erase(event_data); + // Check for (auto itr : pm::g_crr_layers) { pm::LayerState ls = itr.second; @@ -485,10 +422,9 @@ static int checkPolicy(sd_event_source *source, void *data) { HMI_DEBUG("wm:pm", ">>> >>> >>> >>> ROLE:%s", as.role.c_str()); } } -#endif // @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ - - json_object* json_out = json_object_new_object(); +} +void createOutputInformation(stm::stm_state_t crr_state, json_object **json_out) { // Create result // { // "parking_brake": { @@ -498,7 +434,7 @@ static int checkPolicy(sd_event_source *source, void *data) { addStateToJson("parking_brake", crr_state.parking_brake.is_changed, stm::gStmParkingBrakeStateNo2Name[crr_state.parking_brake.state], - &json_out); + json_out); // "accel_pedal": { // "is_changed": , @@ -507,7 +443,7 @@ static int checkPolicy(sd_event_source *source, void *data) { addStateToJson("accel_pedal", crr_state.accel_pedal.is_changed, stm::gStmAccelPedalStateNo2Name[crr_state.accel_pedal.state], - &json_out); + json_out); // "lightstatus_brake": { // "is_changed": , @@ -516,7 +452,7 @@ static int checkPolicy(sd_event_source *source, void *data) { addStateToJson("lightstatus_brake", crr_state.lightstatus_brake.is_changed, stm::gStmLightstatusBrakeStateNo2Name[crr_state.lightstatus_brake.state], - &json_out); + json_out); // "car": { // "is_changed": , @@ -525,7 +461,7 @@ static int checkPolicy(sd_event_source *source, void *data) { addStateToJson("car", crr_state.car.is_changed, stm::gStmCarStateNo2Name[crr_state.car.state], - &json_out); + json_out); // "lamp": { // "is_changed": , @@ -534,7 +470,7 @@ static int checkPolicy(sd_event_source *source, void *data) { addStateToJson("lamp", crr_state.lamp.is_changed, stm::gStmLampStateNo2Name[crr_state.lamp.state], - &json_out); + json_out); // "restriction_mode": { // "is_changed": , @@ -543,82 +479,142 @@ static int checkPolicy(sd_event_source *source, void *data) { addStateToJson("restriction_mode", crr_state.restriction_mode.is_changed, stm::gStmRestrictionModeStateNo2Name[crr_state.restriction_mode.state], - &json_out); + json_out); + // Create layout information + // // "layers": [ + // { + // "homescreen": { + // "changed": , + // "areas": [ + // { + // "name":, + // "role": + // }. + // ... + // ] + // } + // }, + // ... json_object* json_layer = json_object_new_array(); json_object* json_tmp; + for (int layer_no = stm::gStmLayerNoMin; + layer_no <= stm::gStmLayerNoMax; layer_no++) { + const char* layer_name = stm::gStmLayerName[layer_no]; + HMI_DEBUG("wm:pm", "LAYER:%s", layer_name); - // { - // "homescreen": { - // "is_changed": , - // "state": - // } - // }, - // ] - // } - json_tmp = json_object_new_object(); - addStateToJson("homescreen", - crr_state.layer[stm::gStmLayerNoHomescreen].is_changed, - stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoHomescreen].state], - &json_tmp); - json_object_array_add(json_layer, json_tmp); - - // { - // "apps": { - // "is_changed": , - // "state": - // } - // }, - json_tmp = json_object_new_object(); - addStateToJson("apps", - crr_state.layer[stm::gStmLayerNoApps].is_changed, - stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoApps].state], - &json_tmp); - json_object_array_add(json_layer, json_tmp); - - // { - // "restriction": { - // "is_changed": , - // "state": - // } - // }, - json_tmp = json_object_new_object(); - addStateToJson("restriction", - crr_state.layer[stm::gStmLayerNoRestriction].is_changed, - stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoRestriction].state], - &json_tmp); - json_object_array_add(json_layer, json_tmp); - - // { - // "on_screen": { - // "is_changed": , - // "state": - // } - // }, - json_tmp = json_object_new_object(); - addStateToJson("on_screen", - crr_state.layer[stm::gStmLayerNoOnScreen].is_changed, - stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoOnScreen].state], - &json_tmp); - json_object_array_add(json_layer, json_tmp); + json_tmp = json_object_new_object(); + addStateToJson(layer_name, + crr_state.layer[layer_no].is_changed, + pm::g_crr_layers[layer_name].layout_state.area_list, + &json_tmp); + json_object_array_add(json_layer, json_tmp); + } // Add json array of layer - json_object_object_add(json_out, "layers", json_layer); + json_object_object_add(*json_out, "layers", json_layer); +} + +static int checkPolicyEntry(int event, uint64_t delay_ms, std::string role); +static int checkPolicy(sd_event_source *source, void *data) { + HMI_DEBUG("wm:pm", "Call"); + HMI_DEBUG("wm:pm", ">>>>>>>>>> START CHECK POLICY"); + + int event_data = *((int*)data); + + int event_no, category_no, area_no; + event_no = (event_data & STM_MSK_EVT_NO) - 1; + category_no = ((event_data & STM_MSK_CTG_NO) >> 8) - 1; + area_no = ((event_data & STM_MSK_ARA_NO) >> 16) - 1; + HMI_DEBUG("wm:pm", ">>>>>>>>>> event:%s category:%s area:%s", + stm::gStmEventName[event_no], + stm::gStmCategoryName[category_no], + stm::gStmAreaName[area_no]); + + // Transition state + stm::stm_state_t crr_state; + int ret = stm::stmTransitionState(event_data, &crr_state); + if (0 > ret) { + HMI_ERROR("wm:pm", "Failed transition state"); + if (nullptr != pm::callback.onError) { + json_object* json_out = json_object_new_object(); + json_object_object_add(json_out, "message", + json_object_new_string("Failed to transition state")); + json_object_object_add(json_out, "event", + json_object_new_string(stm::gStmEventName[event_no])); + json_object_object_add(json_out, "role", + json_object_new_string(pm::g_req_role_list[event_data].c_str())); + json_object_object_add(json_out, "area", + json_object_new_string(stm::gStmAreaName[area_no])); + pm::callback.onError(json_out); + json_object_put(json_out); + } + return -1; + } + + HMI_DEBUG("wm:pm", "parking brake state (is_changed:%d state:%d:%s)", + crr_state.parking_brake.is_changed, + crr_state.parking_brake.state, + stm::gStmParkingBrakeStateNo2Name[crr_state.parking_brake.state]); + HMI_DEBUG("wm:pm", "accelerator pedal state (is_changed:%d state:%d:%s)", + crr_state.accel_pedal.is_changed, + crr_state.accel_pedal.state, + stm::gStmAccelPedalStateNo2Name[crr_state.accel_pedal.state]); + HMI_DEBUG("wm:pm", "lightstatus brake state (is_changed:%d state:%d:%s)", + crr_state.lightstatus_brake.is_changed, + crr_state.lightstatus_brake.state, + stm::gStmLightstatusBrakeStateNo2Name[crr_state.lightstatus_brake.state]); + HMI_DEBUG("wm:pm", "car state (is_changed:%d state:%d:%s)", + crr_state.car.is_changed, + crr_state.car.state, + stm::gStmCarStateNo2Name[crr_state.car.state]); + HMI_DEBUG("wm:pm", "lamp state (is_changed:%d state:%d:%s)", + crr_state.lamp.is_changed, + crr_state.lamp.state, + stm::gStmLampStateNo2Name[crr_state.lamp.state]); + HMI_DEBUG("wm:pm", "restriction mode state (is_changed:%d state:%d:%s)", + crr_state.restriction_mode.is_changed, + crr_state.restriction_mode.state, + stm::gStmRestrictionModeStateNo2Name[crr_state.restriction_mode.state]); + HMI_DEBUG("wm:pm", "homescreen state (is_changed:%d state:%d:%s)", + crr_state.layer[stm::gStmLayerNoHomescreen].is_changed, + crr_state.layer[stm::gStmLayerNoHomescreen].state, + stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoHomescreen].state]); + HMI_DEBUG("wm:pm", "apps state (is_changed:%d state:%d:%s)", + crr_state.layer[stm::gStmLayerNoApps].is_changed, + crr_state.layer[stm::gStmLayerNoApps].state, + stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoApps].state]); + HMI_DEBUG("wm:pm", "restriction state (is_changed:%d state:%d:%s)", + crr_state.layer[stm::gStmLayerNoRestriction].is_changed, + crr_state.layer[stm::gStmLayerNoRestriction].state, + stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoRestriction].state]); + HMI_DEBUG("wm:pm", "on_screen state (is_changed:%d state:%d:%s)", + crr_state.layer[stm::gStmLayerNoOnScreen].is_changed, + crr_state.layer[stm::gStmLayerNoOnScreen].state, + stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoOnScreen].state]); + + // Update state which is managed by PolicyManager + updateLocalState(event_data, crr_state); + + // Create output information for ResourceManager + json_object* json_out = json_object_new_object(); + createOutputInformation(crr_state, &json_out); // Notify state is changed if (nullptr != pm::callback.onStateTransitioned) { pm::callback.onStateTransitioned(json_out); } + // Start/Stop timer event if (crr_state.car.is_changed) { if (stm::gStmCarStateNoRun == crr_state.car.state) { // Set delay event(restriction mode on) - checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_ON, 3000, nullptr); + checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_ON, 3000, ""); } else if (stm::gStmCarStateNoStop == crr_state.car.state) { // Set event(restriction mode off) - checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_OFF, 0, nullptr); + checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_OFF, 0, ""); // Stop timer for restriction on event if (pm::event_source_list.find(STM_EVT_NO_RESTRICTION_MODE_ON) @@ -653,29 +649,26 @@ static int checkPolicy(sd_event_source *source, void *data) { } static int timerEvent(sd_event_source *source, uint64_t usec, void *data) { + HMI_DEBUG("wm:pm", "Call"); + int ret = checkPolicy(source, data); return ret; -}; +} -static int checkPolicyEntry(int event, uint64_t delay_ms, const char* role) +static int checkPolicyEntry(int event, uint64_t delay_ms, std::string role) { HMI_DEBUG("wm:pm", "Call"); - HMI_DEBUG("wm:pm", "event:0x%x", event); + HMI_DEBUG("wm:pm", "event:0x%x delay:%d role:%s", event, delay_ms, role.c_str()); - // Store event info - if (nullptr == role) { - pm::g_event_info_list[event] = std::string(""); - } - else { - pm::g_event_info_list[event] = std::string(role); - } + // Store requested role + pm::g_req_role_list[event] = role; if (0 == delay_ms) { int ret = sd_event_add_defer(pm::event_loop, NULL, &checkPolicy, new int(event)); if (0 > ret) { HMI_ERROR("wm:pm", "Faild to sd_event_add_defer: errno:%d", ret); - pm::g_event_info_list.erase(event); + pm::g_req_role_list.erase(event); return -1; } } @@ -695,7 +688,7 @@ static int checkPolicyEntry(int event, uint64_t delay_ms, const char* role) &timerEvent, new int(event)); if (0 > ret) { HMI_ERROR("wm:pm", "Faild to sd_event_add_time: errno:%d", ret); - pm::g_event_info_list.erase(event); + pm::g_req_role_list.erase(event); return -1; } @@ -707,11 +700,13 @@ static int checkPolicyEntry(int event, uint64_t delay_ms, const char* role) } void PolicyManager::registerCallback(CallbackTable callback) { + HMI_DEBUG("wm:pm", "Call"); + pm::callback.onStateTransitioned = callback.onStateTransitioned; pm::callback.onError = callback.onError; } -int PolicyManager::inputEvent(json_object* json_in) { +int PolicyManager::setInputEventData(json_object* json_in) { HMI_DEBUG("wm:pm", "Call"); // Check arguments @@ -757,14 +752,45 @@ int PolicyManager::inputEvent(json_object* json_in) { HMI_DEBUG("wm:pm", "area(%s:%d)", area, area_no); } - // Check policy - checkPolicyEntry((event_no | category_no | area_no), 0, role); + // Set event info to the queue + pm::EventInfo event_info; + event_info.event = (event_no | category_no | area_no); + if (nullptr == role) { + event_info.role = std::string(""); + } + else { + event_info.role = std::string(role); + } + event_info.delay = 0; + pm::g_event_info_queue.push(event_info); return 0; } -std::string PolicyManager::roleToCategory(const char* role) { - return this->role2category_[role]; +int PolicyManager::executeStateTransition() { + HMI_DEBUG("wm:pm", "Call"); + + int ret; + pm::EventInfo event_info; + + while (!pm::g_event_info_queue.empty()) { + // Get event info from queue and delete + event_info = pm::g_event_info_queue.front(); + pm::g_event_info_queue.pop(); + + // Set event info for checking policy + ret = checkPolicyEntry(event_info.event, event_info.delay, event_info.role); + } + return ret; +} + +void PolicyManager::undoState() { + HMI_DEBUG("wm:pm", "Call"); + + // Undo state of STM + stm::stmUndoState(); + + pm::g_crr_layers = pm::g_prv_layers; } extern const char* kDefaultRoleDb; @@ -954,8 +980,12 @@ int PolicyManager::loadLayoutDb() { if (nullptr != role) { // Role is NOT essential here area_state.role = std::string(role); - HMI_DEBUG("wm:pm", ">>> role:%s", role); } + else { + area_state.role = std::string(""); + + } + HMI_DEBUG("wm:pm", ">>> role:%s", role); layout_state.area_list.push_back(area_state); @@ -982,13 +1012,6 @@ int PolicyManager::loadLayoutDb() { HMI_DEBUG("wm:pm", ">>> >>> area :%s", itr_area->name.c_str()); HMI_DEBUG("wm:pm", ">>> >>> category:%s", itr_area->category.c_str()); HMI_DEBUG("wm:pm", ">>> >>> role :%s", itr_area->role.c_str()); -#if 0 - for (auto itr_role = itr_area->second.begin(); - itr_role != itr_area->second.end(); ++itr_role) { - HMI_DEBUG("wm:pm", ">>> >>> >>> attribute:%s, name:%s", - itr_role->first.c_str(), itr_role->second.c_str()); - } -#endif } }