#include <istream>
#include <thread>
#include <map>
+#include <queue>
#include <systemd/sd-event.h>
#include <json-c/json.h>
#include "policy_manager.hpp"
namespace pm {
-typedef std::unordered_map<std::string, std::string> AppAttribute;
-typedef std::unordered_map<std::string, AppAttribute> AreasState;
-typedef std::unordered_map<std::string, AreasState> LayoutState;
-typedef std::unordered_map<std::string, LayoutState> LayersState;
+typedef struct AreaState {
+ std::string name;
+ std::string category;
+ std::string role;
+} AreaState;
+
+typedef std::vector<AreaState> AreaList;
+typedef struct LayoutState {
+ std::string name;
+ std::map<std::string, int> category_num;
+ AreaList area_list;
+ std::map<std::string, std::vector<std::string>> role_history;
+} LayoutState;
+
+typedef struct LayerState {
+ std::string name;
+ LayoutState layout_state;
+} LayerState;
+
+typedef struct EventInfo {
+ int event;
+ std::string role;
+ uint64_t delay;
+} EventInfo;
struct sd_event* event_loop;
std::map<int, struct sd_event_source*> event_source_list;
+std::map<int, std::string> g_req_role_list;
PolicyManager::CallbackTable callback;
-LayersState g_prv_layers;
-LayersState g_crr_layers;
-LayoutState g_default_layout_state;
+std::queue<EventInfo> g_event_info_queue;
+
+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;
} // namespace pm
int ret = 0;
// Create convert map
- for (unsigned int i=0; i<STM_NUM_EVT; i++) {
+ for (int i = stm::gStmEventNoMin; i <= stm::gStmEventNoMax; 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 (unsigned int i=0; i<STM_NUM_CTG; 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 (unsigned int i=0; i<STM_NUM_ARA; i++) {
+ for (int i = stm::gStmAreaNoMin; i <= stm::gStmAreaNoMax; i++) {
HMI_DEBUG("wm:pm", "area name:%s no:%d", stm::gStmAreaName[i], stm::gStmAreaNo[i]);
this->areaname2no_[stm::gStmAreaName[i]] = stm::gStmAreaNo[i];
}
}
// Initialize current/previous state of layers
- pm::AppAttribute init_app;
- pm::AreasState init_area;
+ pm::AreaState init_area;
pm::LayoutState init_layout;
- init_app["role"] = "none";
- init_area["none"] = init_app;
- init_layout["none"] = init_area;
-
- pm::g_crr_layers["homescreen"] = init_layout;
- pm::g_crr_layers["apps"] = init_layout;
- pm::g_crr_layers["restriction"] = init_layout;
- pm::g_crr_layers["on_screen"] = 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 StateTransitioner
json_object_object_add(*json_out, key, json_obj);
}
-static int checkPolicyEntry(int event, uint64_t delay_ms);
+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;
+ }
+
+ 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 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 = *((int*)data);
+ int event_data = *((int*)data);
int event_no, category_no, area_no;
- event_no = event & STM_MSK_EVT_NO;
- category_no = event & STM_MSK_CTG_NO;
- area_no = event & STM_MSK_ARA_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 - 1],
- stm::gStmCategoryName[(category_no >> 8) - 1],
- stm::gStmAreaName[(area_no >> 16) - 1]);
+ 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, &crr_state);
+ int ret = stm::stmTransitionState(event_data, &crr_state);
if (0 > ret) {
HMI_ERROR("wm:pm", "Error!!");
return -1;
crr_state.layer[stm::gStmLayerNoOnScreen].state,
stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoOnScreen].state]);
-#if 0 // @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
// Store previous layers
pm::g_prv_layers = pm::g_crr_layers;
- std::string layer_name = "homescreen";
-
- // changed?
- if (crr_state.layer[stm::gStmLayerNoHomescreen].is_changed) {
- // Get previous layout name of this layer
- pm::LayoutState prv_layout_state = pm::g_prv_layers[layer_name];
- std::string prv_layout_name = prv_homescreen_layout_state.first();
-
- // Get current layout name of this layer
- std::string crr_layout_name = std::string(stm::gStmLayoutNo2Name[crr_state.layer[stm::gStmLayerNoHomescreen].state]);
-
- // Compare layout name
- pm::LayoutState crr_layout_state;
- if ("none" == crr_layout_name) {
- // If current layout is "none",
- // current areas is set with "none"
- HMI_DEBUG("wm:pm", "Current layout is \"none\"");
- HMI_DEBUG("wm:lm", "Current layout is \"none\"");
- pm::AppAttribute crr_app_attribute;
- pm::AreasState crr_areas_state;
- crr_app_attribute["role"] = "none";
- crr_areas_state["none"] = "none";
- crr_layout_state["none"] = crr_areas_state;
+ 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",
+ req_evt.c_str(), req_role.c_str(), req_ctg.c_str(), req_area.c_str());
+
+ // Update layers
+ 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);
+
+#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];
}
- else {
- if (prv_layout_name == crr_layout_name) {
- // If previous layout is same with current,
- // previous areas are copied to current
- crr_layout_state[crr_layout_name] = pm::g_prv_layers[layer_name][crr_layout_name];
- }
- else {
- // If previous layout is same with current,
- // previous areas are copied to current
- crr_layout_state[crr_layout_name] = this->default_layout_state[crr_layout_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];
+ }
+#endif
+
+
+ // This layer is changed?
+ if (crr_state.layer[layer_no].is_changed) {
+ // Get previous layout name of this layer
+ pm::LayoutState prv_layout_state = pm::g_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]);
- // Update role in new area
+ pm::LayoutState crr_layout_state;
#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");
+ if ((crr_state.restriction_mode.is_changed)
+ && (stm::gStmRestrictionModeStateNoOff == crr_state.restriction_mode.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;
#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");
+ if ((crr_state.car.is_changed)
+ && (stm::gStmCarStateNoStop == crr_state.car.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;
#endif
+ }
+ else {
+ // Copy previous layout state for current
+ crr_layout_state = prv_layout_state;
+
+ if (prv_layout_name == crr_layout_name) {
+ HMI_DEBUG("wm:lm", "Previous layout is same with current");
}
else {
- HMI_DEBUG("wm:lm", "Get new_area for new role");
- // Get new_area for new role
- std::string new_area = this->getAreaName(this->layout_define_[crr_layout_name],
- new_role, category);
+ // 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;
+ }
- if ("none" == new_area) {
- HMI_DEBUG("wm:lm", "It is not necessary to update role of areas in this layer, because new_role is not specified for this layer");
+ // Create candidate list
+ std::map<std::string, pm::AreaList> 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 {
- // Is there new_area?
- // if there is new_area, set new role there
- // if NOT, find same category of new_role
- // pop old role and shift area
- // push new role and set area
+ 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 == req_ctg) {
+ request_for_this_layer = true;
+
+ 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,
+ // so push requested role to candidate list
+ if (request_for_this_layer && (!updated)) {
+ HMI_DEBUG("wm:pm", "Push request to candidate list");
+ pm::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);
+ }
+ }
+
+ // 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_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 role in new area
- // because new_role is specified for this layer
- TypeRolCtg crr_role;
- crr_role["role"] = std::string(new_role);
- crr_layout[crr_layout_name][new_area] = crr_role;
+ // 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
+ pm::g_crr_layers[layer_name].layout_state = crr_layout_state;
}
+ }
- // Update current layout of this layer
- pm::g_crr_layers[layer_name] = crr_layout_state;
-
+ // Check
+ for (auto itr : pm::g_crr_layers) {
+ pm::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) {
+ 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());
+ }
}
-#endif // @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
json_object* json_out = json_object_new_object();
stm::gStmRestrictionModeStateNo2Name[crr_state.restriction_mode.state],
&json_out);
+ // 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);
+ 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);
+
+ 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);
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);
+ 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);
+ 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)
sd_event_source_unref(source);
// Remove event source from list
- if (pm::event_source_list.find(event) != pm::event_source_list.end()) {
- pm::event_source_list.erase(event);
+ if (pm::event_source_list.find(event_data) != pm::event_source_list.end()) {
+ pm::event_source_list.erase(event_data);
}
HMI_DEBUG("wm:pm", ">>>>>>>>>> FINISH CHECK POLICY");
}
static int timerEvent(sd_event_source *source, uint64_t usec, void *data) {
- checkPolicy(source, data);
-};
+ HMI_DEBUG("wm:pm", "Call");
+
+ int ret = checkPolicy(source, data);
+ return ret;
+}
-static int checkPolicyEntry(int event, uint64_t delay_ms)
+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 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_req_role_list.erase(event);
return -1;
}
}
&timerEvent, new int(event));
if (0 > ret) {
HMI_ERROR("wm:pm", "Faild to sd_event_add_time: errno:%d", ret);
+ pm::g_req_role_list.erase(event);
return -1;
}
}
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
HMI_DEBUG("wm:pm", "area(%s:%d)", area, area_no);
}
- // Check policy
- checkPolicyEntry((event_no | category_no | area_no), 0);
+ // 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;
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::AreasState areas_state;
+ pm::LayoutState layout_state;
+ pm::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];
+ category_num[ctg_name] = 0;
+ }
+
for (int j=0; j<len_area; j++) {
json_object* json_area = json_object_array_get_idx(json_area_array, j);
HMI_ERROR("wm:pm", "Parse Error!!");
return -1;
}
+ area_state.name = std::string(area);
HMI_DEBUG("wm:pm", ">> area:%s", area);
// Get app attribute of the area
- pm::AppAttribute app_attribute;
category = this->getStringFromJson(json_area, "category");
if (nullptr == category) {
HMI_ERROR("wm:pm", "Parse Error!!");
return -1;
}
- app_attribute["category"] = std::string(category);
+ area_state.category = std::string(category);
+ category_num[category]++;
HMI_DEBUG("wm:pm", ">>> category:%s", category);
role = this->getStringFromJson(json_area, "role");
if (nullptr != role) {
// Role is NOT essential here
- app_attribute["role"] = std::string(role);
- HMI_DEBUG("wm:pm", ">>> role:%s", role);
+ area_state.role = std::string(role);
+ }
+ else {
+ area_state.role = std::string("");
+
}
+ HMI_DEBUG("wm:pm", ">>> role:%s", role);
+
+ layout_state.area_list.push_back(area_state);
- areas_state[area] = app_attribute;
}
- pm::g_default_layout_state[layout] = areas_state;
+ layout_state.name = layout;
+ layout_state.category_num = category_num;
+ pm::g_default_layouts[layout] = layout_state;
}
+ // initialize for none layout
+ pm::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;
+
// Check
- for(auto itr_layout = pm::g_default_layout_state.begin();
- itr_layout != pm::g_default_layout_state.end(); ++itr_layout) {
+ for(auto itr_layout = pm::g_default_layouts.begin();
+ itr_layout != pm::g_default_layouts.end(); ++itr_layout) {
HMI_DEBUG("wm:pm", ">>> layout:%s", itr_layout->first.c_str());
- for (auto itr_area = itr_layout->second.begin();
- itr_area != itr_layout->second.end(); ++itr_area) {
- HMI_DEBUG("wm:pm", ">>> >>> area:%s", itr_area->first.c_str());
-
- 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());
- }
+ for (auto itr_area = itr_layout->second.area_list.begin();
+ itr_area != itr_layout->second.area_list.end(); ++itr_area) {
+ 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());
}
}
Code Review / apps / agl-service-windowmanager.git / blobdiff