namespace wm
{
+const static int kReserveClientSize = 100;
+const static int kReserveReqSize = 10;
+
AppList::AppList()
- : req_list(0),
- app2client(0),
+ : req_list(),
+ app2client(),
current_req(1)
{
+ app2client.reserve(kReserveClientSize);
+ req_list.reserve(kReserveReqSize);
}
AppList::~AppList() {}
void AppList::addClient(const string &appid, const string &role)
{
+ std::lock_guard<std::mutex> lock(mtx);
shared_ptr<WMClient> client = std::make_shared<WMClient>(appid, role);
this->app2client[appid] = client;
this->clientDump();
void AppList::addClient(const std::string &appid, unsigned layer, unsigned surface, const std::string &role)
{
+ std::lock_guard<std::mutex> lock(mtx);
shared_ptr<WMClient> client = std::make_shared<WMClient>(appid, layer, surface, role);
this->app2client[appid] = client;
this->clientDump();
void AppList::removeClient(const string &appid)
{
+ std::lock_guard<std::mutex> lock(mtx);
this->app2client.erase(appid);
+ HMI_INFO("wm", "Remove client %s", appid.c_str());
}
-bool AppList::contains(const string &appid)
+bool AppList::contains(const string &appid) const
{
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
+ std::lock_guard<std::mutex> lock(mtx);
bool ret = false;
for (auto &x : this->app2client)
{
break;
}
}
+
}
/**
return this->app2client.at(appid);
}
-int AppList::countClient()
+int AppList::countClient() const
{
return this->app2client.size();
}
-unsigned AppList::currentSequenceNumber()
+unsigned AppList::currentRequestNumber() const
{
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 : 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;
unsigned AppList::addAllocateRequest(WMRequest req)
{
+ std::lock_guard<std::mutex> lock(mtx);
if (this->req_list.size() == 0)
{
- req.seq_num = current_req;
+ req.req_num = current_req;
}
else
{
- HMI_SEQ_DEBUG(this->current_req, "add: %d", this->req_list.back().seq_num + 1);
- req.seq_num = this->req_list.back().seq_num + 1;
+ HMI_SEQ_INFO(this->current_req, "add: %d", this->req_list.back().req_num + 1);
+ req.req_num = this->req_list.back().req_num + 1;
}
this->req_list.push_back(req);
- return req.seq_num; // return 1; if you test time_expire
+ return req.req_num;
}
-bool AppList::requestFinished()
+struct WMTrigger AppList::getRequest(unsigned req_num, bool *found)
{
- return this->req_list.empty();
-}
-
-struct WMTrigger AppList::getRequest(unsigned req_num)
-{
- for (auto &x : this->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;
}
}
+ HMI_SEQ_ERROR(req_num, "Couldn't get request : %d", req_num);
+ return WMTrigger{"", "", "", Task::TASK_INVALID};
}
-const vector<struct WMAction> &AppList::getActions(unsigned req_num)
+const vector<struct WMAction> &AppList::getActions(unsigned req_num, bool* found)
{
+ *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;
}
}
+ HMI_SEQ_ERROR(req_num, "Couldn't get action with the request : %d", req_num);
}
-bool AppList::setAction(unsigned req_num, const struct WMAction &action)
+WMError AppList::setAction(unsigned req_num, const struct WMAction &action)
{
- bool result = false;
+ std::lock_guard<std::mutex> lock(mtx);
+ 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;
+ std::lock_guard<std::mutex> lock(mtx);
+ WMError result = WMError::NOT_REGISTERED;
for (auto &x : req_list)
{
- if (req_num != x.seq_num)
+ if (req_num != x.req_num)
{
continue;
}
- bool edraw_f = 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)
{
+ std::lock_guard<std::mutex> lock(mtx);
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)
{
/**
* @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)
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)
return result;
}
-void AppList::removeRequest(unsigned req_seq)
+void AppList::removeRequest(unsigned req_num)
{
+ std::lock_guard<std::mutex> lock(mtx);
this->req_list.erase(remove_if(this->req_list.begin(), this->req_list.end(),
- [req_seq](WMRequest x) {
- return x.seq_num == req_seq;
+ [req_num](WMRequest x) {
+ return x.req_num == req_num;
}));
}
void AppList::next()
{
+ std::lock_guard<std::mutex> lock(mtx);
++this->current_req;
if (0 == this->current_req)
{
}
}
-bool AppList::haveRequest()
+bool AppList::haveRequest() const
{
return !this->req_list.empty();
}
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(),
Code Review / apps / agl-service-windowmanager.git / blobdiff