X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapplist.hpp;h=86c9903d8bf42f953ac7c47370f8a1a78fe5aaea;hb=8dc87df23208334c261d94306d619a2aadfbdf4b;hp=241f153a44cee5a8fdaf4e2b00635e299c3328ad;hpb=0602a4156ef549a2a229ba32b141f508230b43ad;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/applist.hpp b/src/applist.hpp
index 241f153..86c9903 100644
--- a/src/applist.hpp
+++ b/src/applist.hpp
@@ -20,9 +20,10 @@
 #include <string>
 #include <map>
 #include <memory>
-//#include <experimental/optional>
-#include "wm-client.hpp"
+#include <mutex>
+#include "wm_client.hpp"
 #include "request.hpp"
+#include "wm_error.hpp"
 
 namespace wm
 {
@@ -38,40 +39,40 @@ class AppList
     AppList(const AppList &obj) = delete;
 
     // Client Database Interface
-    void addClient(const std::string &appid, const std::string &role);
+    /* TODO: consider, which is better WMClient as parameter or not
+       If the WMClient should be more flexible, I think this param should be WMClient class
+    */
     void addClient(const std::string &appid, unsigned layer, unsigned surface, const std::string &role);
     void removeClient(const std::string &appid);
-    bool contains(const std::string &appid);
-    int  countClient();
+    bool contains(const std::string &appid) const;
+    int  countClient() const;
     std::shared_ptr<WMClient> lookUpClient(const std::string &appid);
     void removeSurface(unsigned surface);
+    std::string getAppID(unsigned surface, const std::string &role, bool *found) const;
 
     // Request Interface
-    unsigned currentSequenceNumber();
-    unsigned getSequenceNumber(const std::string &appid);
-    unsigned addAllocateRequest(WMRequest req);
-    /* TODO: consider, which is better WMClient or std::string appid?
-    if appid is key to manage resources, it is better to select std::string
-    otherwise WMClient is better, IMO */
-    bool requestFinished();
-    bool setAction(unsigned req_num, const struct WMAction &action);
-    bool setAction(unsigned req_num, const std::string &appid, const std::string &role, const std::string &area, bool visible = true);
+    unsigned currentRequestNumber() const;
+    unsigned getRequestNumber(const std::string &appid) const;
+    unsigned addRequest(WMRequest req);
+    WMError setAction(unsigned req_num, const struct WMAction &action);
+    WMError setAction(unsigned req_num, const std::string &appid, const std::string &role, const std::string &area, TaskVisible visible);
     bool setEndDrawFinished(unsigned req_num, const std::string &appid, const std::string &role);
     bool endDrawFullfilled(unsigned req_num);
     void removeRequest(unsigned req_num);
     void next();
-    bool haveRequest();
+    bool haveRequest() const;
 
-    struct WMTrigger getRequest(unsigned req_num);
-    const std::vector<struct WMAction> &getActions(unsigned req_num);
+    struct WMTrigger getRequest(unsigned req_num, bool* found);
+    const std::vector<struct WMAction> &getActions(unsigned req_num, bool* found);
 
-    void client_dump();
-    void req_dump();
+    void clientDump();
+    void reqDump();
 
   private:
     std::vector<WMRequest> req_list;
-    std::unordered_map<std::string, std::shared_ptr<WMClient>> client_list;
-    unsigned current_seq;
+    std::unordered_map<std::string, std::shared_ptr<WMClient>> app2client;
+    unsigned current_req;
+    std::mutex mtx;
 };
 
 } // namespace wm