X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=f311bcfc27ebec549691a62fa557c6fc41ebce94;hb=81a6d5f63b77f2ffaeef25cea30d2ecc486c7426;hp=90d25123e2ffa6414e0b7e3bc087a3068cd9fb56;hpb=f567cc6cf3fc51eb3b0216b481c1f48e07fbb4ec;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 90d2512..f311bcf 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -46,7 +46,7 @@ extern "C" namespace wm { -const unsigned kTimeOut = 10000000UL; /* 10s */ +static const unsigned kTimeOut = 3000000UL; /* 3s */ /* DrawingArea name used by "{layout}.{area}" */ const char kNameLayoutNormal[] = "normal"; @@ -133,6 +133,15 @@ void App::removeClient(const std::string &appid) g_app_list.removeClient(appid); } +void App::exeptionProcessForTransition() +{ + unsigned req_num = g_app_list.currentRequestNumber(); + HMI_SEQ_NOTICE(req_num, "Process exeption handling for request. Remove current request %d", req_num); + g_app_list.removeRequest(req_num); + HMI_SEQ_NOTICE(g_app_list.currentRequestNumber(), "Process next request if exists"); + this->processNextRequest(); +} + bool App::subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname) { if(!g_app_list.contains(appid)){ @@ -388,7 +397,7 @@ void App::setTimer() { // firsttime set into sd_event int ret = sd_event_add_time(afb_daemon_get_event_loop(), &g_timer_ev_src, - CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 1, processTimerHandler, this); + CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 1, processTimerHandler, this); if (ret < 0) { HMI_ERROR("wm", "Could't set timer"); @@ -473,7 +482,8 @@ WMError App::lm_release(const struct WMAction &action) state = nl; this->layout_commit(); - std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); + std::string str_area = + std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); compositor::rect area_rect = this->area_info[state.sub]; this->emit_syncdraw(sub.c_str(), str_area.c_str(), area_rect.x, area_rect.y, area_rect.w, area_rect.h); @@ -500,10 +510,11 @@ WMError App::lm_release(const struct WMAction &action) state = nl; this->layout_commit(); - std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); + std::string str_area = + std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); compositor::rect area_rect = this->area_info[state.main]; this->emit_syncdraw(main.c_str(), str_area.c_str(), - area_rect.x, area_rect.y, area_rect.w, area_rect.h); + area_rect.x, area_rect.y, area_rect.w, area_rect.h); this->enqueue_flushdraw(state.main); }); } @@ -569,7 +580,8 @@ WMError App::checkPolicy(unsigned req_num) std::string add_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain); // Change request area req_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub); - HMI_SEQ_NOTICE(req_num, "Change request area from %s to %s, because split is happen", trigger.area, req_area); + HMI_SEQ_NOTICE(req_num, "Change request area from %s to %s, because split is happen", + trigger.area, req_area); // set another action std::string add_name = g_app_list.getAppID(curernt_sid, add_role, &found); if (!found) @@ -618,7 +630,8 @@ WMError App::checkPolicy(unsigned req_num) HMI_SEQ_NOTICE(req_num, "Hack. This process will be removed. Change HomeScreen code!!"); req_area = "fullscreen"; } - TaskVisible task_visible = (trigger.task == Task::TASK_ALLOCATE) ? TaskVisible::VISIBLE : TaskVisible::INVISIBLE; + TaskVisible task_visible = + (trigger.task == Task::TASK_ALLOCATE) ? TaskVisible::VISIBLE : TaskVisible::INVISIBLE; ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, task_visible); g_app_list.reqDump(); @@ -635,16 +648,17 @@ WMError App::startTransition(unsigned req_num) if (!found) { ret = WMError::NO_ENTRY; - HMI_SEQ_ERROR(req_num, "Window Manager bug :%s : Action is not set", errorDescription(ret)); + HMI_SEQ_ERROR(req_num, + "Window Manager bug :%s : Action is not set", errorDescription(ret)); return ret; } - for (const auto &y : actions) + for (const auto &action : actions) { - if (y.visible != TaskVisible::INVISIBLE) + if (action.visible != TaskVisible::INVISIBLE) { sync_draw_happen = true; - this->emit_syncdraw(y.role, y.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); */ @@ -659,12 +673,12 @@ WMError App::startTransition(unsigned req_num) { // deactivate only, no syncDraw // Make it deactivate here - for (const auto &z : actions) + for (const auto &x : actions) { - if (g_app_list.contains(z.appid)) + if (g_app_list.contains(x.appid)) { - auto client = g_app_list.lookUpClient(z.appid); - this->deactivate(client->surfaceID(z.role)); + auto client = g_app_list.lookUpClient(x.appid); + this->deactivate(client->surfaceID(x.role)); } } ret = NO_LAYOUT_CHANGE; @@ -674,8 +688,8 @@ WMError App::startTransition(unsigned req_num) WMError App::setInvisibleTask(const std::string &role, bool split) { - unsigned req = g_app_list.currentRequestNumber(); - HMI_SEQ_DEBUG(req, "set current visible app to invisible task"); + unsigned req_num = g_app_list.currentRequestNumber(); + HMI_SEQ_DEBUG(req_num, "set current visible app to invisible task"); // This task is copied from original actiavete surface const char *drawing_name = role.c_str(); auto const &surface_id = this->lookup_id(drawing_name); @@ -705,9 +719,9 @@ WMError App::setInvisibleTask(const std::string &role, bool split) if(!found){ return WMError::NOT_REGISTERED; } - HMI_SEQ_INFO(req, "Invisible %s", add_name.c_str()); + HMI_SEQ_INFO(req_num, "Invisible %s", add_name.c_str()); WMAction act{add_name, add_role, add_area, task_visible, end_draw_finished}; - g_app_list.setAction(req, act); + g_app_list.setAction(req_num, act); l.second.state.main = -1; } @@ -721,9 +735,9 @@ WMError App::setInvisibleTask(const std::string &role, bool split) { return WMError::NOT_REGISTERED; } - HMI_SEQ_INFO(req, "Invisible %s", add_name.c_str()); + HMI_SEQ_INFO(req_num, "Invisible %s", add_name.c_str()); WMAction act{add_name, add_role, add_area, task_visible, end_draw_finished}; - g_app_list.setAction(req, act); + g_app_list.setAction(req_num, act); l.second.state.sub = -1; } } @@ -763,13 +777,13 @@ WMError App::setInvisibleTask(const std::string &role, bool split) deact_sub.appid = g_app_list.getAppID(state.sub, main, &found); if (!found) { - HMI_SEQ_DEBUG(req, "sub surface doesn't exist"); + HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist"); return WMError::NOT_REGISTERED; } deact_sub.visible = task_visible; deact_sub.end_draw_finished = end_draw_finished; - HMI_SEQ_DEBUG(req, "sub surface doesn't exist"); - g_app_list.setAction(req, deact_sub); + HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist"); + g_app_list.setAction(req_num, deact_sub); } } //state = LayoutState{state.main, *surface_id}; @@ -789,13 +803,13 @@ WMError App::setInvisibleTask(const std::string &role, bool split) deact_main.appid = g_app_list.getAppID(state.main, deact_main.role, &found); if (!found) { - HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + HMI_SEQ_DEBUG(req_num, "sub surface ddoesn't exist"); return WMError::NOT_REGISTERED; } deact_main.visible = task_visible; deact_main.end_draw_finished = end_draw_finished; - HMI_SEQ_DEBUG(req, "sub surface doesn't exist"); - g_app_list.setAction(req, deact_main); + HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist"); + g_app_list.setAction(req_num, deact_main); } if (state.sub != -1) { @@ -809,13 +823,13 @@ WMError App::setInvisibleTask(const std::string &role, bool split) deact_sub.appid = g_app_list.getAppID(state.sub, deact_sub.role, &found); if (!found) { - HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + HMI_SEQ_DEBUG(req_num, "sub surface ddoesn't exist"); return WMError::NOT_REGISTERED; } deact_sub.visible = task_visible; deact_sub.end_draw_finished = end_draw_finished; - HMI_SEQ_DEBUG(req, "sub surface doesn't exist"); - g_app_list.setAction(req, deact_sub); + HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist"); + g_app_list.setAction(req_num, deact_sub); } } //state = LayoutState{*surface_id}; @@ -878,12 +892,13 @@ WMError App::setRequest(const std::string& appid, const std::string &role, const unsigned requested_num = g_app_list.getRequestNumber(appid); if (requested_num != 0) { - HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", appid.c_str(), role.c_str(), area.c_str()); + HMI_SEQ_INFO(requested_num, + "%s %s %s request is already queued", appid.c_str(), role.c_str(), area.c_str()); return REQ_REJECTED; } WMRequest req = WMRequest(appid, role, area, task); - unsigned new_req = g_app_list.addAllocateRequest(req); + unsigned new_req = g_app_list.addRequest(req); *req_num = new_req; g_app_list.reqDump(); @@ -892,7 +907,8 @@ WMError App::setRequest(const std::string& appid, const std::string &role, const return WMError::SUCCESS; } -void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply) +void App::api_activate_surface(char const *appid, char const *drawing_name, + char const *drawing_area, const reply_func &reply) { ST(); @@ -930,12 +946,12 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char //this->emit_error() HMI_SEQ_ERROR(req_num, errorDescription(ret)); g_app_list.removeRequest(req_num); - g_app_list.next(); - g_app_list.reqDump(); + this->processNextRequest(); } } -void App::api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply) +void App::api_deactivate_surface(char const *appid, char const *drawing_name, + const reply_func &reply) { ST(); @@ -945,51 +961,38 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co std::string id = appid; std::string role = drawing_name; std::string area = ""; //drawing_area; + Task task = Task::TASK_RELEASE; + unsigned req_num = 0; + WMError ret = WMError::UNKNOWN; - if (!g_app_list.contains(id)) - { - reply("app doesn't request 'requestSurface' yet"); - return; - } - auto client = g_app_list.lookUpClient(id); + ret = this->setRequest(id, role, area, task, &req_num); - /* - * Queueing Phase - */ - unsigned current = g_app_list.currentRequestNumber(); - unsigned requested_num = g_app_list.getRequestNumber(id); - if (requested_num != 0) + if (ret != WMError::SUCCESS) { - HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", id.c_str(), role.c_str(), area.c_str()); - reply("already requested"); + HMI_ERROR("wm", errorDescription(ret)); + reply("Failed to set request"); return; } - WMRequest req = WMRequest(id, role, area, Task::TASK_RELEASE); - unsigned new_req = g_app_list.addAllocateRequest(req); - g_app_list.reqDump(); - - HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str()); - reply(nullptr); - if (new_req != current) + if (req_num != g_app_list.currentRequestNumber()) { // Add request, then invoked after the previous task is finished - HMI_SEQ_DEBUG(new_req, "request is accepted"); + HMI_SEQ_DEBUG(req_num, "request is accepted"); return; } /* * Do allocate tasks */ - WMError ret = this->doTransition(new_req); + ret = this->doTransition(req_num); if (ret != WMError::SUCCESS) { - HMI_SEQ_ERROR(new_req, errorDescription(ret)); - g_app_list.removeRequest(new_req); - g_app_list.next(); //this->emit_error() + HMI_SEQ_ERROR(req_num, errorDescription(ret)); + g_app_list.removeRequest(req_num); + this->processNextRequest(); } } @@ -1040,13 +1043,15 @@ WMError App::doEndDraw(unsigned req_num) ret = this->layoutChange(act); if(ret != WMError::SUCCESS) { - HMI_SEQ_WARNING(req_num, "Failed to manipulate surfaces while state change : %s", errorDescription(ret)); + HMI_SEQ_WARNING(req_num, + "Failed to manipulate surfaces while state change : %s", errorDescription(ret)); return ret; } ret = this->visibilityChange(act); if (ret != WMError::SUCCESS) { - HMI_SEQ_WARNING(req_num, "Failed to manipulate surfaces while state change : %s", errorDescription(ret)); + HMI_SEQ_WARNING(req_num, + "Failed to manipulate surfaces while state change : %s", errorDescription(ret)); return ret; } HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str());