}
} // namespace stm
-
namespace pm {
-typedef struct AreaState {
- std::string name;
- std::string category;
- std::string role;
-} AreaState;
-
-typedef struct LayoutState {
- std::string name;
- std::map<std::string, int> category_num;
-// int category_num[stm::gStmCategoryNoNum];
- std::vector<AreaState> area_list;
- std::map<std::string, std::string> last_invisibled_role;
-} LayoutState;
-
-typedef struct LayerState {
- std::string name;
- LayoutState layout_state;
-} LayerState;
-
-struct sd_event* event_loop;
-std::map<int, struct sd_event_source*> event_source_list;
-std::map<int, std::string> g_event_info_list;
-PolicyManager::CallbackTable callback;
-
-std::unordered_map<std::string, LayerState> g_prv_layers;
-std::unordered_map<std::string, LayerState> g_crr_layers;
-std::unordered_map<std::string, LayerState> g_prv_layers_car_stop;
-std::unordered_map<std::string, LayoutState> g_default_layouts;
+static PolicyManager *g_context;
+
+static int transitionStateWrapper(sd_event_source *source, void *data) {
+ int ret = pm::g_context->transitionState(source, data);
+ return ret;
+}
+
+static int timerEventWrapper(sd_event_source *source, uint64_t usec, void *data) {
+ int ret = pm::g_context->timerEvent(source, usec, data);
+ return ret;
+}
+
} // namespace pm
PolicyManager::PolicyManager() :
- eventname2no_(),
- categoryname2no_(),
- areaname2no_(),
- role2category_(),
- category2role_(),
- role2defaultarea_()
+ eventname2no(),
+ categoryname2no(),
+ areaname2no(),
+ role2category(),
+ category2role(),
+ role2defaultarea()
{
HMI_DEBUG("wm:pm", "Call");
}
int ret = 0;
// Create convert map
- for (unsigned int i=0; i<STM_NUM_EVT; i++) {
- HMI_DEBUG("wm:pm", "event name:%s no:%d", stm::gStmEventName[i], stm::gStmEventNo[i]);
- this->eventname2no_[stm::gStmEventName[i]] = stm::gStmEventNo[i];
+ for (int i = stm::StmEvtNoMin; i <= stm::StmEvtNoMax; i++) {
+ HMI_DEBUG("wm:pm", "event name:%s no:%d", stm::kStmEventName[i], i);
+ this->eventname2no[stm::kStmEventName[i]] = i;
}
- for (int i = stm::gStmCategoryNoMin; i <= stm::gStmCategoryNoMax; i++) {
- HMI_DEBUG("wm:pm", "category name:%s no:%d", stm::gStmCategoryName[i], stm::gStmCategoryNo[i]);
- this->categoryname2no_[stm::gStmCategoryName[i]] = stm::gStmCategoryNo[i];
+ for (int i = stm::StmCtgNoMin; i <= stm::StmCtgNoMax; i++) {
+ HMI_DEBUG("wm:pm", "category name:%s no:%d", stm::kStmCategoryName[i], i);
+ this->categoryname2no[stm::kStmCategoryName[i]] = i;
}
- for (unsigned int i=0; i<STM_NUM_ARA; i++) {
- HMI_DEBUG("wm:pm", "area name:%s no:%d", stm::gStmAreaName[i], stm::gStmAreaNo[i]);
- this->areaname2no_[stm::gStmAreaName[i]] = stm::gStmAreaNo[i];
+ for (int i = stm::StmAreaNoMin; i <= stm::StmAreaNoMax; i++) {
+ HMI_DEBUG("wm:pm", "area name:%s no:%d", stm::kStmAreaName[i], i);
+ this->areaname2no[stm::kStmAreaName[i]] = i;
}
// Load role.db
return ret;
}
- // Initialize current/previous state of layers
- pm::AreaState init_area;
- pm::LayoutState init_layout;
- init_area.name = "none";
- init_area.category = "none";
- init_area.role = "none";
- init_layout.area_list.push_back(init_area);
-
- for (int i = stm::gStmLayerNoMin; i <= stm::gStmLayerNoMax; i++) {
- const char* layer_name = stm::gStmLayerName[i];
- pm::g_crr_layers[layer_name].name = layer_name;
- pm::g_crr_layers[layer_name].layout_state = init_layout;
- }
-
- pm::g_prv_layers = pm::g_crr_layers;
+ // Initialize state which is managed by PolicyManager
+ this->initializeState();
// Initialize StateTransitioner
stm::stmInitialize();
return ret;
}
+ pm::g_context = this;
+
return ret;
}
+void PolicyManager::initializeCarElementState() {
+ CarElement init_car_ele;
+ init_car_ele.state = "none";
+ init_car_ele.changed = false;
+
+ for (int i = stm::StmCarElementNoMin; i <= stm::StmCarElementNoMax; i++) {
+ const char* car_ele_name = stm::kStmCarElementName[i];
+ this->crr_car_elements[car_ele_name] = init_car_ele;
+ }
+
+ this->prv_car_elements = this->crr_car_elements;
+}
+
+void PolicyManager::initializeLayerState() {
+ AreaState init_area;
+ LayoutState init_layout;
+ init_area.name = stm::kStmAreaName[stm::StmAreaNoNone];
+ init_area.category = "";
+ init_area.role = "";
+ init_layout.name = stm::kStmLayoutName[stm::StmLayoutNoNone];
+ init_layout.area_list.push_back(init_area);
+
+ for (int i = stm::StmLayerNoMin; i <= stm::StmLayerNoMax; i++) {
+ const char* layer_name = stm::kStmLayerName[i];
+ this->crr_layers[layer_name].name = layer_name;
+ this->crr_layers[layer_name].layout_state = init_layout;
+ this->crr_layers[layer_name].changed = false;
+ }
+
+ this->prv_layers = this->crr_layers;
+}
+
+void PolicyManager::initializeState() {
+ this->initializeCarElementState();
+ this->initializeLayerState();
+}
+
int PolicyManager::initializeSdEventLoop() {
// Get default event loop object
- int ret = sd_event_new(&(pm::event_loop));
+ int ret = sd_event_new(&(this->event_loop));
if (0 > ret) {
HMI_ERROR("wm:pm", "Faild to sd_event_default: errno:%d", ret);
return -1;
// Create thread for sd_event and detach
std::thread sd_event_loop([this]() {
while (1) {
- sd_event_run(pm::event_loop, 1000);
+ sd_event_run(this->event_loop, 1000);
}
});
sd_event_loop.detach();
return 0;
}
-static void addStateToJson(
- const char* key, int is_changed, const char* state, json_object** json_out) {
- if ((nullptr == key) || (nullptr == state) || (nullptr == json_out)) {
- HMI_ERROR("wm:pm", "Argument is nullptr!!!");
+void PolicyManager::addStateToJson(const char* name, bool changed,
+ std::string state, json_object** json_out) {
+ if ((nullptr == name) || (nullptr == json_out)) {
+ HMI_ERROR("wm:pm", "Invalid argument!!!");
return;
}
- json_object* json_obj = json_object_new_object();
- json_object_object_add(json_obj, "is_changed", json_object_new_boolean(is_changed));
- if (is_changed) {
- HMI_DEBUG("wm:pm", "%s: state changed (%s)", key, state);
- json_object_object_add(json_obj, "state", json_object_new_string(state));
+ json_object_object_add(*json_out, "name", json_object_new_string(name));
+ json_object_object_add(*json_out, "state", json_object_new_string(state.c_str()));
+ json_object_object_add(*json_out, "changed", json_object_new_boolean(changed));
+}
+
+void PolicyManager::addStateToJson(const char* layer_name, bool changed,
+ AreaList area_list, json_object** json_out) {
+ if ((nullptr == layer_name) || (nullptr == json_out)) {
+ HMI_ERROR("wm:pm", "Invalid argument!!!");
+ return;
+ }
+
+ json_object* json_areas = json_object_new_array();
+ json_object* json_tmp;
+ for (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, key, json_obj);
+
+ 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 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");
+void PolicyManager::updateCarElementState(stm::StmState crr_state) {
+ int car_state_no;
+ std::string car_state;
+ bool changed;
- int event_data = *((int*)data);
+ // Store previous layers
+ this->prv_car_elements = this->crr_car_elements;
- 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]);
+ // Update car elements
+ HMI_DEBUG("wm:pm", ">>> CAR ELEMENT");
+ for (int car_ele_no = stm::StmCarElementNoMin;
+ car_ele_no <= stm::StmCarElementNoMax; car_ele_no++) {
+ const char* car_ele_name = stm::kStmCarElementName[car_ele_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;
+ car_state_no = crr_state.car_element[car_ele_no].state;
+ car_state = stm::kStmCarStateNameList[car_ele_no][car_state_no];
+ changed = (crr_state.car_element[car_ele_no].changed) ? true : false;
+
+ this->crr_car_elements[car_ele_name].state = car_state;
+ this->crr_car_elements[car_ele_name].changed = changed;
+
+ HMI_DEBUG("wm:pm", ">>> >>> NAME: %s", car_ele_name);
+ HMI_DEBUG("wm:pm", ">>> >>> >>> STATE:%s", car_state.c_str());
+ HMI_DEBUG("wm:pm", ">>> >>> >>> CHANGED:%s", (changed) ? "true" : "false");
}
+}
- 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]);
-
-#if 1 // @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- // Store previous layers
- pm::g_prv_layers = pm::g_crr_layers;
+void PolicyManager::updateLayerState(int event_data, stm::StmState crr_state) {
+ int event_no, category_no, area_no;
+
+ event_no = STM_GET_EVENT_FROM_ID(event_data);
+ category_no = STM_GET_CATEGORY_FROM_ID(event_data);
+ area_no = STM_GET_AREA_FROM_ID(event_data);
- 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]);
+ std::string req_evt = stm::kStmEventName[event_no];
+ std::string req_ctg = stm::kStmCategoryName[category_no];
+ std::string req_area = stm::kStmAreaName[area_no];
+ std::string req_role = this->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
+ this->prv_layers = this->crr_layers;
// Update layers
- for (int layer_no = stm::gStmLayerNoMin;
- layer_no <= stm::gStmLayerNoMax; layer_no++) {
- const char* layer_name = stm::gStmLayerName[layer_no];
+ for (int layer_no = stm::StmLayerNoMin;
+ layer_no <= stm::StmLayerNoMax; layer_no++) {
+ const char* layer_name = stm::kStmLayerName[layer_no];
HMI_DEBUG("wm:pm", "LAYER:%s", layer_name);
#if 1
// If restriction mode is changed off -> on,
// store current state for state of restriction mode off
- if ((crr_state.restriction_mode.is_changed)
- && (stm::gStmRestrictionModeStateNoOn == crr_state.restriction_mode.state)) {
- HMI_DEBUG("wm:lm", "Store current state for state of restriction mode off");
- pm::g_prv_layers_car_stop[layer_name] = pm::g_crr_layers[layer_name];
+ if ((crr_state.car_element[stm::StmCarElementNoRestrictionMode].changed)
+ && (stm::StmRestrictionModeSttNoOn == crr_state.car_element[stm::StmCarElementNoRestrictionMode].state)) {
+ HMI_DEBUG("wm:pm", "Store current state for state of restriction mode off");
+ this->prv_layers_car_stop[layer_name] = this->crr_layers[layer_name];
}
#else
// If car state is changed car_stop -> car_run,
// store current state for state of car stop
- if ((crr_state.car.is_changed)
- && (stm::gStmCarStateNoRun == crr_state.car.state)) {
- HMI_DEBUG("wm:lm", "Store current state for state of car stop");
- pm::g_prv_layers_car_stop[layer_name] = pm::g_crr_layers[layer_name];
+ if ((crr_state.car.changed)
+ && (stm::StmRunningNoRun == crr_state.car.state)) {
+ HMI_DEBUG("wm:pm", "Store current state for state of car stop");
+ this->prv_layers_car_stop[layer_name] = this->crr_layers[layer_name];
}
#endif
-
// This layer is changed?
- if (crr_state.layer[layer_no].is_changed) {
+ int changed = crr_state.layer[layer_no].changed;
+ if (changed) {
+ HMI_DEBUG("wm:pm", "This layer is changed");
+
// Get previous layout name of this layer
- pm::LayoutState prv_layout_state = pm::g_prv_layers[layer_name].layout_state;
+ LayoutState prv_layout_state = this->prv_layers[layer_name].layout_state;
std::string prv_layout_name = prv_layout_state.name;
// Get current layout name of this layer
int crr_layout_state_no = crr_state.layer[layer_no].state;
- std::string crr_layout_name = std::string(stm::gStmLayoutNo2Name[crr_layout_state_no]);
+ std::string crr_layout_name = std::string(stm::kStmLayoutName[crr_layout_state_no]);
- pm::LayoutState crr_layout_state;
+ LayoutState crr_layout_state;
#if 1
- if ((crr_state.restriction_mode.is_changed)
- && (stm::gStmRestrictionModeStateNoOff == crr_state.restriction_mode.state)) {
+ if ((crr_state.car_element[stm::StmCarElementNoRestrictionMode].changed)
+ && (stm::StmRestrictionModeSttNoOff == crr_state.car_element[stm::StmCarElementNoRestrictionMode].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");
- crr_layout_state = pm::g_prv_layers_car_stop[layer_name].layout_state;
+ HMI_DEBUG("wm:pm", "Restriction mode is changed on -> off, so restore state of restriction mode off");
#else
- if ((crr_state.car.is_changed)
- && (stm::gStmCarStateNoStop == crr_state.car.state)) {
+ if ((crr_state.car_element[stm::StmCarElementNoRunning].changed)
+ && (stm::StmCarElementNoStop == crr_state.car_element[stm::StmCarElementNoRunning].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");
- crr_layout_state = pm::g_prv_layers_car_stop[layer_name].layout_state;
+ HMI_DEBUG("wm:pm", "Car state is changed car_run -> car_stop, so restore state of car stop");
#endif
+ crr_layout_state = this->prv_layers_car_stop[layer_name].layout_state;
+ crr_layout_name = crr_layout_state.name;
+ if ((prv_layout_name == crr_layout_name)
+ && (stm::kStmAreaName[stm::StmAreaNoNone] == crr_layout_name)) {
+ changed = 0;
+ }
}
-#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);
+ else if ((prv_layout_name == crr_layout_name)
+ && (stm::kStmAreaName[stm::StmAreaNoNone] == crr_layout_name)) {
+ // Copy previous layout state for current
+ crr_layout_state = prv_layout_state;
+ changed = 0;
}
-#endif
else {
// Copy previous layout state for current
crr_layout_state = prv_layout_state;
+ HMI_DEBUG("wm:pm", "layout name previous:%s current:%s",
+ prv_layout_name.c_str(), crr_layout_name.c_str());
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");
- 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;
+ HMI_DEBUG("wm:pm", "Previous layout is NOT same with current");
+ crr_layout_state.name = this->default_layouts[crr_layout_name].name;
+ crr_layout_state.category_num = this->default_layouts[crr_layout_name].category_num;
+ crr_layout_state.area_list = this->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<std::string, std::vector<pm::AreaState>> 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<pm::AreaState> 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());
- }
- }
- 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());
+ // Create candidate list
+ std::map<std::string, AreaList> cand_list;
+ for (int ctg_no=stm::StmCtgNoMin;
+ ctg_no<=stm::StmCtgNoMax; ctg_no++) {
+ const char* ctg = stm::kStmCategoryName[ctg_no];
+ HMI_DEBUG("wm:pm", "ctg:%s", ctg);
+
+ // Create candidate list for category from the previous displayed categories
+ AreaList tmp_cand_list;
+ for (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);
}
-
- 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;
- for (pm::AreaState &as : crr_layout_state.area_list) {
- if (as.category == category) {
+ 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 (AreaState &as : crr_layout_state.area_list) {
+ 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;
}
}
// 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());
- pm::AreaState area_state;
- area_state.name = area;
- area_state.category = category;
- area_state.role = role;
- ctg_list[category].push_back(area_state);
+ HMI_DEBUG("wm:pm", "Push request to candidate list");
+ AreaState 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) {
+ AreaState area_state;
+ area_state.name = "";
+ area_state.category = ctg;
+ if (0 != crr_layout_state.role_history[ctg].size()) {
+ HMI_DEBUG("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 (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
- pm::g_crr_layers[layer_name].layout_state = crr_layout_state;
+ this->crr_layers[layer_name].layout_state = crr_layout_state;
}
+ // Update changed flag
+ this->crr_layers[layer_name].changed = (changed) ? true : false;
}
+ // Erase role for the event_data from list
+ this->req_role_list.erase(event_data);
+
// Check
- for (auto itr : pm::g_crr_layers) {
- pm::LayerState ls = itr.second;
+ for (auto itr : this->crr_layers) {
+ LayerState ls = itr.second;
HMI_DEBUG("wm:pm", ">>> LAYER:%s",ls.name.c_str());
HMI_DEBUG("wm:pm", ">>> >>> LAYOUT:%s", ls.layout_state.name.c_str());
- for (pm::AreaState as : ls.layout_state.area_list) {
+ for (AreaState as : ls.layout_state.area_list) {
HMI_DEBUG("wm:pm", ">>> >>> >>> AREA:%s", as.name.c_str());
HMI_DEBUG("wm:pm", ">>> >>> >>> >>> CTG:%s", as.category.c_str());
HMI_DEBUG("wm:pm", ">>> >>> >>> >>> ROLE:%s", as.role.c_str());
}
+ HMI_DEBUG("wm:pm", ">>> >>> CHANGED:%s", (ls.changed) ? "true" : "false");
}
-#endif // @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+}
- json_object* json_out = json_object_new_object();
+void PolicyManager::updateState(int event_data, stm::StmState crr_state) {
+ this->updateCarElementState(crr_state);
+ this->updateLayerState(event_data, crr_state);
+}
- // Create result
+void PolicyManager::createOutputInformation(stm::StmState crr_state, json_object **json_out) {
+ json_object* json_tmp;
+
+ // Create car element information
// {
- // "parking_brake": {
- // "is_changed": <bool>,
- // "state": <const char*>
- // },
- addStateToJson("parking_brake",
- crr_state.parking_brake.is_changed,
- stm::gStmParkingBrakeStateNo2Name[crr_state.parking_brake.state],
- &json_out);
-
- // "accel_pedal": {
- // "is_changed": <bool>,
- // "state": <const char*>
- // },
- addStateToJson("accel_pedal",
- crr_state.accel_pedal.is_changed,
- stm::gStmAccelPedalStateNo2Name[crr_state.accel_pedal.state],
- &json_out);
-
- // "lightstatus_brake": {
- // "is_changed": <bool>,
- // "state": <const char*>
- // },
- addStateToJson("lightstatus_brake",
- crr_state.lightstatus_brake.is_changed,
- stm::gStmLightstatusBrakeStateNo2Name[crr_state.lightstatus_brake.state],
- &json_out);
-
- // "car": {
- // "is_changed": <bool>,
- // "state": <const char*>
- // },
- addStateToJson("car",
- crr_state.car.is_changed,
- stm::gStmCarStateNo2Name[crr_state.car.state],
- &json_out);
-
- // "lamp": {
- // "is_changed": <bool>,
- // "state": <const char*>
- // },
- addStateToJson("lamp",
- crr_state.lamp.is_changed,
- stm::gStmLampStateNo2Name[crr_state.lamp.state],
- &json_out);
-
- // "restriction_mode": {
- // "is_changed": <bool>,
- // "state": <const char*>
+ // "car_elements": [
+ // {
+ // "parking_brake": {
+ // "changed": <bool>,
+ // "state": <const char*>
+ // },
+ // ...
// },
- addStateToJson("restriction_mode",
- crr_state.restriction_mode.is_changed,
- stm::gStmRestrictionModeStateNo2Name[crr_state.restriction_mode.state],
- &json_out);
+ json_object* json_car_ele = json_object_new_array();
+ const char* car_ele_name;
+ for (int car_ele_no = stm::StmCarElementNoMin;
+ car_ele_no <= stm::StmCarElementNoMax; car_ele_no++) {
+ car_ele_name = stm::kStmCarElementName[car_ele_no];
+ json_tmp = json_object_new_object();
+ this->addStateToJson(car_ele_name,
+ this->crr_car_elements[car_ele_name].changed,
+ this->crr_car_elements[car_ele_name].state,
+ &json_tmp);
+ json_object_array_add(json_car_ele, json_tmp);
+ }
+ json_object_object_add(*json_out, "car_elements", json_car_ele);
+ // Create layout information
+ //
// "layers": [
+ // {
+ // "homescreen": {
+ // "changed": <bool>,
+ // "areas": [
+ // {
+ // "name":<const char*>,
+ // "role":<const char*>
+ // }.
+ // ...
+ // ]
+ // }
+ // },
+ // ...
json_object* json_layer = json_object_new_array();
- json_object* json_tmp;
-
- // {
- // "homescreen": {
- // "is_changed": <bool>,
- // "state": <const char*>
- // }
- // },
- // ]
- // }
- 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": <bool>,
- // "state": <const char*>
- // }
- // },
- 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": <bool>,
- // "state": <const char*>
- // }
- // },
- 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": <bool>,
- // "state": <const char*>
- // }
- // },
- 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);
-
- // Add json array of layer
- json_object_object_add(json_out, "layers", json_layer);
-
- // Notify state is changed
- if (nullptr != pm::callback.onStateTransitioned) {
- pm::callback.onStateTransitioned(json_out);
+ const char* layer_name;
+ for (int layer_no = stm::StmLayerNoMin;
+ layer_no <= stm::StmLayerNoMax; layer_no++) {
+ layer_name = stm::kStmLayerName[layer_no];
+ json_tmp = json_object_new_object();
+ this->addStateToJson(layer_name,
+ this->crr_layers[layer_name].changed,
+ this->crr_layers[layer_name].layout_state.area_list,
+ &json_tmp);
+ json_object_array_add(json_layer, json_tmp);
}
+ json_object_object_add(*json_out, "layers", json_layer);
+}
- if (crr_state.car.is_changed) {
- if (stm::gStmCarStateNoRun == crr_state.car.state) {
+void PolicyManager::controlTimerEvent(stm::StmState crr_state) {
+ if (crr_state.car_element[stm::StmCarElementNoRunning].changed) {
+ if (stm::StmRunningNoRun == crr_state.car_element[stm::StmCarElementNoRunning].state) {
// Set delay event(restriction mode on)
- checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_ON, 3000, nullptr);
+ this->setStateTransitionProcessToSystemd(stm::StmEvtNoRestrictionModeOn, 3000, "");
}
- else if (stm::gStmCarStateNoStop == crr_state.car.state) {
- // Set event(restriction mode off)
- checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_OFF, 0, nullptr);
-
+ else if (stm::StmRunningNoStop == crr_state.car_element[stm::StmCarElementNoRunning].state) {
// Stop timer for restriction on event
- if (pm::event_source_list.find(STM_EVT_NO_RESTRICTION_MODE_ON)
- != pm::event_source_list.end()) {
+ if (this->event_source_list.find(stm::StmEvtNoRestrictionModeOn)
+ != this->event_source_list.end()) {
HMI_DEBUG("wm:pm", "Stop timer for restriction on");
sd_event_source *event_source
- = pm::event_source_list[STM_EVT_NO_RESTRICTION_MODE_ON];
+ = this->event_source_list[stm::StmEvtNoRestrictionModeOn];
int ret = sd_event_source_set_enabled(event_source, SD_EVENT_OFF);
if (0 > ret) {
HMI_ERROR("wm:pm", "Failed to stop timer");
}
}
+
+ // Set event(restriction mode off)
+ this->setStateTransitionProcessToSystemd(stm::StmEvtNoRestrictionModeOff, 0, "");
+ }
+ }
+}
+
+int PolicyManager::transitionState(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 = STM_GET_EVENT_FROM_ID(event_data);
+ category_no = STM_GET_CATEGORY_FROM_ID(event_data);
+ area_no = STM_GET_AREA_FROM_ID(event_data);
+ HMI_DEBUG("wm:pm", ">>>>>>>>>> event:%s category:%s area:%s",
+ stm::kStmEventName[event_no],
+ stm::kStmCategoryName[category_no],
+ stm::kStmAreaName[area_no]);
+
+ // Transition state
+ stm::StmState crr_state;
+ int ret = stm::stmTransitionState(event_data, &crr_state);
+ if (0 > ret) {
+ HMI_ERROR("wm:pm", "Failed transition state");
+ if (nullptr != this->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::kStmEventName[event_no]));
+ json_object_object_add(json_out, "role",
+ json_object_new_string(this->req_role_list[event_data].c_str()));
+ json_object_object_add(json_out, "area",
+ json_object_new_string(stm::kStmAreaName[area_no]));
+ this->callback.onError(json_out);
+ json_object_put(json_out);
}
+ return -1;
}
+ // Update state which is managed by PolicyManager
+ this->updateState(event_data, crr_state);
+
+ // Create output information for ResourceManager
+ json_object* json_out = json_object_new_object();
+ this->createOutputInformation(crr_state, &json_out);
+
+ // Notify changed state
+ if (nullptr != this->callback.onStateTransitioned) {
+ this->callback.onStateTransitioned(json_out);
+ }
+
+ // Start/Stop timer events
+ this->controlTimerEvent(crr_state);
+
// Release json_object
json_object_put(json_out);
sd_event_source_unref(source);
// Remove event source from list
- if (pm::event_source_list.find(event_data) != pm::event_source_list.end()) {
- pm::event_source_list.erase(event_data);
+ if (this->event_source_list.find(event_data) != this->event_source_list.end()) {
+ this->event_source_list.erase(event_data);
}
HMI_DEBUG("wm:pm", ">>>>>>>>>> FINISH CHECK POLICY");
return 0;
}
-static int timerEvent(sd_event_source *source, uint64_t usec, void *data) {
- int ret = checkPolicy(source, data);
+int PolicyManager::timerEvent(sd_event_source *source, uint64_t usec, void *data) {
+ HMI_DEBUG("wm:pm", "Call");
+
+ int ret = this->transitionState(source, data);
return ret;
-};
+}
-static int checkPolicyEntry(int event, uint64_t delay_ms, const char* role)
+int PolicyManager::setStateTransitionProcessToSystemd(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
+ this->req_role_list[event] = role;
if (0 == delay_ms) {
- int ret = sd_event_add_defer(pm::event_loop, NULL,
- &checkPolicy, new int(event));
+ int ret = sd_event_add_defer(this->event_loop, NULL,
+ &pm::transitionStateWrapper, 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);
+ this->req_role_list.erase(event);
return -1;
}
}
// Set timer
struct sd_event_source* event_source;
- int ret = sd_event_add_time(pm::event_loop, &event_source, CLOCK_MONOTONIC, usec, 1,
- &timerEvent, new int(event));
+ int ret = sd_event_add_time(this->event_loop, &event_source, CLOCK_MONOTONIC, usec, 1,
+ &pm::timerEventWrapper, 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);
+ this->req_role_list.erase(event);
return -1;
}
// Store event source
- pm::event_source_list[event] = event_source;
+ this->event_source_list[event] = event_source;
}
return 0;
}
void PolicyManager::registerCallback(CallbackTable callback) {
- pm::callback.onStateTransitioned = callback.onStateTransitioned;
- pm::callback.onError = callback.onError;
+ HMI_DEBUG("wm:pm", "Call");
+
+ this->callback.onStateTransitioned = callback.onStateTransitioned;
+ this->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
// Get event from json_object
const char* event = this->getStringFromJson(json_in, "event");
- int event_no = 0;
+ int event_no = stm::StmEvtNoNone;
if (nullptr != event) {
// Convert name to number
- event_no = this->eventname2no_[event];
- HMI_DEBUG("wm:pm", "event(%s:%d)", event, event_no);
+ auto itr = this->eventname2no.find(event);
+ if (this->eventname2no.end() != itr) {
+ event_no = this->eventname2no[event];
+ HMI_DEBUG("wm:pm", "event(%s:%d)", event, event_no);
+ }
+ else {
+ HMI_ERROR("wm:pm", "Invalid event name!!");
+ return -1;
+ }
+ }
+ else {
+ HMI_ERROR("wm:pm", "Event is not set!!");
+ return -1;
}
// Get role from json_object
const char* role = this->getStringFromJson(json_in, "role");
- int category_no = 0;
+ int category_no = stm::StmCtgNoNone;
if (nullptr != role) {
HMI_DEBUG("wm:pm", "role(%s)", role);
// Convert role to category
- const char* category = this->role2category_[role].c_str();
- if (0 == strcmp("", category)) {
- HMI_ERROR("wm:pm", "Error!!");
- return -1;
+ std::string category;
+ auto itr = this->role2category.find(role);
+ if (this->role2category.end() != itr) {
+ category = this->role2category[role];
+
+ // Convert name to number
+ category_no = categoryname2no[category];
+ HMI_DEBUG("wm:pm", "role(%s), category(%s:%d)", role, category.c_str(), category_no);
}
- HMI_DEBUG("wm:pm", "category(%s)", category);
+ }
- // Convert name to number
- category_no = categoryname2no_[category];
- HMI_DEBUG("wm:pm", "role(%s), category(%s:%d)", role, category, category_no);
+ if (stm::StmCtgNoNone == category_no) {
+ role = "";
}
// Get areat from json_object
const char* area = this->getStringFromJson(json_in, "area");
- int area_no = 0;
+ int area_no = stm::StmAreaNoNone;
if (nullptr != area) {
- // Convert name to number
- area_no = areaname2no_[area];
- HMI_DEBUG("wm:pm", "area(%s:%d)", area, area_no);
+ auto itr = this->areaname2no.find(area);
+ if (this->areaname2no.end() != itr) {
+ area_no = this->areaname2no[area];
+ HMI_DEBUG("wm:pm", "area(%s:%d)", area, area_no);
+ }
+ }
+
+ // If role is set and area is not set, use default area
+ if ((stm::StmAreaNoNone == area_no)
+ && (stm::StmCtgNoNone != category_no)) {
+ std::string def_area = this->role2defaultarea[role];
+ area_no = this->areaname2no[def_area];
+ HMI_DEBUG("wm:pm", "area(%s:%d)", def_area.c_str(), area_no);
}
- // Check policy
- checkPolicyEntry((event_no | category_no | area_no), 0, role);
+ // Set event info to the queue
+ EventInfo event_info;
+ int event_id = STM_CREATE_EVENT_ID(event_no, category_no, area_no);
+ event_info.event = event_id;
+ event_info.role = std::string(role);
+ event_info.delay = 0;
+ this->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;
+ EventInfo event_info;
+
+ while (!this->event_info_queue.empty()) {
+ // Get event info from queue and delete
+ event_info = this->event_info_queue.front();
+ this->event_info_queue.pop();
+
+ // Set event info for checking policy
+ ret = this->setStateTransitionProcessToSystemd(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();
+
+ this->crr_layers = this->prv_layers;
}
extern const char* kDefaultRoleDb;
std::string role = this->deleteSpace(*itr);
std::string area = this->deleteSpace(vct_areas[0]);
- this->role2category_[role] = std::string(category);
- this->role2defaultarea_[role] = area;
+ this->role2category[role] = std::string(category);
+ this->role2defaultarea[role] = area;
}
- this->category2role_[std::string(category)] = std::string(roles);
+ this->category2role[std::string(category)] = std::string(roles);
}
// Check
- HMI_DEBUG("wm:pm", "Check role2category_");
- for (auto& x:this->role2category_){
+ HMI_DEBUG("wm:pm", "Check role2category");
+ for (auto& x:this->role2category){
HMI_DEBUG("wm:pm", "key:%s, val:%s", x.first.c_str(), x.second.c_str());
}
- HMI_DEBUG("wm:pm", "Check role2defaultarea_");
- for (auto& x:this->role2defaultarea_){
+ HMI_DEBUG("wm:pm", "Check role2defaultarea");
+ for (auto& x:this->role2defaultarea){
HMI_DEBUG("wm:pm", "key:%s, val:%s", x.first.c_str(), x.second.c_str());
}
- HMI_DEBUG("wm:pm", "Check category2role_");
- for (auto& x:this->category2role_){
+ HMI_DEBUG("wm:pm", "Check category2role");
+ for (auto& x:this->category2role){
HMI_DEBUG("wm:pm", "key:%s, val:%s", x.first.c_str(), x.second.c_str());
}
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");
HMI_DEBUG("wm:pm", "json_area_array len:%d", len_area);
HMI_DEBUG("wm:pm", "json_area_array dump:%s", json_object_get_string(json_area_array));
- pm::LayoutState layout_state;
- pm::AreaState area_state;
+ LayoutState layout_state;
+ AreaState area_state;
std::map<std::string, int> category_num;
- for (int ctg_no = stm::gStmCategoryNoMin;
- ctg_no <= stm::gStmCategoryNoMax; ctg_no++) {
- const char* ctg_name = stm::gStmCategoryName[ctg_no];
+ for (int ctg_no = stm::StmCtgNoMin;
+ ctg_no <= stm::StmCtgNoMax; ctg_no++) {
+ const char* ctg_name = stm::kStmCategoryName[ctg_no];
category_num[ctg_name] = 0;
}
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);
layout_state.name = layout;
layout_state.category_num = category_num;
- pm::g_default_layouts[layout] = layout_state;
+ this->default_layouts[layout] = layout_state;
}
// initialize for none layout
- pm::LayoutState none_layout_state;
+ LayoutState none_layout_state;
memset(&none_layout_state, 0, sizeof(none_layout_state));
none_layout_state.name = "none";
- pm::g_default_layouts["none"] = none_layout_state;
+ this->default_layouts["none"] = none_layout_state;
// Check
- for(auto itr_layout = pm::g_default_layouts.begin();
- itr_layout != pm::g_default_layouts.end(); ++itr_layout) {
+ for(auto itr_layout = this->default_layouts.begin();
+ itr_layout != this->default_layouts.end(); ++itr_layout) {
HMI_DEBUG("wm:pm", ">>> layout:%s", itr_layout->first.c_str());
for (auto itr_area = itr_layout->second.area_list.begin();
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
}
}
Code Review / apps / agl-service-windowmanager.git / blobdiff