X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fhs-clientmanager.cpp;h=7d1407e16b24eec3884cb08fe583ae0ba89d19d6;hb=refs%2Ftags%2Fmarlin_12.90.0;hp=8735c2ea935a0afe24325828303f4480193216fc;hpb=211769e800f3a57de55b3774de82af55d2a0160a;p=apps%2Fagl-service-homescreen.git diff --git a/src/hs-clientmanager.cpp b/src/hs-clientmanager.cpp index 8735c2e..7d1407e 100644 --- a/src/hs-clientmanager.cpp +++ b/src/hs-clientmanager.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018 TOYOTA MOTOR CORPORATION + * Copyright (C) 2020 Konsulko Group * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,9 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#include #include +#include +#include "hs-proxy.h" #include "hs-clientmanager.h" -#include "hmi-debug.h" static const char _homescreen[] = "homescreen"; @@ -70,7 +74,7 @@ HS_ClientManager* HS_ClientManager::instance(void) */ int HS_ClientManager::init(void) { - HMI_NOTICE("homescreen-service","called."); + return 0; } /** @@ -88,11 +92,14 @@ HS_ClientCtxt* HS_ClientManager::createClientCtxt(afb_req_t req, std::string app HS_ClientCtxt *ctxt = (HS_ClientCtxt *)afb_req_context_get(req); if (!ctxt) { - HMI_NOTICE("homescreen-service", "create new session for %s", appid.c_str()); - HS_ClientCtxt *ctxt = new HS_ClientCtxt(appid.c_str()); + AFB_INFO( "create new session for %s", appid.c_str()); + ctxt = new HS_ClientCtxt(appid); afb_req_session_set_LOA(req, 1); afb_req_context_set(req, ctxt, cbRemoveClientCtxt); + + appid2ctxt[appid] = ctxt; } + return ctxt; } @@ -142,17 +149,46 @@ void HS_ClientManager::removeClientCtxt(void *data) HS_ClientCtxt *ctxt = (HS_ClientCtxt *)data; if(ctxt == nullptr) { - HMI_ERROR("homescreen-service", "data is nullptr"); + AFB_WARNING( "data is nullptr"); return; } - HMI_NOTICE("homescreen-service", "remove app %s", ctxt->id.c_str()); + AFB_INFO( "remove app %s", ctxt->id.c_str()); std::lock_guard lock(this->mtx); removeClient(ctxt->id); delete appid2ctxt[ctxt->id]; appid2ctxt.erase(ctxt->id); } +static int +is_application_running(std::string appid, std::unordered_map 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 * @@ -168,7 +204,7 @@ void HS_ClientManager::removeClientCtxt(void *data) */ int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const char *appid) { - HMI_NOTICE("homescreen-service","verb=[%s],appid=[%s].", verb, appid); + AFB_INFO("verb=[%s],appid=[%s].", verb, appid); int ret = 0; std::lock_guard lock(this->mtx); if(appid == nullptr) { @@ -177,18 +213,33 @@ int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const c } } else { - auto ip = client_list.find(std::string(appid)); - if(ip != client_list.end()) { + std::string id(appid); + auto ip = client_list.find(id); + 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 { if(!strcasecmp(verb, "subscribe")) { - appid2ctxt[appid] = createClientCtxt(request, appid); - HS_Client* client = addClient(request, appid); + createClientCtxt(request, id); + HS_Client* client = addClient(request, id); ret = client->handleRequest(request, "subscribe"); } else { - HMI_NOTICE("homescreen-service","not exist session"); + AFB_NOTICE("not exist session"); ret = AFB_REQ_NOT_STARTED_APPLICATION; } } @@ -212,7 +263,7 @@ int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const c int HS_ClientManager::pushEvent(const char *event, struct json_object *param, std::string appid) { if(event == nullptr) { - HMI_ERROR("homescreen-service","event name is null."); + AFB_WARNING("event name is null."); return -1; } @@ -230,4 +281,4 @@ int HS_ClientManager::pushEvent(const char *event, struct json_object *param, st } return 0; -} \ No newline at end of file +}