From 89edd734c0a347dafceba1cef1ac835e0fe61e1a Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 26 May 2020 17:49:50 -0400 Subject: Fix CMake files and non-debug crashes Changes include: - Reworked src/CMakeLists.txt to use app template macros. - Removed now unnecessary linker script, symbol exports are handled in the app template macros. - Set missing required entries in conf.d/cmake/config.cmake, and update to match latest template version in cmake-apps-module, as well as some naming fixes in the PROJECT* definitions. - Move project definition to top-level CMakeLists.txt to make tracking conf.d/cmake/config.cmake changes easier. This quiets the warning from newer versions of CMake about needing a project definition in the top-level CMakeLists.txt. - Moved icon file to default location for app template. - Added config.xml.in file to work with app template, replacing previous hard-coded version. - Fixed some issues in src/hs-clientmanager.{h,cpp} to address crashes seen in the release widget now that it is actually built without debug flags, and to quiet some warnings. Bug-AGL: SPEC-3343 Signed-off-by: Scott Murray Change-Id: I3741e6a307297272d5c22e894dfa9ff8b0dd1f52 --- src/hs-clientmanager.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/hs-clientmanager.cpp') diff --git a/src/hs-clientmanager.cpp b/src/hs-clientmanager.cpp index 6e6397f..9b62808 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. @@ -71,6 +72,7 @@ HS_ClientManager* HS_ClientManager::instance(void) */ int HS_ClientManager::init(void) { + return 0; } /** @@ -89,7 +91,7 @@ HS_ClientCtxt* HS_ClientManager::createClientCtxt(afb_req_t req, std::string app if (!ctxt) { AFB_INFO( "create new session for %s", appid.c_str()); - HS_ClientCtxt *ctxt = new HS_ClientCtxt(appid.c_str()); + ctxt = new HS_ClientCtxt(appid); afb_req_session_set_LOA(req, 1); afb_req_context_set(req, ctxt, cbRemoveClientCtxt); } @@ -177,14 +179,15 @@ int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const c } } else { - auto ip = client_list.find(std::string(appid)); + std::string id(appid); + auto ip = client_list.find(id); if(ip != client_list.end()) { ret = ip->second->handleRequest(request, verb); } else { if(!strcasecmp(verb, "subscribe")) { - appid2ctxt[appid] = createClientCtxt(request, appid); - HS_Client* client = addClient(request, appid); + appid2ctxt[id] = createClientCtxt(request, id); + HS_Client* client = addClient(request, id); ret = client->handleRequest(request, "subscribe"); } else { @@ -230,4 +233,4 @@ int HS_ClientManager::pushEvent(const char *event, struct json_object *param, st } return 0; -} \ No newline at end of file +} -- cgit 1.2.3-korg