X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=cedf70ce7d51705cba7adbafc71eae08c5b1ba35;hb=1e55798ce66d927f649284441202bc6ae1df328b;hp=7462c99335b815ef36dc02e8a7d67de71aef7cba;hpb=5ac52dc6412f8311b6cfbd0e99652c914d5c6168;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 7462c99..cedf70c 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 = 1000000UL; /* 1s */ +const unsigned TIME_OUT = 10000000UL; /* 10s */ /* DrawingArea name used by "{layout}.{area}" */ const char kNameLayoutNormal[] = "normal"; @@ -122,9 +122,32 @@ processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata) void App::timerHandler() { - // TODO: write reset process 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()) + { + this->process_request(); + } +} + +void App::removeClient(const std::string &appid) +{ + HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str()); + app_list.removeClient(appid); +} + +bool App::subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname) +{ + if(app_list.contains(appid) != WMError::SUCCESS){ + HMI_DEBUG("wm", "Client %s is not registered", appid.c_str()); + return false; + } + auto client = app_list.lookUpClient(appid); + return client->subscribe(req, evname); } /** @@ -400,144 +423,249 @@ void App::layout_commit() this->display->flush(); } -void App::do_allocate_window_resource(unsigned sequence_number) +void App::set_timer() { - do - { - // TODO: Tasks will be changed according to policy manager result - // do task(onTransition (activate)) - } while (!app_list.requestFinished()); - - // lm_.updateLayout(jobj); - // TODO: emit syncDraw with application - do - { - //client->emit_syncdraw(role); - } while (!app_list.requestFinished()); - - // is the below necessary? - //app_list.setAllocated(sequence_number); - - if (timer_ev_src != nullptr) + HMI_SEQ_DEBUG(app_list.currentSequenceNumber(), "Timer set activate"); + if (timer_ev_src == nullptr) { // firsttime set into sd_event int ret = sd_event_add_time(afb_daemon_get_event_loop(), &timer_ev_src, - CLOCK_BOOTTIME, time(NULL) + TIME_OUT, 0, processTimerHandler, this); + CLOCK_REALTIME, time(NULL) * (1000000UL) + TIME_OUT, 1, processTimerHandler, this); if (ret < 0) { - HMI_ERROR("wm", "Can't set timer"); + HMI_ERROR("wm", "Could't set timer"); } } else { // update timer limitation after second time - sd_event_source_set_time(timer_ev_src, time(NULL) + TIME_OUT); + sd_event_source_set_time(timer_ev_src, time(NULL) * (1000000UL) + TIME_OUT); sd_event_source_set_enabled(timer_ev_src, SD_EVENT_ONESHOT); } } -void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply) +void App::stop_timer() { - ST(); + unsigned seq = 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) + { + HMI_SEQ_ERROR(seq, "Timer stop failed"); + } +} - /* - * Check Phase - */ +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.currentSequenceNumber(); + auto const &surface_id = this->lookup_id(action.role.c_str()); + if (!surface_id) + { + HMI_SEQ_ERROR(req_num, "Surface does not exist"); + return ret; + } - auto const &surface_id = this->lookup_id(drawing_name); - std::string id = appid; - std::string role = drawing_name; - std::string area = drawing_area; + if (*surface_id == this->layers.main_surface) + { + HMI_SEQ_ERROR(req_num, "Cannot deactivate main_surface"); + return ret; + } - if(!app_list.contains(id)){ - reply("app doesn't request 'requestSurface' yet"); - return; + auto o_state = *this->layers.get_layout_state(*surface_id); + + if (o_state == nullptr) + { + HMI_SEQ_ERROR(req_num, "Could not find layer for surface"); + return ret; } - auto client = app_list.lookUpClient(id); + struct LayoutState &state = *o_state; - /* - * Queueing Phase - */ - unsigned current = app_list.currentSequenceNumber(); - unsigned requested_num = app_list.getSequenceNumber(id); - if (requested_num != 0) + if (state.main == -1) { - HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", id.c_str(), role.c_str(), area.c_str()); - reply("already requested"); - return; + HMI_SEQ_ERROR(req_num, "No surface active"); + return ret; } - WMRequest req = WMRequest(id, role, area, Task::TASK_ALLOCATE); - unsigned new_req = app_list.addAllocateRequest(req); + // Check against main_surface, main_surface_name is the configuration item. + if (*surface_id == this->layers.main_surface) + { + HMI_SEQ_DEBUG(req_num, "Refusing to deactivate main_surface %d", *surface_id); + //reply(nullptr); + return WMError::SUCCESS; + } + if ((state.main == *surface_id) && (state.sub == *surface_id)) + { + HMI_SEQ_ERROR(req_num, "Surface is not active"); + return ret; + } - HMI_SEQ_DEBUG(new_req, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str()); + if (state.main == *surface_id) + { + if (state.sub != -1) + { + this->try_layout( + state, LayoutState{state.sub, -1}, [&](LayoutState const &nl) { + std::string sub = std::move(*this->lookup_name(state.sub)); - if (new_req != current) + this->deactivate(*surface_id); + this->surface_set_layout(state.sub); + state = nl; + + this->layout_commit(); + std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); + compositor::rect area_rect = this->area_info[state.sub]; + this->emit_syncdraw(sub.c_str(), str_area.c_str(), + area_rect.x, area_rect.y, area_rect.w, area_rect.h); + this->enqueue_flushdraw(state.sub); + }); + } + else + { + this->try_layout(state, LayoutState{-1, -1}, [&](LayoutState const &nl) { + this->deactivate(*surface_id); + state = nl; + this->layout_commit(); + }); + } + } + else if (state.sub == *surface_id) { - // Add request, then invoked after the previous task is finished - HMI_SEQ_DEBUG(new_req, "request is accepted"); - reply(nullptr); - return; + this->try_layout( + state, LayoutState{state.main, -1}, [&](LayoutState const &nl) { + std::string main = std::move(*this->lookup_name(state.main)); + + this->deactivate(*surface_id); + this->surface_set_layout(state.main); + state = nl; + + this->layout_commit(); + std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); + compositor::rect area_rect = this->area_info[state.main]; + this->emit_syncdraw(main.c_str(), str_area.c_str(), + area_rect.x, area_rect.y, area_rect.w, area_rect.h); + this->enqueue_flushdraw(state.main); + }); } + return WMError::SUCCESS; +} + +WMError App::lm_layout_change(const struct WMAction &action) +{ + const char *msg = this->check_surface_exist(action.role.c_str()); + /* + lm_.updateLayout(action); + TODO: emit syncDraw with application*/ + if (msg) + { + HMI_SEQ_DEBUG(app_list.currentSequenceNumber(), msg); + //app_list.removeRequest(req_num); + return WMError::LAYOUT_CHANGE_FAIL; + } + this->lm_layout_change(action.role.c_str()); + return WMError::SUCCESS; +} + +WMError App::do_transition(unsigned req_num) +{ /* * Check Policy */ + // get current trigger + auto trigger = app_list.getRequest(req_num); + bool is_activate = true; - // json_object* newState = checkPolicy(role); - /* The following error check is not necessary because main.cpp will reject the message form not registered object - if(client != nullptr){ - reply("client is not registered"); - return; - } */ + /* get new status from Policy Manager - // get surfaceID from role - /* auto const &surface_id_tmp = client->surfaceID(role); - auto const &layer_id_tmp = client->layerID(); + (json_object*?) newLayout = checkPolicy(trigger); + (vector&) auto actions = translator.inputActionFromLayout(newLayout, currentLayout) + for(const auto& x : actions){ + app_list.setAciton(req_num, x) + } - if(!surface_id_tmp && !layer_id_tmp){ - reply("invalid window manager client"); - HMI_DEBUG("appid:%s, requested_role:%s, surfaceID:%d in layer %d", - appid, role, surface_id_tmp, layer_id_tmp); - } */ + or - /* - * Do allocate tasks - */ - this->do_allocate_window_resource(new_req); + translator.inputActionFromLayout(newLayout, currentLayout, &app_list, req_num); - if (!surface_id) + /* 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) { - reply("Surface does not exist"); - return; + is_activate = false; } + WMError ret = app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); + app_list.req_dump(); - if (!this->controller->surface_exists(*surface_id)) + if (ret != WMError::SUCCESS) { - reply("Surface does not exist in controller!"); - return; + HMI_SEQ_ERROR(req_num, "Failed to set action"); + return ret; } - auto layer_id = this->layers.get_layer_id(*surface_id); + // layer manager task + bool sync_draw_happen = false; + for (const auto &y : app_list.getActions(req_num)) + { + /* + do_task(y); + */ + /* TODO + but current we can't do do_task, + so divide the processing into lm_layout_change and lm_release + */ + if (y.visible) + { + sync_draw_happen = true; + ret = lm_layout_change(y); + if (ret != WMError::SUCCESS) + { + 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); + break; + // TODO: if transition fails, what should we do? + } + /* app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */ + } + 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); + break; + // TODO: if transition fails, what should we do? + } + /* app_list.lookUpClient(y.appid)->emit_invisible(y.role, y.area); */ + } + } - if (!layer_id) + if (ret != WMError::SUCCESS) { - reply("Surface is not on any layer!"); - return; + //this->emit_error(request_seq, 0 /*error_num*/, "error happens"); // test } - - auto o_state = *this->layers.get_layout_state(*surface_id); - - if (o_state == nullptr) + else if (sync_draw_happen) { - reply("Could not find layer for surface"); - return; + this->set_timer(); } + else + { + app_list.removeRequest(req_num); // HACK!!! + } + return ret; +} - HMI_DEBUG("wm", "surface %d is detected", *surface_id); - reply(nullptr); - +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); + auto o_state = *this->layers.get_layout_state(*surface_id); struct LayoutState &state = *o_state; // disable layers that are above our current layer @@ -678,107 +806,153 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char } } -void App::api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply) +const char *App::check_surface_exist(const char *drawing_name) { - ST(); auto const &surface_id = this->lookup_id(drawing_name); + if (!surface_id) + { + //reply("Surface does not exist"); + return "Surface does not exist"; + } + + if (!this->controller->surface_exists(*surface_id)) + { + //reply("Surface does not exist in controller!"); + return "Surface does not exist in controller!"; + } + + auto layer_id = this->layers.get_layer_id(*surface_id); + + if (!layer_id) + { + //reply("Surface is not on any layer!"); + return "Surface is not on any layer!"; + } + + auto o_state = *this->layers.get_layout_state(*surface_id); + + if (o_state == nullptr) + { + //reply("Could not find layer for surface"); + return "Could not find layer for surface"; + } + + HMI_DEBUG("wm", "surface %d is detected", *surface_id); + return nullptr; + //reply(nullptr); +} + +void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply) +{ + ST(); + + /* + * Check Phase + */ std::string id = appid; + std::string role = drawing_name; + std::string area = drawing_area; - if(app_list.contains(id)){ + if (app_list.contains(id) != WMError::SUCCESS) + { reply("app doesn't request 'requestSurface' yet"); return; } + auto client = app_list.lookUpClient(id); - if (!surface_id) + /* + * Queueing Phase + */ + unsigned current = app_list.currentSequenceNumber(); + unsigned requested_num = app_list.getSequenceNumber(id); + if (requested_num != 0) { - reply("Surface does not exist"); + HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", id.c_str(), role.c_str(), area.c_str()); + reply("already requested"); return; } - if (*surface_id == this->layers.main_surface) - { - reply("Cannot deactivate main_surface"); - return; - } + WMRequest req = WMRequest(id, role, area, Task::TASK_ALLOCATE); + unsigned new_req = app_list.addAllocateRequest(req); + app_list.req_dump(); - auto o_state = *this->layers.get_layout_state(*surface_id); + HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str()); - if (o_state == nullptr) + reply(nullptr); + if (new_req != current) { - reply("Could not find layer for surface"); + // Add request, then invoked after the previous task is finished + HMI_SEQ_DEBUG(new_req, "request is accepted"); return; } - struct LayoutState &state = *o_state; + /* + * Do allocate tasks + */ + WMError ret = this->do_transition(new_req); - if (state.main == -1) + if (ret != WMError::SUCCESS) { - reply("No surface active"); - return; + HMI_SEQ_ERROR(new_req, errorDescription(ret)); + //this->emit_error() } +} - // Check against main_surface, main_surface_name is the configuration item. - if (*surface_id == this->layers.main_surface) +void App::api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply) +{ + ST(); + + /* + * Check Phase + */ + std::string id = appid; + std::string role = drawing_name; + std::string area = ""; //drawing_area; + + if (app_list.contains(id) != WMError::SUCCESS) { - HMI_DEBUG("wm", "Refusing to deactivate main_surface %d", *surface_id); - reply(nullptr); + reply("app doesn't request 'requestSurface' yet"); return; } - if ((state.main == *surface_id) && (state.sub == *surface_id)) + auto client = app_list.lookUpClient(id); + + /* + * Queueing Phase + */ + unsigned current = app_list.currentSequenceNumber(); + unsigned requested_num = app_list.getSequenceNumber(id); + if (requested_num != 0) { - reply("Surface is not active"); + HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", id.c_str(), role.c_str(), area.c_str()); + reply("already requested"); return; } - reply(nullptr); - if (state.main == *surface_id) - { - if (state.sub != -1) - { - this->try_layout( - state, LayoutState{state.sub, -1}, [&](LayoutState const &nl) { - std::string sub = std::move(*this->lookup_name(state.sub)); + WMRequest req = WMRequest(id, role, area, Task::TASK_RELEASE); + unsigned new_req = app_list.addAllocateRequest(req); + app_list.req_dump(); - this->deactivate(*surface_id); - this->surface_set_layout(state.sub); - state = nl; + HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str()); - this->layout_commit(); - std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - compositor::rect area_rect = this->area_info[state.sub]; - this->emit_syncdraw(sub.c_str(), str_area.c_str(), - area_rect.x, area_rect.y, area_rect.w, area_rect.h); - this->enqueue_flushdraw(state.sub); - }); - } - else - { - this->try_layout(state, LayoutState{-1, -1}, [&](LayoutState const &nl) { - this->deactivate(*surface_id); - state = nl; - this->layout_commit(); - }); - } - } - else if (state.sub == *surface_id) + reply(nullptr); + if (new_req != current) { - this->try_layout( - state, LayoutState{state.main, -1}, [&](LayoutState const &nl) { - std::string main = std::move(*this->lookup_name(state.main)); + // Add request, then invoked after the previous task is finished + HMI_SEQ_DEBUG(new_req, "request is accepted"); + return; + } - this->deactivate(*surface_id); - this->surface_set_layout(state.main); - state = nl; + /* + * Do allocate tasks + */ + WMError ret = this->do_transition(new_req); - this->layout_commit(); - std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); - compositor::rect area_rect = this->area_info[state.main]; - this->emit_syncdraw(main.c_str(), str_area.c_str(), - area_rect.x, area_rect.y, area_rect.w, area_rect.h); - this->enqueue_flushdraw(state.main); - }); + if (ret != WMError::SUCCESS) + { + HMI_SEQ_ERROR(new_req, errorDescription(ret)); + //this->emit_error() } } @@ -805,25 +979,51 @@ void App::check_flushdraw(int surface_id) } } -void App::do_enddraw(unsigned sequence_number) +void App::lm_enddraw(const char *drawing_name) { - HMI_SEQ_INFO(sequence_number, "do endDraw"); - do + HMI_DEBUG("wm", "end draw %s", drawing_name); + for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++) + { + auto n = this->lookup_name(this->pending_end_draw[i]); + if (n && *n == drawing_name) + { + std::swap(this->pending_end_draw[i], this->pending_end_draw[iend - 1]); + this->pending_end_draw.resize(iend - 1); + this->activate(this->pending_end_draw[i]); + this->emit_flushdraw(drawing_name); + } + } +} + +void App::do_enddraw(unsigned request_seq) +{ + // get actions + auto actions = app_list.getActions(request_seq); + HMI_SEQ_INFO(request_seq, "do endDraw"); + + for (const auto &act : actions) { - // make visible application - } while (!app_list.requestFinished()); + HMI_SEQ_DEBUG(request_seq, "visible %s", act.role.c_str()); + this->lm_enddraw(act.role.c_str()); + } - HMI_SEQ_INFO(sequence_number, "emit flushDraw"); - do + HMI_SEQ_INFO(request_seq, "emit flushDraw"); + /* do { // emit flush Draw //emitFlushDrawToAll(&app_list, request_seq); // emit status change event - } while (!app_list.requestFinished()); + } while (!app_list.requestFinished());*/ } void App::process_request() { + unsigned req = app_list.currentSequenceNumber(); + HMI_SEQ_DEBUG(req, "Do next request"); + 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) @@ -832,6 +1032,7 @@ void App::api_enddraw(char const *appid, char const *drawing_name) std::string role(drawing_name); unsigned current_seq = app_list.currentSequenceNumber(); bool result = app_list.setEndDrawFinished(current_seq, id, role); + if (!result) { HMI_ERROR("wm", "%s doesn't have Window Resource", id.c_str()); @@ -841,9 +1042,13 @@ void App::api_enddraw(char const *appid, char const *drawing_name) if (app_list.endDrawFullfilled(current_seq)) { // do task for endDraw + //this->stop_timer(); this->do_enddraw(current_seq); + + this->stop_timer(); + app_list.removeRequest(current_seq); - HMI_SEQ_INFO(current_seq, "Finish sequence"); + HMI_SEQ_INFO(current_seq, "Finish request"); app_list.next(); if (app_list.haveRequest()) { @@ -855,17 +1060,6 @@ void App::api_enddraw(char const *appid, char const *drawing_name) HMI_SEQ_INFO(current_seq, "Wait other App call endDraw"); return; } - for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++) - { - auto n = this->lookup_name(this->pending_end_draw[i]); - if (n && *n == drawing_name) - { - std::swap(this->pending_end_draw[i], this->pending_end_draw[iend - 1]); - this->pending_end_draw.resize(iend - 1); - this->activate(this->pending_end_draw[i]); - this->emit_flushdraw(drawing_name); - } - } } void App::api_ping() { this->dispatch_pending_events(); } @@ -932,34 +1126,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); + app_list.removeSurface(surface_id); } void App::emit_activated(char const *label) @@ -1028,7 +1207,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, role); + app_list.addClient(appid_str, *lid, id, role); return Ok(id); }