/*
* 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.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+#include <cstring>
#include <algorithm>
+#include <cassert>
+#include "hs-proxy.h"
#include "hs-clientmanager.h"
-#include "hmi-debug.h"
static const char _homescreen[] = "homescreen";
*/
int HS_ClientManager::init(void)
{
- HMI_NOTICE("homescreen-service","called.");
+ return 0;
}
/**
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;
}
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<std::mutex> 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<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
*
*/
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<std::mutex> lock(this->mtx);
if(appid == nullptr) {
}
}
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;
}
}
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;
}
}
return 0;
-}
\ No newline at end of file
+}
Code Review / apps / agl-service-homescreen.git / blobdiff