Merge branch 'sandbox/knimitz/format_code' into sandbox/knimitz/lock

Change-Id: Ifbd46e0156ab5baf93fbb785f4fdfda963ed2af4
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

1 files changed, 67 insertions, 60 deletions

diff --git a/src/applist.cpp b/src/applist.cpp
index 6b608d0..9b06c84 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,32 +37,32 @@ AppList::~AppList() {}
 void AppList::addClient(const string &appid, const string &role)
 {
     shared_ptr<WMClient> client = std::make_shared<WMClient>(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<WMClient> client = std::make_shared<WMClient>(appid, layer, surface, role);
-    client_list[appid] = client;
-    client_dump();
+    this->app2client[appid] = client;
+    this->clientDump();
 }
 
 void AppList::removeClient(const string &appid)
 {
-    client_list.erase(appid);
+    this->app2client.erase(appid);
 }
 
-WMError AppList::contains(const string &appid)
+bool AppList::contains(const string &appid) const
 {
-    auto result = client_list.find(appid);
-    return (client_list.end() != result) ? WMError::SUCCESS : WMError::NOT_REGISTERED;
+    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 : client_list)
+    for (auto &x : this->app2client)
     {
         ret = x.second->removeSurfaceIfExist(surface_id);
         if(ret){
@@ -81,28 +80,28 @@ void AppList::removeSurface(unsigned surface_id){
  */
 shared_ptr<WMClient> 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;
@@ -110,29 +109,24 @@ 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)
 {
-    for (auto &x : req_list)
+    for (const auto &x : this->req_list)
     {
-        if (req_num == x.seq_num)
+        if (req_num == x.req_num)
         {
             return x.trigger;
         }
@@ -141,9 +135,9 @@ struct WMTrigger AppList::getRequest(unsigned req_num)
 
 const vector<struct WMAction> &AppList::getActions(unsigned req_num)
 {
-    for (auto &x : req_list)
+    for (auto &x : this->req_list)
     {
-        if (req_num == x.seq_num)
+        if (req_num == x.req_num)
         {
             return x.sync_draw_req;
         }
@@ -153,9 +147,9 @@ const vector<struct WMAction> &AppList::getActions(unsigned req_num)
 WMError AppList::setAction(unsigned req_num, const struct WMAction &action)
 {
     WMError result = WMError::FAIL;
-    for (auto &x : req_list)
+    for (auto &x : this->req_list)
     {
-        if (req_num != x.seq_num)
+        if (req_num != x.req_num)
         {
             continue;
         }
@@ -167,16 +161,24 @@ WMError AppList::setAction(unsigned req_num, const struct WMAction &action)
     return result;
 }
 
+/**
+ * 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)
 {
     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 = WMError::SUCCESS;
@@ -185,16 +187,21 @@ WMError AppList::setAction(unsigned req_num, const string &appid, const string &
     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)
             {
@@ -206,13 +213,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)
@@ -220,11 +227,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)
@@ -240,32 +247,32 @@ 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;
         y->dumpInfo();
@@ -273,13 +280,13 @@ void AppList::client_dump()
     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(),