diff options
Diffstat (limited to 'src/app.cpp')
| -rw-r--r-- | src/app.cpp | 122 |
1 files changed, 60 insertions, 62 deletions
diff --git a/src/app.cpp b/src/app.cpp index 1802c33..1645bfe 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -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(); + 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(); } @@ -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.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"); @@ -439,16 +437,16 @@ 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(); + 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); + int rc = sd_event_source_set_enabled(g_timer_ev_src, SD_EVENT_OFF); if (rc < 0) { HMI_SEQ_ERROR(seq, "Timer stop failed"); @@ -458,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) { @@ -560,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()); @@ -574,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 @@ -582,23 +580,23 @@ bool 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 } */ 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) { @@ -608,7 +606,7 @@ 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)) { /* do_task(y); @@ -624,11 +622,11 @@ bool App::do_transition(unsigned req_num) 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 { @@ -636,11 +634,11 @@ 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); */ } } @@ -654,7 +652,7 @@ bool App::do_transition(unsigned req_num) } else { - app_list.removeRequest(req_num); // HACK!!! + g_app_list.removeRequest(req_num); // HACK!!! } return ret; } @@ -852,19 +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()); @@ -873,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()); @@ -909,18 +907,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.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()); @@ -929,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()); @@ -996,7 +994,7 @@ 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) @@ -1009,14 +1007,14 @@ void App::do_enddraw(unsigned request_seq) /* 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); } @@ -1025,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) { @@ -1034,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(); @@ -1042,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(); } @@ -1133,7 +1131,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) @@ -1202,8 +1200,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); } |