From bb51378eb5a390bd489fd41bd38e0b262e31479d Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Sat, 9 Jun 2018 15:38:38 +0900 Subject: [PATCH] Use unique_ptr I don't debug yet Change-Id: I540f31c3fd5dbe757e254346328a25eb5b58dea5 Signed-off-by: Kazumasa Mitsunari --- src/app.cpp | 126 ++++++++++++++++++++++++++++---------------------------- src/app.hpp | 7 +++- src/applist.cpp | 7 ---- src/applist.hpp | 10 +++-- 4 files changed, 77 insertions(+), 73 deletions(-) diff --git a/src/app.cpp b/src/app.cpp index 7f19572..324145f 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "applist.hpp" #include "app.hpp" #include "json_helper.hpp" #include "layers.hpp" @@ -36,7 +37,7 @@ #include #include "wm-client.hpp" -#include "applist.hpp" + extern "C" { @@ -70,8 +71,6 @@ const char kKeyHeightMm[] = "height_mm"; static sd_event_source *g_timer_ev_src = nullptr; -static AppList g_app_list; - namespace { @@ -120,13 +119,13 @@ processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata) void App::timerHandler() { - unsigned req_num = g_app_list.currentRequestNumber(); + unsigned req_num = 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()) + app_list->reqDump(); + app_list->removeRequest(req_num); + app_list->next(); + app_list->reqDump(); + if (app_list->haveRequest()) { this->process_request(); } @@ -135,16 +134,16 @@ void App::timerHandler() void App::removeClient(const std::string &appid) { HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str()); - g_app_list.removeClient(appid); + app_list->removeClient(appid); } bool App::subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname) { - if(!g_app_list.contains(appid)){ + if(!app_list->contains(appid)){ HMI_DEBUG("wm", "Client %s is not registered", appid.c_str()); return false; } - auto client = g_app_list.lookUpClient(appid); + auto client = app_list->lookUpClient(appid); return client->subscribe(req, evname); } @@ -160,7 +159,8 @@ App::App(wl::display *d) layers(), id_alloc{}, pending_events(false), - policy{} + policy{}, + app_list(std::make_unique()) { try { @@ -238,6 +238,8 @@ int App::init() return init_layers(); } +App::~App() = default; + int App::dispatch_pending_events() { if (this->pop_pending_events()) @@ -423,7 +425,7 @@ void App::layout_commit() void App::set_timer() { - HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate"); + HMI_SEQ_DEBUG(app_list->currentRequestNumber(), "Timer set activate"); if (g_timer_ev_src == nullptr) { // firsttime set into sd_event @@ -444,7 +446,7 @@ void App::set_timer() void App::stop_timer() { - unsigned req_num = g_app_list.currentRequestNumber(); + unsigned req_num = 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) @@ -457,7 +459,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 = g_app_list.currentRequestNumber(); + unsigned req_num = app_list->currentRequestNumber(); auto const &surface_id = this->lookup_id(action.role.c_str()); if (!surface_id) { @@ -559,7 +561,7 @@ WMError App::lm_layout_change(const struct WMAction &action) TODO: emit syncDraw with application*/ if (msg) { - HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), msg); + HMI_SEQ_DEBUG(app_list->currentRequestNumber(), msg); return WMError::LAYOUT_CHANGE_FAIL; } this->lm_layout_change(action.role.c_str()); @@ -572,7 +574,7 @@ WMError App::do_transition(unsigned req_num) * Check Policy */ // get current trigger - auto trigger = g_app_list.getRequest(req_num); + auto trigger = app_list->getRequest(req_num); bool is_activate = true; /* get new status from Policy Manager @@ -580,12 +582,12 @@ WMError App::do_transition(unsigned req_num) (json_object*?) newLayout = checkPolicy(trigger); (vector&) auto actions = translator.inputActionFromLayout(newLayout, currentLayout) for(const auto& x : actions){ - g_app_list.setAciton(req_num, x) + app_list->setAciton(req_num, x) } or - translator.inputActionFromLayout(newLayout, currentLayout, &g_app_list, req_num); + translator.inputActionFromLayout(newLayout, currentLayout, &app_list, req_num); /* The following error check is not necessary because main.cpp will reject the message form not registered object } */ @@ -595,8 +597,8 @@ WMError App::do_transition(unsigned req_num) { is_activate = false; } - WMError ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); - g_app_list.reqDump(); + WMError ret = app_list->setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); + app_list->reqDump(); if (ret != WMError::SUCCESS) { @@ -606,7 +608,7 @@ WMError App::do_transition(unsigned req_num) // layer manager task bool sync_draw_happen = false; - for (const auto &y : g_app_list.getActions(req_num)) + for (const auto &y : app_list->getActions(req_num)) { /* do_task(y); @@ -623,11 +625,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()); - g_app_list.removeRequest(req_num); + app_list->removeRequest(req_num); break; // TODO: if transition fails, what should we do? } - /* g_app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */ + /* app_list->lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */ } else { @@ -635,11 +637,11 @@ WMError App::do_transition(unsigned req_num) if (!ret) { HMI_SEQ_ERROR(req_num, "Failed release resource: %s", y.appid.c_str()); - g_app_list.removeRequest(req_num); + app_list->removeRequest(req_num); break; // TODO: if transition fails, what should we do? } - /* g_app_list.lookUpClient(y.appid)->emit_invisible(y.role, y.area); */ + /* app_list->lookUpClient(y.appid)->emit_invisible(y.role, y.area); */ } } @@ -653,7 +655,7 @@ WMError App::do_transition(unsigned req_num) } else { - g_app_list.removeRequest(req_num); // HACK!!! + app_list->removeRequest(req_num); // HACK!!! } return ret; } @@ -766,9 +768,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; - 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 + 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 // >>> HACK this->emit_syncdraw(main.c_str(), str_area_main.c_str(), area_rect_main.x, area_rect_main.y, @@ -862,19 +864,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 (!g_app_list.contains(id)) + if (!app_list->contains(id)) { reply("app doesn't request 'requestSurface' yet"); return; } - auto client = g_app_list.lookUpClient(id); + auto client = app_list->lookUpClient(id); /* * Queueing Phase */ - unsigned current = g_app_list.currentRequestNumber(); - unsigned requested_num = g_app_list.getRequestNumber(id); + unsigned current = app_list->currentRequestNumber(); + unsigned requested_num = 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()); @@ -883,8 +885,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 = g_app_list.addAllocateRequest(req); - g_app_list.reqDump(); + unsigned new_req = app_list->addAllocateRequest(req); + app_list->reqDump(); HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str()); @@ -919,18 +921,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 (!g_app_list.contains(id)) + if (!app_list->contains(id)) { reply("app doesn't request 'requestSurface' yet"); return; } - auto client = g_app_list.lookUpClient(id); + auto client = app_list->lookUpClient(id); /* * Queueing Phase */ - unsigned current = g_app_list.currentRequestNumber(); - unsigned requested_num = g_app_list.getRequestNumber(id); + unsigned current = app_list->currentRequestNumber(); + unsigned requested_num = 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()); @@ -939,8 +941,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 = g_app_list.addAllocateRequest(req); - g_app_list.reqDump(); + unsigned new_req = app_list->addAllocateRequest(req); + app_list->reqDump(); HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str()); @@ -1006,7 +1008,7 @@ void App::lm_enddraw(const char *drawing_name) void App::do_enddraw(unsigned req_num) { // get actions - auto actions = g_app_list.getActions(req_num); + auto actions = app_list->getActions(req_num); HMI_SEQ_INFO(req_num, "do endDraw"); for (const auto &act : actions) @@ -1019,14 +1021,14 @@ void App::do_enddraw(unsigned req_num) /* do { // emit flush Draw - //emitFlushDrawToAll(&g_app_list, req_num); + //emitFlushDrawToAll(&app_list, req_num); // emit status change event - } while (!g_app_list.requestFinished());*/ + } while (!app_list->requestFinished());*/ } void App::process_request() { - unsigned req = g_app_list.currentRequestNumber(); + unsigned req = app_list->currentRequestNumber(); HMI_SEQ_DEBUG(req, "Do next request"); WMError rc = do_transition(req); if(rc != WMError::SUCCESS){ @@ -1038,8 +1040,8 @@ void App::api_enddraw(char const *appid, char const *drawing_name) { std::string id(appid); std::string role(drawing_name); - unsigned current_req = g_app_list.currentRequestNumber(); - bool result = g_app_list.setEndDrawFinished(current_req, id, role); + unsigned current_req = app_list->currentRequestNumber(); + bool result = app_list->setEndDrawFinished(current_req, id, role); if (!result) { @@ -1047,7 +1049,7 @@ void App::api_enddraw(char const *appid, char const *drawing_name) return; } - if (g_app_list.endDrawFullfilled(current_req)) + if (app_list->endDrawFullfilled(current_req)) { // do task for endDraw //this->stop_timer(); @@ -1055,10 +1057,10 @@ void App::api_enddraw(char const *appid, char const *drawing_name) this->stop_timer(); - g_app_list.removeRequest(current_req); + app_list->removeRequest(current_req); HMI_SEQ_INFO(current_req, "Finish request"); - g_app_list.next(); - if (g_app_list.haveRequest()) + app_list->next(); + if (app_list->haveRequest()) { this->process_request(); } @@ -1146,7 +1148,7 @@ void App::surface_removed(uint32_t surface_id) { HMI_DEBUG("wm", "surface_id is %u", surface_id); - g_app_list.removeSurface(surface_id); + app_list->removeSurface(surface_id); } void App::emit_activated(char const *label) @@ -1215,8 +1217,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); - //g_app_list.addClient(appid_str, role); - g_app_list.addClient(appid_str, *lid, id, role); + //app_list->addClient(appid_str, role); + app_list->addClient(appid_str, *lid, id, role); return Ok(id); } @@ -1303,26 +1305,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 = g_app_list.lookUpFloatingSurface(pid, &surface); + wm_err = app_list->lookUpFloatingSurface(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 = g_app_list.lookUpFloatingSurface(id); + //wm_err = app_list->lookUpFloatingSurface(id); } if(wm_err != WMError::SUCCESS){ HMI_ERROR("wm", "No floating surface for app: %s", id.c_str()); - //g_app_list.addFloatingClient(id, *lid, role); + //app_list->addFloatingClient(id, *lid, role); HMI_NOTICE("wm", "%s : Waiting for surface creation", id.c_str()); return ret; } ret = true; - if (g_app_list.contains(id)) + if (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 = g_app_list.appendRole(id, role, surface); + wm_err = app_list->appendRole(id, role, surface); if(wm_err != WMError::SUCCESS){ HMI_INFO("wm", errorDescription(wm_err)); } @@ -1330,7 +1332,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()); - g_app_list.addClient(id, *lid, surface, role); + app_list->addClient(id, *lid, surface, role); } return ret; } diff --git a/src/app.hpp b/src/app.hpp index 4aaed50..e53824c 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -70,6 +70,8 @@ extern const char kKeyHeightPixel[]; extern const char kKeyWidthMm[]; extern const char kKeyHeightMm[]; +class AppList; + struct id_allocator { unsigned next = 1; @@ -205,7 +207,7 @@ struct App std::vector surface_bg; explicit App(wl::display *d); - ~App() = default; + ~App()/* = default */; App(App const &) = delete; App &operator=(App const &) = delete; @@ -286,6 +288,9 @@ struct App WMError lm_layout_change(const struct WMAction &action); WMError lm_release(const struct WMAction &action); void lm_enddraw(const char *drawing_name); + + private: + std::unique_ptr app_list; }; } // namespace wm diff --git a/src/applist.cpp b/src/applist.cpp index 64f5f64..4e31c03 100644 --- a/src/applist.cpp +++ b/src/applist.cpp @@ -25,11 +25,6 @@ using std::vector; namespace wm { -struct FloatingSurface{ - unsigned surface_id; - unsigned pid; -}; - AppList::AppList() : req_list(0), app2client(0), @@ -37,8 +32,6 @@ AppList::AppList() { } -AppList::~AppList() {} - void AppList::addClient(const string &appid, const string &role) { shared_ptr client = std::make_shared(appid, role); diff --git a/src/applist.hpp b/src/applist.hpp index 92310fd..20e7cb5 100644 --- a/src/applist.hpp +++ b/src/applist.hpp @@ -30,14 +30,18 @@ namespace wm /* using std::experimental::nullopt; using std::experimental::optional; */ -struct FloatingSurface; +struct FloatingSurface +{ + unsigned surface_id; + unsigned pid; +}; class AppList { public: AppList(); - virtual ~AppList(); - AppList(const AppList &obj) = delete; + virtual ~AppList() = default; + AppList(const AppList &obj); // Client Database Interface void addClient(const std::string &appid, const std::string &role); -- 2.16.6