diff options
| -rw-r--r-- | src/app.cpp | 128 | ||||
| -rw-r--r-- | src/app.hpp | 3 | ||||
| -rw-r--r-- | src/applist.cpp | 53 | ||||
| -rw-r--r-- | src/applist.hpp | 1 |
4 files changed, 103 insertions, 82 deletions
diff --git a/src/app.cpp b/src/app.cpp index 5913143..3b42a85 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -71,6 +71,8 @@ const char kKeyHeightMm[] = "height_mm"; static sd_event_source *g_timer_ev_src = nullptr; +static AppList g_app_list; + namespace { @@ -119,13 +121,13 @@ processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata) void App::timerHandler() { - unsigned req_num = app_list->currentRequestNumber(); + unsigned req_num = g_app_list.currentRequestNumber(); HMI_SEQ_DEBUG(req_num, "Timer expired remove Request"); - app_list->reqDump(); - app_list->removeRequest(req_num); - app_list->next(); - app_list->reqDump(); - if (app_list->haveRequest()) + 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(); } @@ -134,16 +136,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); } @@ -159,8 +161,9 @@ App::App(wl::display *d) layers(), id_alloc{}, pending_events(false), - policy{}, - app_list(std::make_unique<AppList>()) + policy{} + //g_app_list(new AppList()) + //g_app_list(std::make_unique<AppList>()) { try { @@ -425,7 +428,7 @@ void App::layout_commit() void App::set_timer() { - HMI_SEQ_DEBUG(app_list->currentRequestNumber(), "Timer set activate"); + HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate"); if (g_timer_ev_src == nullptr) { // firsttime set into sd_event @@ -446,7 +449,7 @@ void App::set_timer() void App::stop_timer() { - unsigned req_num = app_list->currentRequestNumber(); + 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) @@ -459,7 +462,7 @@ WMError App::lm_release(const struct WMAction &action) { //auto const &surface_id = this->lookup_id(drawing_name); WMError ret = WMError::LAYOUT_CHANGE_FAIL; - unsigned req_num = app_list->currentRequestNumber(); + unsigned req_num = g_app_list.currentRequestNumber(); auto const &surface_id = this->lookup_id(action.role.c_str()); if (!surface_id) { @@ -561,7 +564,7 @@ WMError App::lm_layout_change(const struct WMAction &action) TODO: emit syncDraw with application*/ if (msg) { - HMI_SEQ_DEBUG(app_list->currentRequestNumber(), msg); + HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), msg); return WMError::LAYOUT_CHANGE_FAIL; } this->lm_layout_change(action.role.c_str()); @@ -576,7 +579,7 @@ WMError App::do_transition(unsigned req_num) // get current trigger bool found; bool is_activate = true; - auto trigger = app_list->getRequest(req_num, &found); + auto trigger = g_app_list.getRequest(req_num, &found); if(!found) { WMError err = WMError::NO_ENTRY; @@ -589,12 +592,12 @@ WMError App::do_transition(unsigned req_num) (json_object*?) newLayout = checkPolicy(trigger); (vector<struct WMAction>&) 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 } */ @@ -604,8 +607,8 @@ WMError App::do_transition(unsigned req_num) { is_activate = false; } - WMError ret = app_list->setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); - app_list->reqDump(); + WMError ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); + g_app_list.reqDump(); if (ret != WMError::SUCCESS) { @@ -615,7 +618,7 @@ WMError App::do_transition(unsigned req_num) // layer manager task bool sync_draw_happen = false; - for (const auto &y : app_list->getActions(req_num, &found)) + for (const auto &y : g_app_list.getActions(req_num, &found)) { if (!found) { @@ -638,11 +641,11 @@ WMError App::do_transition(unsigned 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()); - 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 { @@ -650,11 +653,11 @@ WMError 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); */ } } @@ -668,7 +671,7 @@ WMError App::do_transition(unsigned req_num) } else { - app_list->removeRequest(req_num); // HACK!!! + g_app_list.removeRequest(req_num); // HACK!!! } return ret; } @@ -781,9 +784,9 @@ void App::lm_layout_change(const char *drawing_name) std::string hack_appid = "navigation"; std::string hack_role = main; std::string hack_area = str_area_main; - app_list->setAction(app_list->currentRequestNumber(), hack_appid, hack_role, hack_area, true); - //app_list->setEndDrawFinished(app_list->currentRequestNumber(), request_role, request_role); - //app_list->setEndDrawFinished(app_list->currentRequestNumber(), hack_appid, hack_role); // This process is illegal + 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, @@ -877,13 +880,13 @@ 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); unsigned srfc = client->surfaceID(role); if(srfc == INVALID_SURFACE_ID){ @@ -891,13 +894,14 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char reply("role should be set with surface"); return; } - app_list->removeFloatingSurface(client->surfaceID(role)); + g_app_list.dumpFloatingSurfaces(); + g_app_list.removeFloatingSurface(client->surfaceID(role)); /* * Queueing Phase */ - unsigned current = app_list->currentRequestNumber(); - unsigned requested_num = app_list->getRequestNumber(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()); @@ -906,8 +910,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->reqDump(); + 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()); @@ -942,18 +946,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->currentRequestNumber(); - unsigned requested_num = app_list->getRequestNumber(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()); @@ -962,8 +966,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->reqDump(); + 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()); @@ -1030,7 +1034,7 @@ void App::do_enddraw(unsigned req_num) { // get actions bool found; - auto actions = app_list->getActions(req_num, &found); + auto actions = g_app_list.getActions(req_num, &found); if (!found) { WMError err = WMError::NO_ENTRY; @@ -1050,14 +1054,14 @@ void App::do_enddraw(unsigned req_num) /* do { // emit flush Draw - //emitFlushDrawToAll(&app_list, req_num); + //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->currentRequestNumber(); + unsigned req = g_app_list.currentRequestNumber(); HMI_SEQ_DEBUG(req, "Do next request"); WMError rc = do_transition(req); if(rc != WMError::SUCCESS){ @@ -1069,8 +1073,8 @@ void App::api_enddraw(char const *appid, char const *drawing_name) { std::string id(appid); std::string role(drawing_name); - unsigned current_req = app_list->currentRequestNumber(); - bool result = app_list->setEndDrawFinished(current_req, id, role); + unsigned current_req = g_app_list.currentRequestNumber(); + bool result = g_app_list.setEndDrawFinished(current_req, id, role); if (!result) { @@ -1078,7 +1082,7 @@ void App::api_enddraw(char const *appid, char const *drawing_name) return; } - if (app_list->endDrawFullfilled(current_req)) + if (g_app_list.endDrawFullfilled(current_req)) { // do task for endDraw //this->stop_timer(); @@ -1086,10 +1090,10 @@ void App::api_enddraw(char const *appid, char const *drawing_name) this->stop_timer(); - app_list->removeRequest(current_req); + g_app_list.removeRequest(current_req); HMI_SEQ_INFO(current_req, "Finish request"); - app_list->next(); - if (app_list->haveRequest()) + g_app_list.next(); + if (g_app_list.haveRequest()) { this->process_request(); } @@ -1181,13 +1185,13 @@ 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::surface_properties(unsigned surface_id, unsigned pid) { HMI_DEBUG("wm", "get surface properties"); - this->app_list->addFloatingSurface(surface_id, pid); + g_app_list.addFloatingSurface(surface_id, pid); } void App::emit_activated(char const *label) @@ -1256,8 +1260,8 @@ result<int> 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<int>(id); } @@ -1344,26 +1348,26 @@ bool App::api_set_role(char const *appid, char const *drawing_name, unsigned pid if(0 != pid){ // search floating surfaceID from pid if pid is designated. // It is not good that application request with its pid - wm_err = app_list->popFloatingSurface(pid, &surface); + wm_err = g_app_list.popFloatingSurface(pid, &surface); } else{ // get floating surface with appid. If WM queries appid from pid, // WM can bind surface and role with appid(not implemented yet) - //wm_err = app_list->popFloatingSurface(id); + //wm_err = g_app_list.popFloatingSurface(id); } if(wm_err != WMError::SUCCESS){ HMI_ERROR("wm", "No floating surface for app: %s", id.c_str()); - app_list->addFloatingClient(id, *lid, role); + g_app_list.addFloatingClient(id, *lid, role); HMI_NOTICE("wm", "%s : Waiting for surface creation", id.c_str()); return ret; } ret = true; - if (app_list->contains(id)) + if (g_app_list.contains(id)) { HMI_INFO("wm", "Add role: %s with surface: %d. Client %s has multi surfaces.", role.c_str(), surface, id.c_str()); - wm_err = app_list->appendRole(id, role, surface); + wm_err = g_app_list.appendRole(id, role, surface); if(wm_err != WMError::SUCCESS){ HMI_INFO("wm", errorDescription(wm_err)); } @@ -1371,7 +1375,7 @@ bool App::api_set_role(char const *appid, char const *drawing_name, unsigned pid else{ HMI_INFO("wm", "Create new client: %s, surface: %d into layer: %d with role: %s", id.c_str(), surface, *lid, role.c_str()); - app_list->addClient(id, *lid, surface, role); + g_app_list.addClient(id, *lid, surface, role); } // register pair drawing_name and ivi_id diff --git a/src/app.hpp b/src/app.hpp index c46512f..2fe4383 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -291,7 +291,8 @@ struct App void lm_enddraw(const char *drawing_name); private: - std::unique_ptr<wm::AppList> app_list; + //std::unique_ptr<wm::AppList> app_list; + //AppList *app_list; }; } // namespace wm diff --git a/src/applist.cpp b/src/applist.cpp index 06c1d86..7249130 100644 --- a/src/applist.cpp +++ b/src/applist.cpp @@ -62,9 +62,13 @@ bool AppList::contains(const string &appid) const void AppList::removeSurface(unsigned surface_id){ // This function may be very slow + this->clientDump(); + for (int i = 0; i < 1000; i++) + ; bool ret = false; for (auto &x : this->app2client) { + HMI_DEBUG("wm", "app: %s", x.second->appID()); ret = x.second->removeSurfaceIfExist(surface_id); if(ret){ HMI_DEBUG("wm", "remove surface %d from Client %s finish", surface_id, x.second->appID().c_str()); @@ -98,16 +102,18 @@ WMError AppList::popFloatingSurface(unsigned pid, unsigned *surface) { WMError ret = WMError::NO_ENTRY; - for (auto itr = this->floating_surfaces.begin(); itr != this->floating_surfaces.end(); ++itr) - { - if(pid == itr->pid){ - *surface = itr->surface_id; - itr = this->floating_surfaces.erase(itr); - ret = WMError::SUCCESS; - HMI_DEBUG("wm", "Erase surface %d", *surface); - break; - } - } + auto rmv_begin = std::remove_if(this->floating_surfaces.begin(), this->floating_surfaces.end(), + [pid, surface, &ret](FloatingSurface x) { + if(pid == x.pid){ + *surface = x.surface_id; + ret = WMError::SUCCESS; + return true; + } + else{ + return false; + } + }); + this->floating_surfaces.erase(rmv_begin, this->floating_surfaces.end()); return ret; } @@ -125,19 +131,17 @@ void AppList::addFloatingSurface(unsigned surface, unsigned pid) { struct FloatingSurface fsurface{surface, pid}; this->floating_surfaces.push_back(fsurface); + this->dumpFloatingSurfaces(); } void AppList::removeFloatingSurface(unsigned surface) { - for (auto itr = this->floating_surfaces.begin(); itr != this->floating_surfaces.end(); ++itr) - { - if (surface == itr->surface_id) - { - HMI_DEBUG("wm", "Erase surface %d", itr->surface_id); - itr = this->floating_surfaces.erase(itr); - break; - } - } + this->dumpFloatingSurfaces(); + auto rmv_begin = std::remove_if(this->floating_surfaces.begin(), this->floating_surfaces.end(), + [surface](FloatingSurface x) { + return x.surface_id == surface; + }); + this->floating_surfaces.erase(rmv_begin, this->floating_surfaces.end()); } WMError AppList::appendRole(const std::string &id, const std::string &role, unsigned surface) @@ -368,4 +372,15 @@ void AppList::reqDump() } DUMP("======= req dump end =====\n"); } + +void AppList::dumpFloatingSurfaces() +{ + DUMP("======= floating surface dump ====="); + for (const auto &x : this->floating_surfaces) + { + DUMP("surface : %d, pid : %d", x.surface_id, x.pid); + } + DUMP("======= floating surface dump end =====\n"); +} + } // namespace wm
\ No newline at end of file diff --git a/src/applist.hpp b/src/applist.hpp index 69577d0..b4ac9e0 100644 --- a/src/applist.hpp +++ b/src/applist.hpp @@ -80,6 +80,7 @@ class AppList void clientDump(); void reqDump(); + void dumpFloatingSurfaces(); private: std::vector<WMRequest> req_list; |