clientmanager: Do not check for running applications

[apps/agl-service-homescreen.git] / src / hs-clientmanager.cpp

diff --git a/src/hs-clientmanager.cpp b/src/hs-clientmanager.cpp
index beac816..7d1407e 100644 (file)
--- a/src/hs-clientmanager.cpp
+++ b/src/hs-clientmanager.cpp
@@ -17,6 +17,8 @@
 
 #include <cstring>
 #include <algorithm>
+#include <cassert>
+#include "hs-proxy.h"
 #include "hs-clientmanager.h"
 
 static const char _homescreen[] = "homescreen";
@@ -94,9 +96,10 @@ HS_ClientCtxt* HS_ClientManager::createClientCtxt(afb_req_t req, std::string app
         ctxt = new HS_ClientCtxt(appid);
         afb_req_session_set_LOA(req, 1);
         afb_req_context_set(req, ctxt, cbRemoveClientCtxt);
+
+       appid2ctxt[appid] = ctxt;
     }
 
-    appid2ctxt[appid] = ctxt;
     return ctxt;
 }
 
@@ -157,6 +160,35 @@ void HS_ClientManager::removeClientCtxt(void *data)
     appid2ctxt.erase(ctxt->id);
 }
 
+static int
+is_application_running(std::string appid, std::unordered_map<std::string, HS_Client*> client_list)
+{
+    bool app_still_running = false;
+
+    std::string id(appid);
+    auto ip = client_list.find(id);
+
+    // this will always be case as the removeClientCtxt() is never called as
+    // clients do not handle the subscribe at all at this point. Not only that
+    // but is redudant but we keep at as it to highlight the fact that we're
+    // missing a feature to check if applications died or not (legitimate or not).
+    //
+    // Using ps (HS_AfmMainProxy::ps -- a sync version of checking if running
+    // applications) seem to block in afm-system-daemon (see SPEC-3902), and
+    // doing w/ it with an async version of ps doesn't work because we don't
+    // have a valid clientCtx (required, and only possible if the application
+    // subscribed themselves, which no longer happens)
+    //
+    // FIXME: We need another way of handling this would be necessary to correctly
+    // handle the case where the app died.
+    if (ip != client_list.end()) {
+        app_still_running = true;
+    }
+
+    // > 0 means err
+    return app_still_running != true;
+}
+
 /**
  * handle homescreen request
  *
@@ -183,8 +215,21 @@ int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const c
     else {
         std::string id(appid);
         auto ip = client_list.find(id);
-        if(ip != client_list.end()) {
-           // FIXME: do another verification here in case the application died
+       if(ip != client_list.end()) {
+           // for showWindow verb we need to verify if the app is (still)
+           // running, and return the appropriate value to attempt to start it
+           // again. This 'problem' is avoided if the application itself
+           // subscribes and with that process, to install a callback that
+           // automatically removes the application from client_list.
+           // That is exactly how "subscribe" verb is handled below.
+            if (strcasecmp(verb, "showWindow") == 0) {
+                ret = is_application_running(id, client_list);
+                if (ret == AFB_REQ_NOT_STARTED_APPLICATION) {
+                    AFB_INFO("%s is not running. Will attempt to start it", appid);
+                    return ret;
+                }
+            }
+            AFB_INFO("%s found to be running. Forwarding request to the client", appid);
             ret = ip->second->handleRequest(request, verb);
         }
         else {