X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapplist.cpp;h=d0082dd2887819305c1532e29e668597ab119268;hb=1476fb12566dd8d7de9c598bb0ac78e454f52d11;hp=7c554e938083f413b59d5f9223ac055296f7f907;hpb=dfe4aee045113eceaeabd327291f94583e7b13d3;p=apps%2Fagl-service-windowmanager.git diff --git a/src/applist.cpp b/src/applist.cpp index 7c554e9..d0082dd 100644 --- a/src/applist.cpp +++ b/src/applist.cpp @@ -20,7 +20,6 @@ using std::shared_ptr; using std::string; -using std::unique_ptr; using std::vector; namespace wm @@ -28,8 +27,8 @@ namespace wm AppList::AppList() : req_list(0), - client_list(0), - current_seq(1) + app2client(0), + current_req(1) { } @@ -38,19 +37,39 @@ AppList::~AppList() {} void AppList::addClient(const string &appid, const string &role) { shared_ptr client = std::make_shared(appid, role); - client_list[appid] = client; - client_dump(); + this->app2client[appid] = client; + this->clientDump(); +} + +void AppList::addClient(const std::string &appid, unsigned layer, unsigned surface, const std::string &role) +{ + shared_ptr client = std::make_shared(appid, layer, surface, role); + this->app2client[appid] = client; + this->clientDump(); } void AppList::removeClient(const string &appid) { - client_list.erase(appid); + this->app2client.erase(appid); } -bool AppList::contains(const string &appid) +bool AppList::contains(const string &appid) const { - auto result = client_list.find(appid); - return (client_list.end() != result) ? true : false; + auto result = this->app2client.find(appid); + return (this->app2client.end() != result) ? true : false; +} + +void AppList::removeSurface(unsigned surface_id){ + // This function may be very slow + bool ret = false; + for (auto &x : this->app2client) + { + 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()); + break; + } + } } /** @@ -61,28 +80,28 @@ bool AppList::contains(const string &appid) */ shared_ptr AppList::lookUpClient(const string &appid) { - return client_list.at(appid); + return this->app2client.at(appid); } -int AppList::countClient() +int AppList::countClient() const { - return client_list.size(); + return this->app2client.size(); } -unsigned AppList::currentSequenceNumber() +unsigned AppList::currentRequestNumber() const { - return current_seq; + return this->current_req; } // Is this function necessary ? -unsigned AppList::getSequenceNumber(const string &appid) +unsigned AppList::getRequestNumber(const string &appid) const { - for (const auto &x : req_list) + for (const auto &x : this->req_list) { // Since app will not request twice and more, comparing appid is enough? if ((x.trigger.appid == appid)) { - return x.seq_num; + return x.req_num; } } return 0; @@ -90,91 +109,104 @@ unsigned AppList::getSequenceNumber(const string &appid) unsigned AppList::addAllocateRequest(WMRequest req) { - if (req_list.size() == 0) + if (this->req_list.size() == 0) { - req.seq_num = current_seq; + req.req_num = current_req; } else { - HMI_SEQ_DEBUG(current_seq, "real: %d", req_list.back().seq_num + 1); - req.seq_num = req_list.back().seq_num + 1; + HMI_SEQ_DEBUG(this->current_req, "add: %d", this->req_list.back().req_num + 1); + req.req_num = this->req_list.back().req_num + 1; } - req_list.push_back(req); - return req.seq_num; // return 1; if you test time_expire -} - -bool AppList::requestFinished() -{ - return req_list.empty(); + this->req_list.push_back(req); + return req.req_num; // return 1; if you test time_expire } -struct WMTrigger AppList::getRequest(unsigned req_num) +struct WMTrigger AppList::getRequest(unsigned req_num, bool *found) { - for (auto &x : req_list) + *found = false; + for (const auto &x : this->req_list) { - if (req_num == x.seq_num) + if (req_num == x.req_num) { + *found = true; return x.trigger; } } + return WMTrigger{"", "", "", Task::TASK_INVALID}; } -const vector &AppList::getActions(unsigned req_num) +const vector &AppList::getActions(unsigned req_num, bool* found) { - for (auto &x : req_list) + *found = false; + for (auto &x : this->req_list) { - if (req_num == x.seq_num) + if (req_num == x.req_num) { + *found = true; return x.sync_draw_req; } } } -bool AppList::setAction(unsigned req_num, const struct WMAction &action) +WMError AppList::setAction(unsigned req_num, const struct WMAction &action) { - bool result = false; - for (auto &x : req_list) + WMError result = WMError::FAIL; + for (auto &x : this->req_list) { - if (req_num != x.seq_num) + if (req_num != x.req_num) { continue; } x.sync_draw_req.push_back(action); - result = true; + result = WMError::SUCCESS; break; } return result; } -bool AppList::setAction(unsigned req_num, const string &appid, const string &role, const string &area, bool visible) +/** + * Note: + * This function set action with parameters. + * if visible is true, it means app should be visible, so enddraw_finished parameter should be false. + * otherwise (visible is false) app should be invisible. Then enddraw_finished param is set to true. + * This function doesn't support actions for focus yet. + */ +WMError AppList::setAction(unsigned req_num, const string &appid, const string &role, const string &area, bool visible) { - bool result = false; + WMError result = WMError::NOT_REGISTERED; for (auto &x : req_list) { - if (req_num != x.seq_num) + if (req_num != x.req_num) { continue; } - WMAction action{appid, role, area, visible, false}; + bool edraw_f = (visible) ? false : true; + WMAction action{appid, role, area, visible, edraw_f}; x.sync_draw_req.push_back(action); - result = true; + result = WMError::SUCCESS; break; } return result; } +/** + * This function checks + * * req_num is equal to current request number + * * appid and role are equeal to the appid and role stored in action list(sync_draw_req) + */ bool AppList::setEndDrawFinished(unsigned req_num, const string &appid, const string &role) { bool result = false; for (auto &x : req_list) { - if (req_num < x.seq_num) + if (req_num < x.req_num) { break; } - if (req_num == x.seq_num) + if (req_num == x.req_num) { for (auto &y : x.sync_draw_req) { @@ -186,13 +218,13 @@ bool AppList::setEndDrawFinished(unsigned req_num, const string &appid, const st } } } - req_dump(); + this->reqDump(); return result; } /** * @brief check all actions of the requested sequence is finished - * @param unsigned sequence_num + * @param unsigned request_number * @return true if all action is set. */ bool AppList::endDrawFullfilled(unsigned req_num) @@ -200,11 +232,11 @@ bool AppList::endDrawFullfilled(unsigned req_num) bool result = false; for (const auto &x : req_list) { - if (req_num < x.seq_num) + if (req_num < x.req_num) { break; } - if (req_num == x.seq_num) + if (req_num == x.req_num) { result = true; for (const auto &y : x.sync_draw_req) @@ -220,46 +252,46 @@ bool AppList::endDrawFullfilled(unsigned req_num) return result; } -void AppList::removeRequest(unsigned req_seq) +void AppList::removeRequest(unsigned req_num) { - req_list.erase(remove_if(req_list.begin(), req_list.end(), - [req_seq](WMRequest x) { - return x.seq_num == req_seq; - })); + this->req_list.erase(remove_if(this->req_list.begin(), this->req_list.end(), + [req_num](WMRequest x) { + return x.req_num == req_num; + })); } void AppList::next() { - ++this->current_seq; - if (0 == this->current_seq) + ++this->current_req; + if (0 == this->current_req) { - this->current_seq = 1; + this->current_req = 1; } } -bool AppList::haveRequest() +bool AppList::haveRequest() const { - return !req_list.empty(); + return !this->req_list.empty(); } -void AppList::client_dump() +void AppList::clientDump() { DUMP("======= client dump ====="); - for (const auto &x : client_list) + for (const auto &x : this->app2client) { const auto &y = x.second; - DUMP("APPID : %s", y->appID().c_str()); + y->dumpInfo(); } DUMP("======= client dump end====="); } -void AppList::req_dump() +void AppList::reqDump() { DUMP("======= req dump ====="); - DUMP("current request : %d", current_seq); + DUMP("current request : %d", current_req); for (const auto &x : req_list) { - DUMP("requested with : %d", x.seq_num); + DUMP("requested with : %d", x.req_num); DUMP("Trigger : (APPID :%s, ROLE :%s, AREA :%s, TASK: %d)", x.trigger.appid.c_str(), x.trigger.role.c_str(),