X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=1645bfe13a3e6b5afc9fbecbd78e9dd3328360c2;hb=d78ae3cd8f316d1830cde4d611b8e42f90dbcc11;hp=336a98625442ab1d9cc19ef4ab486d7e46d42696;hpb=5d91a5ffe0bc614ee79a18818dadf5836ce038d7;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 336a986..1645bfe 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -35,7 +35,7 @@ #include #include -#include "windowmanager-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,18 +120,34 @@ processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata) void App::timerHandler() { - unsigned seq = app_list.currentSequenceNumber(); + unsigned seq = g_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()) + g_app_list.reqDump(); + g_app_list.removeRequest(seq); + g_app_list.next(); + g_app_list.reqDump(); + if (g_app_list.haveRequest()) { this->process_request(); } } +void App::removeClient(const std::string &appid) +{ + HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str()); + g_app_list.removeClient(appid); +} + +bool App::subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname) +{ + if(!g_app_list.contains(appid)){ + HMI_DEBUG("wm", "Client %s is not registered", appid.c_str()); + return false; + } + auto client = g_app_list.lookUpClient(appid); + return client->subscribe(req, evname); +} + /** * App Impl */ @@ -407,13 +421,14 @@ void App::layout_commit() this->display->flush(); } -void App::set_timer(){ - HMI_SEQ_DEBUG(app_list.currentSequenceNumber(), "Timer set activate"); - if (timer_ev_src == nullptr) +void App::set_timer() +{ + HMI_SEQ_DEBUG(g_app_list.currentSequenceNumber(), "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"); @@ -422,16 +437,18 @@ 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(); +void App::stop_timer() +{ + unsigned seq = g_app_list.currentSequenceNumber(); HMI_SEQ_DEBUG(seq, "Timer stop"); - int rc = sd_event_source_set_enabled(timer_ev_src, SD_EVENT_OFF); - if(rc < 0){ + int rc = sd_event_source_set_enabled(g_timer_ev_src, SD_EVENT_OFF); + if (rc < 0) + { HMI_SEQ_ERROR(seq, "Timer stop failed"); } } @@ -439,7 +456,7 @@ void App::stop_timer(){ bool App::lm_release(const struct WMAction &action) { //auto const &surface_id = this->lookup_id(drawing_name); - unsigned req_num = app_list.currentSequenceNumber(); + unsigned req_num = g_app_list.currentSequenceNumber(); auto const &surface_id = this->lookup_id(action.role.c_str()); if (!surface_id) { @@ -541,8 +558,8 @@ 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); + HMI_SEQ_DEBUG(g_app_list.currentSequenceNumber(), msg); + //g_app_list.removeRequest(req_num); return false; } this->lm_layout_change(action.role.c_str()); @@ -555,7 +572,7 @@ bool App::do_transition(unsigned req_num) * Check Policy */ // get current trigger - auto trigger = app_list.getRequest(req_num); + auto trigger = g_app_list.getRequest(req_num); bool is_activate = true; /* get new status from Policy Manager @@ -563,37 +580,38 @@ bool App::do_transition(unsigned req_num) (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(); + bool ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); + g_app_list.reqDump(); - if(!ret){ + if (!ret) + { HMI_SEQ_ERROR(req_num, "Failed to set action"); return ret; } // 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)) { /* do_task(y); */ - /* TODO + /* TODO but current we can't do do_task, so divide the processing into lm_layout_change and lm_release */ @@ -601,40 +619,45 @@ bool App::do_transition(unsigned req_num) { sync_draw_happen = true; ret = lm_layout_change(y); - if(!ret){ + if (!ret) + { HMI_SEQ_ERROR(req_num, "Failed layout change: %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_syncdraw(y.role, y.area); */ + /* g_app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */ } - else{ + else + { ret = lm_release(y); 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) + { //this->emit_error(request_seq, 0 /*error_num*/, "error happens"); // test } - else if (ret && sync_draw_happen){ + else if (ret && sync_draw_happen) + { this->set_timer(); } - else{ - app_list.removeRequest(req_num); // HACK!!! + else + { + g_app_list.removeRequest(req_num); // HACK!!! } return ret; } -void App::lm_layout_change(const char* drawing_name) +void App::lm_layout_change(const char *drawing_name) { auto const &surface_id = this->lookup_id(drawing_name); auto layer_id = this->layers.get_layer_id(*surface_id); @@ -779,7 +802,7 @@ void App::lm_layout_change(const char* drawing_name) } } -const char* App::check_surface_exist(const char* drawing_name) +const char *App::check_surface_exist(const char *drawing_name) { auto const &surface_id = this->lookup_id(drawing_name); if (!surface_id) @@ -827,18 +850,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); + 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.currentSequenceNumber(); + unsigned requested_num = g_app_list.getSequenceNumber(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()); @@ -847,8 +871,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()); @@ -865,7 +889,8 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char */ bool ret = this->do_transition(new_req); - if(!ret){ + if (!ret) + { HMI_SEQ_ERROR(new_req, "failed to do_transition"); //this->emit_error() } @@ -880,19 +905,20 @@ 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; + 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.currentSequenceNumber(); + unsigned requested_num = g_app_list.getSequenceNumber(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()); @@ -901,8 +927,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,7 +975,8 @@ void App::check_flushdraw(int surface_id) } } -void App::lm_enddraw(const char* drawing_name){ +void App::lm_enddraw(const char *drawing_name) +{ HMI_DEBUG("wm", "end draw %s", drawing_name); for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++) { @@ -967,26 +994,27 @@ void App::lm_enddraw(const char* drawing_name){ void App::do_enddraw(unsigned request_seq) { // get actions - auto actions = app_list.getActions(request_seq); + auto actions = g_app_list.getActions(request_seq); HMI_SEQ_INFO(request_seq, "do endDraw"); - for(const auto& act : actions){ + for (const auto &act : actions) + { HMI_SEQ_DEBUG(request_seq, "visible %s", act.role.c_str()); this->lm_enddraw(act.role.c_str()); } HMI_SEQ_INFO(request_seq, "emit flushDraw"); -/* do + /* do { // emit flush Draw - //emitFlushDrawToAll(&app_list, request_seq); + //emitFlushDrawToAll(&g_app_list, request_seq); // 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.currentSequenceNumber(); HMI_SEQ_DEBUG(req, "Do next request"); do_transition(req); } @@ -995,8 +1023,8 @@ 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_seq = g_app_list.currentSequenceNumber(); + bool result = g_app_list.setEndDrawFinished(current_seq, id, role); if (!result) { @@ -1004,7 +1032,7 @@ void App::api_enddraw(char const *appid, char const *drawing_name) return; } - if (app_list.endDrawFullfilled(current_seq)) + if (g_app_list.endDrawFullfilled(current_seq)) { // do task for endDraw //this->stop_timer(); @@ -1012,10 +1040,10 @@ void App::api_enddraw(char const *appid, char const *drawing_name) this->stop_timer(); - app_list.removeRequest(current_seq); + g_app_list.removeRequest(current_seq); HMI_SEQ_INFO(current_seq, "Finish request"); - app_list.next(); - if (app_list.haveRequest()) + g_app_list.next(); + if (g_app_list.haveRequest()) { this->process_request(); } @@ -1091,34 +1119,19 @@ void App::surface_created(uint32_t surface_id) this->api_activate_surface( this->lookup_name(surface_id).value_or("unknown-name").c_str()); }*/ + + // search pid from surfaceID + + // pick up appid from pid from application manager + + // check appid then add it to the client } void App::surface_removed(uint32_t surface_id) { HMI_DEBUG("wm", "surface_id is %u", surface_id); - // We cannot normally deactivate the main_surface, so be explicit - // about it: - if (int(surface_id) == this->layers.main_surface) - { - this->deactivate_main_surface(); - } - else - { - auto drawing_name = this->lookup_name(surface_id); - if (drawing_name) - { - std::string appid = ""; - /* auto = lookUpClient(surface_id); - appid = client->appID(); - - */ - this->api_deactivate_surface(appid.c_str(), drawing_name->c_str(), [](const char *) {}); - } - } - - this->id_alloc.remove_id(surface_id); - this->layers.remove_surface(surface_id); + g_app_list.removeSurface(surface_id); } void App::emit_activated(char const *label) @@ -1187,7 +1200,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); + //g_app_list.addClient(appid_str, role); + g_app_list.addClient(appid_str, *lid, id, role); return Ok(id); }