return -1;
}
- // TODO: application requests by old role,
- // so create role map (old, new)
- // Load old_role.db
- this->loadOldRoleDb();
-
// Store my context for calling callback from PolicyManager
g_context = this;
// Make afb event
for (int i = Event_Val_Min; i <= Event_Val_Max; i++)
{
- map_afb_event[kListEventName[i]] = afb_daemon_make_event(kListEventName[i].c_str());
+ map_afb_event[kListEventName[i]] = afb_api_make_event(afbBindingV3root, kListEventName[i].c_str());
}
const struct rect css_bg = this->lc->getAreaSize("fullscreen");
result<int> WindowManager::api_request_surface(char const *appid, char const *drawing_name)
{
- // TODO: application requests by old role,
- // so convert role old to new
- const char *role = this->convertRoleOldToNew(drawing_name);
string str_id = appid;
- string str_role = role;
+ string role = drawing_name;
unsigned lid = 0;
if(!g_app_list.contains(str_id))
{
- lid = this->lc->getNewLayerID(str_role);
+ lid = this->lc->getNewLayerID(role);
if (lid == 0)
{
// register drawing_name as fallback and make it displayed.
}
this->lc->createNewLayer(lid);
// add client into the db
- g_app_list.addClient(str_id, lid, str_role);
+ g_app_list.addClient(str_id, lid, role);
}
// generate surface ID for ivi-shell application
- auto rname = this->id_alloc.lookup(str_role);
+ auto rname = this->id_alloc.lookup(role);
if (!rname)
{
// name does not exist yet, allocate surface id...
- auto id = int(this->id_alloc.generate_id(str_role));
+ auto id = int(this->id_alloc.generate_id(role));
this->tmp_surface2app[id] = {str_id, lid};
- // Set role map of (new, old)
- this->rolenew2old[role] = string(drawing_name);
+ // POI: AGL LifeCycle Management
+ this->amgr.states[str_id] = lcm::CREATED;
+ this->amgr.emit_activity_status_changed(str_id.c_str(),
+ this->amgr.states_s[lcm::CREATED]);
return Ok<int>(id);
}
char const *WindowManager::api_request_surface(char const *appid, char const *drawing_name,
char const *ivi_id)
{
- // TODO: application requests by old role,
- // so convert role old to new
- const char *role = this->convertRoleOldToNew(drawing_name);
string str_id = appid;
- string str_role = role;
+ string role = drawing_name;
unsigned sid = std::stol(ivi_id);
HMI_DEBUG("This API(requestSurfaceXDG) is for XDG Application using runXDG");
if(!g_app_list.contains(str_id))
{
- unsigned l_id = this->lc->getNewLayerID(str_role);
+ unsigned l_id = this->lc->getNewLayerID(role);
if (l_id == 0)
{
// register drawing_name as fallback and make it displayed.
}
this->lc->createNewLayer(l_id);
// add client into the db
- g_app_list.addClient(str_id, l_id, str_role);
+ g_app_list.addClient(str_id, l_id, role);
}
- auto rname = this->id_alloc.lookup(str_role);
+ auto rname = this->id_alloc.lookup(role);
if (rname)
{
}
// register pair drawing_name and ivi_id
- this->id_alloc.register_name_id(str_role, sid);
+ this->id_alloc.register_name_id(role, sid);
auto client = g_app_list.lookUpClient(str_id);
client->addSurface(sid);
- // Set role map of (new, old)
- this->rolenew2old[role] = string(drawing_name);
+ // POI: AGL LifeCycle Management
+ this->amgr.states[str_id] = lcm::CREATED;
+ this->amgr.emit_activity_status_changed(str_id.c_str(),
+ this->amgr.states_s[lcm::CREATED]);
return nullptr;
}
void WindowManager::api_activate_window(char const *appid, char const *drawing_name,
char const *drawing_area, const reply_func &reply)
{
- // TODO: application requests by old role,
- // so convert role old to new
- const char *c_role = this->convertRoleOldToNew(drawing_name);
-
string id = appid;
- string role = c_role;
+ string role = drawing_name;
string area = drawing_area;
if(!g_app_list.contains(id))
return;
}
- /*
- * Do allocate tasks
- */
+ // Do allocate tasks
+
ret = this->checkPolicy(req_num);
if (ret != WMError::SUCCESS)
HMI_SEQ_ERROR(req_num, errorDescription(ret));
g_app_list.removeRequest(req_num);
this->processNextRequest();
+ } else {
+ // POI: AGL LifeCycle Management
+ if (this->amgr.states[id] == lcm::CREATED) {
+ this->amgr.states[id] = lcm::STARTED;
+ this->amgr.emit_activity_status_changed(id.c_str(),
+ this->amgr.states_s[lcm::STARTED]);
+ }
}
}
void WindowManager::api_deactivate_window(char const *appid, char const *drawing_name,
const reply_func &reply)
{
- // TODO: application requests by old role,
- // so convert role old to new
- const char *c_role = this->convertRoleOldToNew(drawing_name);
-
- /*
- * Check Phase
- */
+ // Check Phase
string id = appid;
- string role = c_role;
+ string role = drawing_name;
string area = ""; //drawing_area;
Task task = Task::TASK_RELEASE;
unsigned req_num = 0;
return;
}
- /*
- * Do allocate tasks
- */
+ // Do allocate tasks
ret = this->checkPolicy(req_num);
if (ret != WMError::SUCCESS)
HMI_SEQ_ERROR(req_num, errorDescription(ret));
g_app_list.removeRequest(req_num);
this->processNextRequest();
+ } else {
+ // POI: AGL LifeCycle Management
+ int state = this->amgr.states[id];
+ if (state == lcm::STARTED || state == lcm::BACKGROUND) {
+ this->amgr.states[id] = lcm::STOPPED;
+ this->amgr.emit_activity_status_changed(id.c_str(),
+ this->amgr.states_s[lcm::STOPPED]);
+ }
}
}
void WindowManager::api_enddraw(char const *appid, char const *drawing_name)
{
- // TODO: application requests by old role,
- // so convert role old to new
- const char *c_role = this->convertRoleOldToNew(drawing_name);
-
string id = appid;
- string role = c_role;
+ string role = drawing_name;
unsigned current_req = g_app_list.currentRequestNumber();
bool result = g_app_list.setEndDrawFinished(current_req, id, role);
}
}
-int WindowManager::api_subscribe(afb_req req, int event_id)
+int WindowManager::api_subscribe(afb_req_t req, int event_id)
{
- struct afb_event event = this->map_afb_event[kListEventName[event_id]];
+ afb_event_t event = this->map_afb_event[kListEventName[event_id]];
return afb_req_subscribe(req, event);
}
{
HMI_DEBUG("called");
- // TODO: application requests by old role,
- // so convert role old to new
- const char *role = this->convertRoleOldToNew(drawing_name);
+ string role = drawing_name;
// Check drawing name, surface/layer id
auto const &surface_id = this->id_alloc.lookup(role);
auto client = g_app_list.lookUpClient(appid);
this->lc->appTerminated(client);
g_app_list.removeClient(appid);
+ // POI: AGL LifeCycle Management
+ if (this->amgr.states[appid] != lcm::DESTROYED) {
+ this->amgr.states[appid] = lcm::DESTROYED;
+ this->amgr.emit_activity_status_changed(appid.c_str(),
+ this->amgr.states_s[lcm::DESTROYED]);
+ }
}
void WindowManager::exceptionProcessForTransition()
if ("" != act.role)
{
bool found;
- auto const &surface_id = this->id_alloc.lookup(act.role.c_str());
+ auto const &surface_id = this->id_alloc.lookup(act.role);
if(surface_id == nullopt)
{
goto proc_remove_request;
{
struct rect rect = this->lc->getAreaSize(area);
this->send_event(kListEventName[Event_SyncDraw],
- role.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h);
+ role, area, rect.x, rect.y, rect.w, rect.h);
}
void WindowManager::emit_flushdraw(const string& role)
if (action.visible == TaskVisible::VISIBLE)
{
sync_draw_happen = true;
-
- // TODO: application requests by old role,
- // so convert role new to old for emitting event
- string old_role = this->rolenew2old[action.role];
-
- this->emit_syncdraw(old_role, action.area);
+ this->emit_syncdraw(action.role, action.area);
/* TODO: emit event for app not subscriber
if(g_app_list.contains(y.appid))
g_app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */
for (const auto &x : actions)
{
this->lc->visibilityChange(x);
- string old_role = this->rolenew2old[x.role];
- emit_deactivated(old_role.c_str());
+ emit_deactivated(x.role);
/* if (g_app_list.contains(x.client->appID()))
{
auto client = g_app_list.lookUpClient(x.client->appID());
}
ret = this->lc->visibilityChange(act);
- // Emit active/deactive event
- string old_role = this->rolenew2old[act.role];
if(act.visible == VISIBLE)
{
- emit_visible(old_role.c_str());
- emit_activated(old_role.c_str());
+ emit_visible(act.role);
+ emit_activated(act.role);
}
else
{
- emit_invisible(old_role.c_str());
- emit_deactivated(old_role.c_str());
+ emit_invisible(act.role);
+ emit_deactivated(act.role);
}
if (ret != WMError::SUCCESS)
{
if(act_flush.visible == TaskVisible::VISIBLE)
{
- // TODO: application requests by old role,
- // so convert role new to old for emitting event
- string old_role = this->rolenew2old[act_flush.role];
-
- this->emit_flushdraw(old_role.c_str());
+ this->emit_flushdraw(act_flush.role);
}
}
HMI_SEQ_DEBUG(req_num, "emit screen updated");
bool found = false;
auto actions = g_app_list.getActions(req_num, &found);
+ if (!found)
+ {
+ HMI_SEQ_ERROR(req_num,
+ "Window Manager bug :%s : Action is not set",
+ errorDescription(WMError::NO_ENTRY));
+ return;
+ }
// create json object
json_object *j = json_object_new_object();
for(const auto& action: actions)
{
+ std::string appid = action.client->appID();
+
if(action.visible != TaskVisible::INVISIBLE)
{
- json_object_array_add(jarray, json_object_new_string(action.client->appID().c_str()));
+ json_object_array_add(jarray, json_object_new_string(appid.c_str()));
+ // POI: AGL LifeCycle Management
+ if (this->amgr.states[appid] != lcm::FOREGROUND) {
+ this->amgr.states[appid] = lcm::FOREGROUND;
+ this->amgr.emit_activity_status_changed(appid.c_str(), this->amgr.states_s[lcm::FOREGROUND]);
+ }
+ } else {
+ // POI: AGL LifeCycle Management
+ if (this->amgr.states[appid] != lcm::BACKGROUND) {
+ this->amgr.states[appid] = lcm::BACKGROUND;
+ this->amgr.emit_activity_status_changed(appid.c_str(), this->amgr.states_s[lcm::BACKGROUND]);
+ }
}
}
json_object_object_add(j, kKeyIds, jarray);
if (g_timer_ev_src == nullptr)
{
// firsttime set into sd_event
- int ret = sd_event_add_time(afb_daemon_get_event_loop(), &g_timer_ev_src,
+ int ret = sd_event_add_time(afb_api_get_event_loop(afbBindingV3root), &g_timer_ev_src,
CLOCK_BOOTTIME, (uint64_t)(ts.tv_sec + kTimeOut) * 1000000ULL, 1, processTimerHandler, this);
if (ret < 0)
{
}
}
-const char* WindowManager::convertRoleOldToNew(char const *old_role)
-{
- const char *new_role = nullptr;
-
- for (auto const &on : this->roleold2new)
- {
- std::regex regex = std::regex(on.first);
- if (std::regex_match(old_role, regex))
- {
- // role is old. So convert to new.
- new_role = on.second.c_str();
- break;
- }
- }
-
- if (nullptr == new_role)
- {
- // role is new or fallback.
- new_role = old_role;
- }
+} // namespace wm
- HMI_DEBUG("old:%s -> new:%s", old_role, new_role);
+namespace lcm
+{
- return new_role;
+ActivityManager::ActivityManager (void)
+ : states_s { "NOTEXISTS",
+ "CREATED",
+ "DESTROYED",
+ "STARTED",
+ "STOPPED",
+ "FOREGROUND",
+ "BACKGROUND" }
+{
+ ;
}
-int WindowManager::loadOldRoleDb()
+void ActivityManager::api_register_activity_observer (afb_req_t req, void* &lcm_ctx)
{
- // Get afm application installed dir
- char const *afm_app_install_dir = getenv("AFM_APP_INSTALL_DIR");
- HMI_DEBUG("afm_app_install_dir:%s", afm_app_install_dir);
+ //std::string observer = afb_req_get_application_id(req);
+ observer* obs = static_cast<observer *>(lcm_ctx);
- string file_name;
- if (!afm_app_install_dir)
- {
- HMI_ERROR("AFM_APP_INSTALL_DIR is not defined");
+ json_object *j_data = afb_req_json(req);
+ json_object *j_target;
+ if (!json_object_object_get_ex(j_data, LCM_TARGET, &j_target)) {
+ afb_req_fail(req, "failed", "Need char const* argument target");
+ return;
+ }
+ std::string target(json_object_get_string(j_target));
+
+ if (obs == nullptr) {
+ // New observer
+ afb_event_t event = afb_daemon_make_event(LCM_EVENT_STATUS_CHANGED);
+ //afb_event_t event = afb_daemon_make_event(LCM_EVENT_STATUS_CHANGED);
+ obs = new observer({
+ event,
+ std::bitset<NUM_STATUS>(ACTIVITY_FILTER_ALL_SET)
+ });
+
+ if (afb_req_subscribe(req, event) != 0) {
+ afb_req_fail(req, "failed", "cannot subscribe event");
+ return;
}
- else
- {
- file_name = string(afm_app_install_dir) + string("/etc/old_roles.json");
+ HMI_DEBUG("observer(%p, target=\"%s\") is created.[NEW]", obs, target.c_str());
+
+ lcm_ctx = static_cast<observer *>(obs);
+ }
+
+ if (this->map_observers.count(target)) {
+ // already registered
+ HMI_DEBUG("observer(%p, target=\"%s\") is already exist", obs, target.c_str());
+ std::vector<observer*> obs_v = this->map_observers[target];
+ auto result = std::find(obs_v.begin(), obs_v.end(), obs);
+ if (result != obs_v.end()) {
+ HMI_DEBUG("observer(%p, target=\"%s\") is already registered", obs, target.c_str());
+ return;
}
+ }
+ HMI_DEBUG("observer(%p, target=\"%s\") is registered", obs, target.c_str());
+ (this->map_observers[target]).push_back(obs);
+}
- // Load old_role.db
- json_object* json_obj;
- int ret = jh::inputJsonFilie(file_name.c_str(), &json_obj);
- if (0 > ret)
- {
- HMI_ERROR("Could not open old_role.db, so use default old_role information");
- json_obj = json_tokener_parse(kDefaultOldRoleDb);
+void ActivityManager::remove_observer (observer *obs, std::vector<observer*>& obs_v)
+{
+ auto obs_itr = obs_v.begin();
+ while (obs_itr != obs_v.end()) {
+ if (*obs_itr == obs) {
+ obs_itr = obs_v.erase(obs_itr);
+ } else {
+ obs_itr++;
}
- HMI_DEBUG("json_obj dump:%s", json_object_get_string(json_obj));
+ }
+}
- // Perse apps
- json_object* json_cfg;
- if (!json_object_object_get_ex(json_obj, "old_roles", &json_cfg))
- {
- HMI_ERROR("Parse Error!!");
- return -1;
- }
+void ActivityManager::api_unregister_activity_observer (afb_req_t req, void* &lcm_ctx)
+{
+ observer *obs = static_cast<observer *>(lcm_ctx);
- int len = json_object_array_length(json_cfg);
- HMI_DEBUG("json_cfg len:%d", len);
- HMI_DEBUG("json_cfg dump:%s", json_object_get_string(json_cfg));
+ json_object *j_data = afb_req_json(req);
+ json_object *j_target;
- for (int i=0; i<len; i++)
- {
- json_object* json_tmp = json_object_array_get_idx(json_cfg, i);
+ if (!json_object_object_get_ex(j_data, LCM_TARGET, &j_target)) {
+ afb_req_fail(req, "failed", "Need char const* argument target");
+ return;
+ }
+ std::string target(json_object_get_string(j_target));
- const char* old_role = jh::getStringFromJson(json_tmp, "name");
- if (nullptr == old_role)
- {
- HMI_ERROR("Parse Error!!");
- return -1;
- }
+ HMI_DEBUG("observer(%p->\"%s\") is unregistered.", obs, target.c_str());
- const char* new_role = jh::getStringFromJson(json_tmp, "new");
- if (nullptr == new_role)
- {
- HMI_ERROR("Parse Error!!");
- return -1;
- }
+ if (this->map_observers.count(target) != 0) {
+ remove_observer(obs, this->map_observers[target]);
+ }
+}
- this->roleold2new[old_role] = string(new_role);
- }
+void ActivityManager::lcm_clear_context (void* &lcm_ctx)
+{
+ observer *obs = static_cast<observer *>(lcm_ctx);
- // Check
- for(auto itr = this->roleold2new.begin();
- itr != this->roleold2new.end(); ++itr)
- {
- HMI_DEBUG(">>> role old:%s new:%s",
- itr->first.c_str(), itr->second.c_str());
+ for (auto itr = this->map_observers.begin(); itr != this->map_observers.end(); itr++) {
+ remove_observer(obs, itr->second);
+ }
+
+ HMI_DEBUG("observer(%p) is removed.", obs);
+
+ delete obs;
+}
+
+wm::result<json_object *> ActivityManager::api_get_activity_status (const char *appid)
+{
+ std::string id = appid;
+ int st = NOTEXISTS;
+
+ if (this->states.count(id)) {
+ st = this->states[id];
+
+ if (st < 0 || st >= NUM_STATUS) {
+ HMI_ERROR("Illegal lifecycle state (%d) of [%s]", st, appid);
+ return wm::Err<json_object *>("Illegal lifecycle state");
}
+ }
- // Release json_object
- json_object_put(json_obj);
+ const char * state = this->states_s[st];
- return 0;
+ json_object *object = json_object_new_object();
+ json_object_object_add(object, LCM_API, json_object_new_string(LCM_API_GET_ACTIVITY_STATUS));
+ json_object_object_add(object, LCM_TARGET, json_object_new_string(appid));
+ json_object_object_add(object, LCM_STATE, json_object_new_string(state));
+
+ return wm::Ok<json_object *>(object);
}
-const char* WindowManager::kDefaultOldRoleDb = "{ \
- \"old_roles\": [ \
- { \
- \"name\": \"HomeScreen\", \
- \"new\": \"homescreen\" \
- }, \
- { \
- \"name\": \"Music\", \
- \"new\": \"music\" \
- }, \
- { \
- \"name\": \"MediaPlayer\", \
- \"new\": \"music\" \
- }, \
- { \
- \"name\": \"Video\", \
- \"new\": \"video\" \
- }, \
- { \
- \"name\": \"VideoPlayer\", \
- \"new\": \"video\" \
- }, \
- { \
- \"name\": \"WebBrowser\", \
- \"new\": \"browser\" \
- }, \
- { \
- \"name\": \"Radio\", \
- \"new\": \"radio\" \
- }, \
- { \
- \"name\": \"Phone\", \
- \"new\": \"phone\" \
- }, \
- { \
- \"name\": \"Navigation\", \
- \"new\": \"map\" \
- }, \
- { \
- \"name\": \"HVAC\", \
- \"new\": \"hvac\" \
- }, \
- { \
- \"name\": \"Settings\", \
- \"new\": \"settings\" \
- }, \
- { \
- \"name\": \"Dashboard\", \
- \"new\": \"dashboard\" \
- }, \
- { \
- \"name\": \"POI\", \
- \"new\": \"poi\" \
- }, \
- { \
- \"name\": \"Mixer\", \
- \"new\": \"mixer\" \
- }, \
- { \
- \"name\": \"Restriction\", \
- \"new\": \"restriction\" \
- }, \
- { \
- \"name\": \"^OnScreen.*\", \
- \"new\": \"on_screen\" \
- } \
- ] \
-}";
+void ActivityManager::emit_activity_status_changed (const char* appid, const char* state)
+{
+ // POI: AGL LifeCycle Management
+ // E.g. statusChanged(CREATED->STARTED)
+ HMI_DEBUG("emit_activity_status_changed(%s, %s)", appid, state);
+
+ std::string id = appid;
+
+ if (this->map_observers.count(id)) {
+ std::vector<observer*>& obs_v = this->map_observers[id];
+
+ for (auto itr = obs_v.begin(); itr != obs_v.end(); ++itr) {
+ auto obs = *itr;
+ afb_event_t event = obs->event;
+ if (afb_event_is_valid(event)) {
+ json_object *data = json_object_new_object();
+ json_object_object_add(data, LCM_STATE, json_object_new_string(state));
+ json_object_object_add(data, LCM_TARGET, json_object_new_string(appid));
+
+ HMI_DEBUG("send Event_statusChanged(%s, %s)", appid, state);
+
+ afb_event_push(event, json_object_get(data));
+ json_object_put(data);
+ } else {
+ HMI_ERROR("afb_event is not valid");
+ }
+ }
+ }
+}
-} // namespace wm
+} // namespace lcm
Code Review / apps / agl-service-windowmanager.git / blobdiff