X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=d11ec8a498ecfc605d2535c257340514b30d04dc;hb=c79b70f564aaad2194c4f24a653fbb94b7ac397a;hp=b6160d24180eecad7140cceef603a381224ca869;hpb=358f8b12f6d858473b0bfbd6ed9b191cd94f7b02;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index b6160d2..d11ec8a 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -35,7 +35,7 @@ #include #include -#include "wm-client.hpp" +#include "wm_client.hpp" #include "applist.hpp" extern "C" @@ -46,7 +46,7 @@ extern "C" namespace wm { -const unsigned TIME_OUT = 10000000UL; /* 10s */ +const unsigned kTimeOut = 10000000UL; /* 10s */ /* DrawingArea name used by "{layout}.{area}" */ const char kNameLayoutNormal[] = "normal"; @@ -68,11 +68,9 @@ const char kKeyHeightPixel[] = "height_pixel"; const char kKeyWidthMm[] = "width_mm"; const char kKeyHeightMm[] = "height_mm"; -static const std::string task_allocate = "allocate"; -static const std::string task_release = "release"; -static sd_event_source *timer_ev_src = nullptr; +static sd_event_source *g_timer_ev_src = nullptr; -static AppList app_list; +static AppList g_app_list; namespace { @@ -122,13 +120,13 @@ processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata) void App::timerHandler() { - unsigned seq = app_list.currentSequenceNumber(); - HMI_SEQ_DEBUG(seq, "Timer expired remove Request"); - app_list.req_dump(); - app_list.removeRequest(seq); - app_list.next(); - app_list.req_dump(); - if (app_list.haveRequest()) + unsigned req_num = g_app_list.currentRequestNumber(); + HMI_SEQ_DEBUG(req_num, "Timer expired remove Request"); + g_app_list.reqDump(); + g_app_list.removeRequest(req_num); + g_app_list.next(); + g_app_list.reqDump(); + if (g_app_list.haveRequest()) { this->process_request(); } @@ -137,16 +135,16 @@ void App::timerHandler() void App::removeClient(const std::string &appid) { HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str()); - app_list.removeClient(appid); + g_app_list.removeClient(appid); } bool App::subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname) { - if(!app_list.contains(appid)){ + if(!g_app_list.contains(appid)){ HMI_DEBUG("wm", "Client %s is not registered", appid.c_str()); return false; } - auto client = app_list.lookUpClient(appid); + auto client = g_app_list.lookUpClient(appid); return client->subscribe(req, evname); } @@ -425,12 +423,12 @@ void App::layout_commit() void App::set_timer() { - HMI_SEQ_DEBUG(app_list.currentSequenceNumber(), "Timer set activate"); - if (timer_ev_src == nullptr) + HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate"); + if (g_timer_ev_src == nullptr) { // firsttime set into sd_event - int ret = sd_event_add_time(afb_daemon_get_event_loop(), &timer_ev_src, - CLOCK_REALTIME, time(NULL) * (1000000UL) + TIME_OUT, 1, processTimerHandler, this); + int ret = sd_event_add_time(afb_daemon_get_event_loop(), &g_timer_ev_src, + CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 1, processTimerHandler, this); if (ret < 0) { HMI_ERROR("wm", "Could't set timer"); @@ -439,37 +437,38 @@ void App::set_timer() else { // update timer limitation after second time - sd_event_source_set_time(timer_ev_src, time(NULL) * (1000000UL) + TIME_OUT); - sd_event_source_set_enabled(timer_ev_src, SD_EVENT_ONESHOT); + sd_event_source_set_time(g_timer_ev_src, time(NULL) * (1000000UL) + kTimeOut); + sd_event_source_set_enabled(g_timer_ev_src, SD_EVENT_ONESHOT); } } void App::stop_timer() { - unsigned seq = app_list.currentSequenceNumber(); - HMI_SEQ_DEBUG(seq, "Timer stop"); - int rc = sd_event_source_set_enabled(timer_ev_src, SD_EVENT_OFF); + unsigned req_num = g_app_list.currentRequestNumber(); + HMI_SEQ_DEBUG(req_num, "Timer stop"); + int rc = sd_event_source_set_enabled(g_timer_ev_src, SD_EVENT_OFF); if (rc < 0) { - HMI_SEQ_ERROR(seq, "Timer stop failed"); + HMI_SEQ_ERROR(req_num, "Timer stop failed"); } } -bool App::lm_release(const struct WMAction &action) +WMError App::lm_release(const struct WMAction &action) { //auto const &surface_id = this->lookup_id(drawing_name); - unsigned req_num = app_list.currentSequenceNumber(); + WMError ret = WMError::LAYOUT_CHANGE_FAIL; + unsigned req_num = g_app_list.currentRequestNumber(); auto const &surface_id = this->lookup_id(action.role.c_str()); if (!surface_id) { HMI_SEQ_ERROR(req_num, "Surface does not exist"); - return false; + return ret; } if (*surface_id == this->layers.main_surface) { HMI_SEQ_ERROR(req_num, "Cannot deactivate main_surface"); - return false; + return ret; } auto o_state = *this->layers.get_layout_state(*surface_id); @@ -477,7 +476,7 @@ bool App::lm_release(const struct WMAction &action) if (o_state == nullptr) { HMI_SEQ_ERROR(req_num, "Could not find layer for surface"); - return false; + return ret; } struct LayoutState &state = *o_state; @@ -485,7 +484,7 @@ bool App::lm_release(const struct WMAction &action) if (state.main == -1) { HMI_SEQ_ERROR(req_num, "No surface active"); - return false; + return ret; } // Check against main_surface, main_surface_name is the configuration item. @@ -493,12 +492,12 @@ bool App::lm_release(const struct WMAction &action) { HMI_SEQ_DEBUG(req_num, "Refusing to deactivate main_surface %d", *surface_id); //reply(nullptr); - return true; + return WMError::SUCCESS; } if ((state.main == *surface_id) && (state.sub == *surface_id)) { HMI_SEQ_ERROR(req_num, "Surface is not active"); - return false; + return ret; } if (state.main == *surface_id) @@ -548,10 +547,10 @@ bool App::lm_release(const struct WMAction &action) this->enqueue_flushdraw(state.main); }); } - return true; + return WMError::SUCCESS; } -bool App::lm_layout_change(const struct WMAction &action) +WMError App::lm_layout_change(const struct WMAction &action) { const char *msg = this->check_surface_exist(action.role.c_str()); @@ -560,47 +559,53 @@ bool App::lm_layout_change(const struct WMAction &action) TODO: emit syncDraw with application*/ if (msg) { - HMI_SEQ_DEBUG(app_list.currentSequenceNumber(), msg); - //app_list.removeRequest(req_num); - return false; + HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), msg); + return WMError::LAYOUT_CHANGE_FAIL; } this->lm_layout_change(action.role.c_str()); - return true; + return WMError::SUCCESS; } -bool App::do_transition(unsigned req_num) +WMError App::do_transition(unsigned req_num) { /* * Check Policy */ // get current trigger - auto trigger = app_list.getRequest(req_num); + bool found; bool is_activate = true; + auto trigger = g_app_list.getRequest(req_num, &found); + if(!found) + { + WMError err = WMError::NO_ENTRY; + HMI_SEQ_ERROR(req_num, errorDescription(err)); + return err; + } /* get new status from Policy Manager (json_object*?) newLayout = checkPolicy(trigger); (vector&) auto actions = translator.inputActionFromLayout(newLayout, currentLayout) for(const auto& x : actions){ - app_list.setAciton(req_num, x) + g_app_list.setAciton(req_num, x) } or - translator.inputActionFromLayout(newLayout, currentLayout, &app_list, req_num); + translator.inputActionFromLayout(newLayout, currentLayout, &g_app_list, req_num); /* The following error check is not necessary because main.cpp will reject the message form not registered object } */ HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is"); - if (TASK_RELEASE == trigger.task) + if (trigger.task == Task::TASK_RELEASE) { is_activate = false; } - bool ret = app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); - app_list.req_dump(); + WMError ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); + g_app_list.reqDump(); - if (!ret) + if (ret != WMError::SUCCESS) { HMI_SEQ_ERROR(req_num, "Failed to set action"); return ret; @@ -608,8 +613,14 @@ bool App::do_transition(unsigned req_num) // layer manager task bool sync_draw_happen = false; - for (const auto &y : app_list.getActions(req_num)) + for (const auto &y : g_app_list.getActions(req_num, &found)) { + if (!found) + { + WMError err = WMError::NO_ENTRY; + HMI_SEQ_ERROR(req_num, "%s : Action is not set", errorDescription(err)); + return err; + } /* do_task(y); */ @@ -621,14 +632,15 @@ bool App::do_transition(unsigned req_num) { sync_draw_happen = true; ret = lm_layout_change(y); - if (!ret) + if (ret != WMError::SUCCESS) { - HMI_SEQ_ERROR(req_num, "Failed layout change: %s", y.appid.c_str()); - app_list.removeRequest(req_num); + HMI_SEQ_ERROR(req_num, "%s: appid: %s, role: %s, area: %s", + errorDescription(ret), y.appid.c_str(), y.role.c_str(), y.area.c_str()); + g_app_list.removeRequest(req_num); break; // TODO: if transition fails, what should we do? } - /* app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */ + /* g_app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */ } else { @@ -636,25 +648,25 @@ bool App::do_transition(unsigned req_num) if (!ret) { HMI_SEQ_ERROR(req_num, "Failed release resource: %s", y.appid.c_str()); - app_list.removeRequest(req_num); + g_app_list.removeRequest(req_num); break; // TODO: if transition fails, what should we do? } - /* app_list.lookUpClient(y.appid)->emit_invisible(y.role, y.area); */ + /* g_app_list.lookUpClient(y.appid)->emit_invisible(y.role, y.area); */ } } - if (!ret) + if (ret != WMError::SUCCESS) { - //this->emit_error(request_seq, 0 /*error_num*/, "error happens"); // test + //this->emit_error(req_num, 0 /*error_num*/, "error happens"); // test } - else if (ret && sync_draw_happen) + else if (sync_draw_happen) { this->set_timer(); } else { - app_list.removeRequest(req_num); // HACK!!! + g_app_list.removeRequest(req_num); // HACK!!! } return ret; } @@ -760,10 +772,21 @@ void App::lm_layout_change(const char *drawing_name) std::string str_area_sub = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub); compositor::rect area_rect_main = this->area_info[state.main]; compositor::rect area_rect_sub = this->area_info[*surface_id]; + // >>> HACK + HMI_WARNING("wm", "HACK!!! mediaplayer and hvac is only supported for split"); + std::string request_role = drawing_name; + //std::string request_app = transform(request_role.begin(), request_role.end(), request_role.begin(), tolower); //hvac or mediaplayer + std::string hack_appid = "navigation"; + std::string hack_role = main; + std::string hack_area = str_area_main; + g_app_list.setAction(g_app_list.currentRequestNumber(), hack_appid, hack_role, hack_area, true); + //g_app_list.setEndDrawFinished(g_app_list.currentRequestNumber(), request_role, request_role); + //g_app_list.setEndDrawFinished(g_app_list.currentRequestNumber(), hack_appid, hack_role); // This process is illegal + // >>> HACK this->emit_syncdraw(main.c_str(), str_area_main.c_str(), area_rect_main.x, area_rect_main.y, area_rect_main.w, area_rect_main.h); - this->emit_syncdraw(drawing_name, str_area_sub.c_str(), + this->emit_syncdraw(request_role.c_str(), str_area_sub.c_str(), area_rect_sub.x, area_rect_sub.y, area_rect_sub.w, area_rect_sub.h); this->enqueue_flushdraw(state.main); @@ -852,23 +875,19 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char std::string role = drawing_name; std::string area = drawing_area; - if (!app_list.contains(id)) + if (!g_app_list.contains(id)) { reply("app doesn't request 'requestSurface' yet"); return; } - auto client = app_list.lookUpClient(id); - - // test - HMI_DEBUG("wm", "test"); - client->emitError(WM_CLIENT_ERROR_EVENT::UNKNOWN_ERROR); + auto client = g_app_list.lookUpClient(id); /* * Queueing Phase */ - unsigned current = app_list.currentSequenceNumber(); - unsigned requested_num = app_list.getSequenceNumber(id); + unsigned current = g_app_list.currentRequestNumber(); + unsigned requested_num = g_app_list.getRequestNumber(id); if (requested_num != 0) { HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", id.c_str(), role.c_str(), area.c_str()); @@ -877,8 +896,8 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char } WMRequest req = WMRequest(id, role, area, Task::TASK_ALLOCATE); - unsigned new_req = app_list.addAllocateRequest(req); - app_list.req_dump(); + 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()); @@ -893,11 +912,11 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char /* * Do allocate tasks */ - bool ret = this->do_transition(new_req); + WMError ret = this->do_transition(new_req); - if (!ret) + if (ret != WMError::SUCCESS) { - HMI_SEQ_ERROR(new_req, "failed to do_transition"); + HMI_SEQ_ERROR(new_req, errorDescription(ret)); //this->emit_error() } } @@ -913,18 +932,18 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co std::string role = drawing_name; std::string area = ""; //drawing_area; - if (!app_list.contains(id)) + if (!g_app_list.contains(id)) { reply("app doesn't request 'requestSurface' yet"); return; } - auto client = app_list.lookUpClient(id); + auto client = g_app_list.lookUpClient(id); /* * Queueing Phase */ - unsigned current = app_list.currentSequenceNumber(); - unsigned requested_num = app_list.getSequenceNumber(id); + unsigned current = g_app_list.currentRequestNumber(); + unsigned requested_num = g_app_list.getRequestNumber(id); if (requested_num != 0) { HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", id.c_str(), role.c_str(), area.c_str()); @@ -933,8 +952,8 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co } WMRequest req = WMRequest(id, role, area, Task::TASK_RELEASE); - unsigned new_req = app_list.addAllocateRequest(req); - app_list.req_dump(); + 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()); @@ -949,11 +968,11 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co /* * Do allocate tasks */ - bool ret = this->do_transition(new_req); + WMError ret = this->do_transition(new_req); - if (!ret) + if (ret != WMError::SUCCESS) { - HMI_SEQ_ERROR(new_req, "failed to do_transition"); + HMI_SEQ_ERROR(new_req, errorDescription(ret)); //this->emit_error() } } @@ -997,40 +1016,51 @@ void App::lm_enddraw(const char *drawing_name) } } -void App::do_enddraw(unsigned request_seq) +void App::do_enddraw(unsigned req_num) { // get actions - auto actions = app_list.getActions(request_seq); - HMI_SEQ_INFO(request_seq, "do endDraw"); + bool found; + auto actions = g_app_list.getActions(req_num, &found); + if (!found) + { + WMError err = WMError::NO_ENTRY; + HMI_SEQ_ERROR(req_num, errorDescription(err)); + return; + } + + HMI_SEQ_INFO(req_num, "do endDraw"); for (const auto &act : actions) { - HMI_SEQ_DEBUG(request_seq, "visible %s", act.role.c_str()); + HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str()); this->lm_enddraw(act.role.c_str()); } - HMI_SEQ_INFO(request_seq, "emit flushDraw"); + HMI_SEQ_INFO(req_num, "emit flushDraw"); /* do { // emit flush Draw - //emitFlushDrawToAll(&app_list, request_seq); + //emitFlushDrawToAll(&g_app_list, req_num); // emit status change event - } while (!app_list.requestFinished());*/ + } while (!g_app_list.requestFinished());*/ } void App::process_request() { - unsigned req = app_list.currentSequenceNumber(); + unsigned req = g_app_list.currentRequestNumber(); HMI_SEQ_DEBUG(req, "Do next request"); - do_transition(req); + WMError rc = do_transition(req); + if(rc != WMError::SUCCESS){ + HMI_SEQ_ERROR(req, errorDescription(rc)); + } } void App::api_enddraw(char const *appid, char const *drawing_name) { std::string id(appid); std::string role(drawing_name); - unsigned current_seq = app_list.currentSequenceNumber(); - bool result = app_list.setEndDrawFinished(current_seq, id, role); + unsigned current_req = g_app_list.currentRequestNumber(); + bool result = g_app_list.setEndDrawFinished(current_req, id, role); if (!result) { @@ -1038,25 +1068,25 @@ void App::api_enddraw(char const *appid, char const *drawing_name) return; } - if (app_list.endDrawFullfilled(current_seq)) + if (g_app_list.endDrawFullfilled(current_req)) { // do task for endDraw //this->stop_timer(); - this->do_enddraw(current_seq); + this->do_enddraw(current_req); this->stop_timer(); - app_list.removeRequest(current_seq); - HMI_SEQ_INFO(current_seq, "Finish request"); - app_list.next(); - if (app_list.haveRequest()) + g_app_list.removeRequest(current_req); + HMI_SEQ_INFO(current_req, "Finish request"); + g_app_list.next(); + if (g_app_list.haveRequest()) { this->process_request(); } } else { - HMI_SEQ_INFO(current_seq, "Wait other App call endDraw"); + HMI_SEQ_INFO(current_req, "Wait other App call endDraw"); return; } } @@ -1137,7 +1167,7 @@ void App::surface_removed(uint32_t surface_id) { HMI_DEBUG("wm", "surface_id is %u", surface_id); - app_list.removeSurface(surface_id); + g_app_list.removeSurface(surface_id); } void App::emit_activated(char const *label) @@ -1206,8 +1236,8 @@ result App::api_request_surface(char const *appid, char const *drawing_name // add client into the db std::string appid_str(appid); std::string role(drawing_name); - //app_list.addClient(appid_str, role); - app_list.addClient(appid_str, *lid, id, role); + //g_app_list.addClient(appid_str, role); + g_app_list.addClient(appid_str, *lid, id, role); return Ok(id); }