X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fpolicy_manager%2Fpolicy_manager.cpp;h=bb5b14c12d0d04e900a137c746375023bb52a8be;hb=f509e0a79eef109e77532b9e391f07609e296b87;hp=bc3fd8dbe673b756aeee576c9ab7090d6fe86038;hpb=76a933a557531b92d2802c4fbae8205bb8d68faf;p=apps%2Fagl-service-windowmanager.git diff --git a/src/policy_manager/policy_manager.cpp b/src/policy_manager/policy_manager.cpp index bc3fd8d..bb5b14c 100644 --- a/src/policy_manager/policy_manager.cpp +++ b/src/policy_manager/policy_manager.cpp @@ -89,7 +89,7 @@ int PolicyManager::initialize() { int ret = 0; // Create convert map - for (unsigned int i=0; ieventname2no_[stm::gStmEventName[i]] = stm::gStmEventNo[i]; } @@ -99,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]; } @@ -203,82 +203,23 @@ static void addStateToJson(const char* layer_name, unsigned int changed, json_object_object_add(*json_out, "areas", json_areas); } - -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); - +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]); - - // Store previous layers - pm::g_prv_layers = pm::g_crr_layers; - std::string req_role = pm::g_req_role_list[event_data]; 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]); - HMI_DEBUG("wm:pm", "REQ: event:%s role%s category:%s area:%s", + 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()); + // Store previous layers + pm::g_prv_layers = pm::g_crr_layers; + // Update layers for (int layer_no = stm::gStmLayerNoMin; layer_no <= stm::gStmLayerNoMax; layer_no++) { @@ -466,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; @@ -478,9 +422,9 @@ static int checkPolicy(sd_event_source *source, void *data) { HMI_DEBUG("wm:pm", ">>> >>> >>> >>> ROLE:%s", as.role.c_str()); } } +} - json_object* json_out = json_object_new_object(); - +void createOutputInformation(stm::stm_state_t crr_state, json_object **json_out) { // Create result // { // "parking_brake": { @@ -490,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": , @@ -499,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": , @@ -508,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": , @@ -517,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": , @@ -526,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": , @@ -535,7 +479,7 @@ 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 // @@ -569,21 +513,108 @@ static int checkPolicy(sd_event_source *source, void *data) { } // 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) @@ -730,7 +761,6 @@ int PolicyManager::setInputEventData(json_object* json_in) { else { event_info.role = std::string(role); } - event_info.role = std::string(role); event_info.delay = 0; pm::g_event_info_queue.push(event_info); @@ -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 } }