From f7e7f34a9fa1e865ea9ea1923a807f5e8374d644 Mon Sep 17 00:00:00 2001 From: asanoaozora Date: Thu, 1 Mar 2018 16:49:46 +0100 Subject: update the CommonAPI based POC for POI --- src/navigation/run | 22 ++++++++++----------- src/poi-service/poi-manager-server/CMakeLists.txt | 8 +++++++- .../poi-manager-server/poi-manager-server-stub.h | 1 + src/poi-service/resource/poi-database-managed.db | Bin 36864 -> 36864 bytes src/speech/CMakeLists.txt | 2 -- test/poi-service/poi-manager-client/CMakeLists.txt | 7 ++++++- test/poi-service/poi-manager-client/main.cpp | 14 +++++++++++-- 7 files changed, 36 insertions(+), 18 deletions(-) diff --git a/src/navigation/run b/src/navigation/run index 1430da5..cc73686 100755 --- a/src/navigation/run +++ b/src/navigation/run @@ -85,8 +85,9 @@ function terminate gdb=0 xterm=0 log=0 -enhpos=1 -replayer=1 +enhpos=1 #enhanced position server enabled +replayer=0 #replayer disabled +repl="" verbose=0 #no debug or log messages displayed center="4612 N 0608 E" poi=0 @@ -108,7 +109,7 @@ poidatabase=$POI_SERVER_RESOURCE_DIR/empty.db # empty poi database by default SPEECH_SERVER=speech-server SPEECH_OUTPUT_BIN_DIR=$CUR_DIR/../../src/speech-service/bin/ -while getopts c:ghnoprsvx opt +while getopts c:ghnopr:svx opt do case $opt in c) @@ -143,8 +144,9 @@ do p) poi=1 ;; - r) - replayer=0 + r) #enable the log replayer and set the file + replayer=1 + repl=$(readlink -f $OPTARG) ;; s) speech=1 @@ -157,12 +159,12 @@ do ;; h) echo "Usage:" - echo "$0 [-c center][-gnoprsvxh]" + echo "$0 [-c center][-r replayerfile][-gnopsvxh]" echo "-c: Set center (supported values: paris,tokyo,seoul,longitude,latitude). Default is geneve" echo "-g: Run subprocesses within gdb (only with -x)" echo "-h: This help" echo "-n: Don't start enhanced-position-service" - echo "-r: Don't start replayer" + echo "-r: Start replayer" echo "-o: Create log file of subprocess output" echo "-p: Launch the poi server" echo "-s: Launch the speech server" @@ -186,11 +188,7 @@ then if [ "$replayer" = 1 ] then - if [ -z "$REPLAYER_LOG_FILE" ] - then - REPLAYER_LOG_FILE=$LOGREPLAYER_LOGS_DIR/geneve-cologny.log - fi - run LogReplayer ./log-replayer $REPLAYER_LOG_FILE + run "Log Replayer" $LOG_REPLAYER_BIN_DIR/$LOG_REPLAYER $repl fi fi diff --git a/src/poi-service/poi-manager-server/CMakeLists.txt b/src/poi-service/poi-manager-server/CMakeLists.txt index 8f56712..20c30fc 100644 --- a/src/poi-service/poi-manager-server/CMakeLists.txt +++ b/src/poi-service/poi-manager-server/CMakeLists.txt @@ -58,11 +58,14 @@ add_subdirectory(${FRANCA_DIR}/navigation/poiservice "${CMAKE_CURRENT_BINARY_DIR # Path to the generated files set(API_VERSION_NAVIGATION_MAJOR 4) set(API_VERSION_NAVIGATION "v${API_VERSION_NAVIGATION_MAJOR}") -set(API_VERSION_POISERVICE_MAJOR 2) +set(API_VERSION_POISERVICE_MAJOR 3) set(API_VERSION_POISERVICE "v${API_VERSION_POISERVICE_MAJOR}") +set(API_VERSION_POISERVICE_CAM_MAJOR 2) +set(API_VERSION_POISERVICE_CAM "v${API_VERSION_POISERVICE_CAM_MAJOR}") set(PRJ_SRC_GEN_COMMON_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi) #files shared by all the APIs set(PRJ_SRC_GEN_NAVIGATION_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi/navigation) #files shared by the navigation APIs set(PRJ_SRC_GEN_POISERVICE_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_POISERVICE}/org/genivi/navigation/poiservice) #files shared by the poiservice APIs +set(PRJ_SRC_GEN_POISERVICE_CAM_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_POISERVICE_CAM}/org/genivi/navigation/poiservice) #files shared by the poiservice CAM APIs # Source Files FILE(GLOB PRJ_LOCAL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) @@ -71,11 +74,13 @@ FILE(GLOB PRJ_STUB_GEN_SRCS ${PRJ_SRC_GEN_COMMON_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*Types.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*StubDefault.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*Types.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*StubDefault.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*Types.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*StubDefault.cpp + ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*Types.cpp ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*StubDefault.cpp ) FILE(GLOB PRJ_STUB_IMPL_SRCS ${PRJ_SRC_GEN_COMMON_PATH}/*Stub*.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*Stub*.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*Stub*.cpp + ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*Stub*.cpp ) set(PRJ_SRCS ${PRJ_LOCAL_SRCS} ${PRJ_COMMON_SRCS} ${PRJ_STUB_GEN_SRCS} ${PRJ_STUB_IMPL_SRCS}) @@ -86,6 +91,7 @@ include_directories( ${PRJ_SRC_GEN_COMMON_PATH} ${PRJ_SRC_GEN_NAVIGATION_PATH} ${PRJ_SRC_GEN_POISERVICE_PATH} + ${PRJ_SRC_GEN_POISERVICE_CAM_PATH} ${DBUS_INCLUDE_DIRS} ${COMMONAPI_INCLUDE_DIRS} ${COMMONAPI_DBUS_INCLUDE_DIRS} diff --git a/src/poi-service/poi-manager-server/poi-manager-server-stub.h b/src/poi-service/poi-manager-server/poi-manager-server-stub.h index 62bee90..5497802 100644 --- a/src/poi-service/poi-manager-server/poi-manager-server-stub.h +++ b/src/poi-service/poi-manager-server/poi-manager-server-stub.h @@ -42,6 +42,7 @@ using namespace std; using namespace v2::org::genivi::navigation::poiservice; +using namespace v3::org::genivi::navigation::poiservice; using namespace v4::org::genivi::navigation; using namespace v4::org::genivi; diff --git a/src/poi-service/resource/poi-database-managed.db b/src/poi-service/resource/poi-database-managed.db index 0e7b022..4e5e5d1 100644 Binary files a/src/poi-service/resource/poi-database-managed.db and b/src/poi-service/resource/poi-database-managed.db differ diff --git a/src/speech/CMakeLists.txt b/src/speech/CMakeLists.txt index 27f578b..d7cc022 100644 --- a/src/speech/CMakeLists.txt +++ b/src/speech/CMakeLists.txt @@ -40,8 +40,6 @@ endif() # Packages find_package(PkgConfig REQUIRED) -find_package(CommonAPI) -find_package(CommonAPI) #pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above) pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5") diff --git a/test/poi-service/poi-manager-client/CMakeLists.txt b/test/poi-service/poi-manager-client/CMakeLists.txt index 101bfb6..573a0ef 100644 --- a/test/poi-service/poi-manager-client/CMakeLists.txt +++ b/test/poi-service/poi-manager-client/CMakeLists.txt @@ -62,11 +62,14 @@ add_subdirectory(${FRANCA_DIR}/navigation/poiservice "${CMAKE_CURRENT_BINARY_DIR # Path to the generated files set(API_VERSION_NAVIGATION_MAJOR 4) set(API_VERSION_NAVIGATION "v${API_VERSION_NAVIGATION_MAJOR}") -set(API_VERSION_POISERVICE_MAJOR 2) +set(API_VERSION_POISERVICE_MAJOR 3) set(API_VERSION_POISERVICE "v${API_VERSION_POISERVICE_MAJOR}") +set(API_VERSION_POISERVICE_CAM_MAJOR 2) +set(API_VERSION_POISERVICE_CAM "v${API_VERSION_POISERVICE_CAM_MAJOR}") set(PRJ_SRC_GEN_COMMON_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi) set(PRJ_SRC_GEN_NAVIGATION_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi/navigation) #files shared by the navigation APIs set(PRJ_SRC_GEN_POISERVICE_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_POISERVICE}/org/genivi/navigation/poiservice) #files shared by the poiservice APIs +set(PRJ_SRC_GEN_POISERVICE_CAM_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_POISERVICE_CAM}/org/genivi/navigation/poiservice) #files shared by the poiservice CAM APIs # Source Files FILE(GLOB PRJ_LOCAL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) @@ -74,6 +77,7 @@ FILE(GLOB PRJ_PROXY_GEN_SRCS ${PRJ_SRC_GEN_COMMON_PATH}/*DBusProxy.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*Types.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusProxy.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*Types.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*DBusProxy.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*Types.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*DBusDeployment.cpp + ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*DBusProxy*.cpp ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*Types.cpp ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*StubDefault.cpp ) set(PRJ_SRCS ${PRJ_LOCAL_SRCS} ${PRJ_PROXY_GEN_SRCS}) @@ -83,6 +87,7 @@ include_directories( ${PRJ_SRC_GEN_COMMON_PATH} ${PRJ_SRC_GEN_NAVIGATION_PATH} ${PRJ_SRC_GEN_POISERVICE_PATH} + ${PRJ_SRC_GEN_POISERVICE_CAM_PATH} ${DBUS_INCLUDE_DIRS} ${COMMONAPI_INCLUDE_DIRS} ${COMMONAPI_DBUS_INCLUDE_DIRS} diff --git a/test/poi-service/poi-manager-client/main.cpp b/test/poi-service/poi-manager-client/main.cpp index 6ace120..b655074 100644 --- a/test/poi-service/poi-manager-client/main.cpp +++ b/test/poi-service/poi-manager-client/main.cpp @@ -49,9 +49,14 @@ using namespace std; using namespace v2::org::genivi::navigation::poiservice; +using namespace v3::org::genivi::navigation::poiservice; using namespace v4::org::genivi::navigation; using namespace v4::org::genivi; +#define REGISTER_COUNTER 10 +#define REGISTER_SLEEP 50 +static std::shared_ptr < CommonAPI::Runtime > runtime; + // class contentManager class contentManager { @@ -584,7 +589,8 @@ int main(int argc , char** argv ) // so we can use std::cout with UTF-8, via Glib::ustring, without exceptions. std::locale::global(std::locale("")); - std::shared_ptr < CommonAPI::Runtime > runtime = CommonAPI::Runtime::get(); + runtime = CommonAPI::Runtime::get(); + uint8_t counter=0; const std::string domain = "local"; const std::string instance = "POIContentAccessModuleService"; @@ -594,7 +600,11 @@ int main(int argc , char** argv ) runtime->buildProxy(domain,instance); while (!myProxy->isAvailable()) { - usleep(10); + if(++counter>REGISTER_COUNTER){ + std::cout << "unable to build proxy: "<< instance << std::endl; + return EXIT_FAILURE; + } + std::this_thread::sleep_for(std::chrono::milliseconds(REGISTER_SLEEP)); } //index used for argument analysis -- cgit v1.2.1