diff options
Diffstat (limited to 'AudioManagerDaemon')
76 files changed, 605 insertions, 3770 deletions
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index e9c5696..d9718e5 100644 --- a/AudioManagerDaemon/CMakeLists.txt +++ b/AudioManagerDaemon/CMakeLists.txt @@ -7,48 +7,57 @@ # # copyright # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +# Mozilla Public License, v. 2.0. if a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AudioManagerDeamon) - -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic") -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g") +project (AudioManagerDeamon) set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/AudioManager) + +set(AM_MAP_CAPACITY 10 + CACHE INTEGER "Number of preallocations for datastorage") + +set(AM_MAX_CONNECTIONS 0x1000 + CACHE INTEGER "Number of max connections before rollover") + +set(AM_MAX_CONNECTIONS SHRT_MAX + CACHE INTEGER "Number of max Mainconnections before rollover") + set(INCLUDE_FOLDER "include") -IF (WITH_DATABASE_STORAGE) +if (WITH_DATABASE_STORAGE) pkg_check_modules(SQLITE REQUIRED sqlite3) -ENDIF (WITH_DATABASE_STORAGE) +endif (WITH_DATABASE_STORAGE) -IF (WITH_SYSTEMD_WATCHDOG) +if (WITH_SYSTEMD_WATCHDOG) pkg_check_modules(SYSTEMD libsystemd-daemon>=44) - IF (SYSTEMD_FOUND) + if (SYSTEMD_FOUND) message(STATUS "Found libsystemd-daemon, version: ${SYSTEMD_VERSION}") - ELSE (SYSTEMD_FOUND) + else (SYSTEMD_FOUND) message(STATUS "Did not find libsystemd-daemon, using own lib") - ENDIF(SYSTEMD_FOUND) -ENDIF (WITH_SYSTEMD_WATCHDOG) + endif(SYSTEMD_FOUND) +endif (WITH_SYSTEMD_WATCHDOG) -IF(WITH_DBUS_WRAPPER) - FIND_PACKAGE(DBUS REQUIRED) -ENDIF(WITH_DBUS_WRAPPER) +if(WITH_DBUS_WRAPPER) + find_package(DBUS REQUIRED) +endif(WITH_DBUS_WRAPPER) -FIND_PACKAGE(NSM REQUIRED) +if(WITH_CAPI_WRAPPER) + find_package(CommonAPI REQUIRED) +endif(WITH_CAPI_WRAPPER) -IF(WITH_CAPI_WRAPPER) - FIND_PACKAGE(CommonAPI REQUIRED) -ENDIF(WITH_CAPI_WRAPPER) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) -SET(AUDIOMAN_SRCS_CXX +set(AUDIOMAN_SRCS_CXX src/main.cpp src/CAmCommandReceiver.cpp src/CAmCommandSender.cpp @@ -58,242 +67,142 @@ SET(AUDIOMAN_SRCS_CXX src/CAmRoutingReceiver.cpp src/CAmRoutingSender.cpp src/CAmRouter.cpp - src/CAmSocketHandler.cpp - src/CAmDltWrapper.cpp src/CAmLog.cpp -) - - -# Preallocation variable for the map. -IF(NOT WITH_DATABASE_STORAGE ) - - IF(NOT DEFINED AM_MAP_CAPACITY) - set (AM_MAP_CAPACITY 10) - ENDIF(NOT DEFINED AM_MAP_CAPACITY) - add_definitions( -DAM_MAP_CAPACITY=${AM_MAP_CAPACITY} ) + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp") - IF(NOT DEFINED AM_MAX_CONNECTIONS) - set (AM_MAX_CONNECTIONS 0x1000) - ENDIF(NOT DEFINED AM_MAX_CONNECTIONS) - add_definitions( -DAM_MAX_CONNECTIONS=${AM_MAX_CONNECTIONS} ) - - IF(NOT DEFINED AM_MAX_MAIN_CONNECTIONS) - set (AM_MAX_MAIN_CONNECTIONS SHRT_MAX) - ENDIF(NOT DEFINED AM_MAX_MAIN_CONNECTIONS) - add_definitions( -DAM_MAX_MAIN_CONNECTIONS=${AM_MAX_MAIN_CONNECTIONS} ) - -ENDIF(NOT WITH_DATABASE_STORAGE) - -IF(WITH_TELNET) - SET (AUDIOMAN_SRCS_CXX +if(WITH_TELNET) + set (AUDIOMAN_SRCS_CXX ${AUDIOMAN_SRCS_CXX} src/CAmTelnetServer.cpp - src/CAmTelnetMenuHelper.cpp - ) -ENDIF(WITH_TELNET) + src/CAmTelnetMenuHelper.cpp) +endif(WITH_TELNET) -IF(WITH_SYSTEMD_WATCHDOG) - SET (AUDIOMAN_SRCS_CXX +if(WITH_SYSTEMD_WATCHDOG) + set (AUDIOMAN_SRCS_CXX ${AUDIOMAN_SRCS_CXX} - src/CAmWatchdog.cpp - ) -ENDIF(WITH_SYSTEMD_WATCHDOG) - -IF (NOT SYSTEMD_FOUND) - SET (AUDIOMAN_SRCS_CXX + src/CAmWatchdog.cpp) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${SYSTEMD_LIBRARIES) +endif(WITH_SYSTEMD_WATCHDOG) + +if (NOT SYSTEMD_FOUND) + set (AUDIOMAN_SRCS_CXX ${AUDIOMAN_SRCS_CXX} - src/sd-daemon.c - ) -ENDIF (NOT SYSTEMD_FOUND) + src/sd-daemon.c) +endif (NOT SYSTEMD_FOUND) -IF(WITH_DBUS_WRAPPER) - SET (AUDIOMAN_SRCS_CXX +if(WITH_DBUS_WRAPPER) + set (AUDIOMAN_SRCS_CXX ${AUDIOMAN_SRCS_CXX} - src/CAmDbusWrapper.cpp - ) -ENDIF(WITH_DBUS_WRAPPER) - -IF(WITH_CAPI_WRAPPER) - SET (AUDIOMAN_SRCS_CXX + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDbusWrapper.cpp") + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DBUS_LIBRARY}) +endif(WITH_DBUS_WRAPPER) + +if(WITH_CAPI_WRAPPER) + set (AUDIOMAN_SRCS_CXX ${AUDIOMAN_SRCS_CXX} - src/CAmCommonAPIWrapper.cpp - ) -ENDIF(WITH_CAPI_WRAPPER) + "${AUDIOMANAGER_UTILITIES_SRC}/CAmCommonAPIWrapper.cpp") + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DBUS_LIBRARY} + ${COMMON_API_LIBRARIES} + ${COMMON_API_DBUS_LIBRARIES}) +endif(WITH_CAPI_WRAPPER) -IF(WITH_NSM) - IF(WITH_DBUS_WRAPPER) - SET (AUDIOMAN_SRCS_CXX +if(WITH_NSM) + if(WITH_DBUS_WRAPPER) + set (AUDIOMAN_SRCS_CXX ${AUDIOMAN_SRCS_CXX} - src/CAmNodeStateCommunicatorDBus.cpp - ) - ELSE(WITH_DBUS_WRAPPER) - SET (AUDIOMAN_SRCS_CXX + src/CAmNodeStateCommunicatorDBus.cpp) + else(WITH_DBUS_WRAPPER) + set (AUDIOMAN_SRCS_CXX ${AUDIOMAN_SRCS_CXX} - src/CAmNodeStateCommunicatorCAPI.cpp - ) - ENDIF(WITH_DBUS_WRAPPER) -ENDIF(WITH_NSM) + src/CAmNodeStateCommunicatorCAPI.cpp) + endif(WITH_DBUS_WRAPPER) +endif(WITH_NSM) -IF(WITH_DATABASE_STORAGE) - SET (AUDIOMAN_SRCS_CXX +if(WITH_DATABASE_STORAGE) + set (AUDIOMAN_SRCS_CXX ${AUDIOMAN_SRCS_CXX} - src/CAmDatabaseHandlerSQLite.cpp - ) -ELSE(WITH_DATABASE_STORAGE) - SET (AUDIOMAN_SRCS_CXX + src/CAmDatabaseHandlerSQLite.cpp) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${SQLITE_LIBRARIES}) +else(WITH_DATABASE_STORAGE) + set (AUDIOMAN_SRCS_CXX ${AUDIOMAN_SRCS_CXX} - src/CAmDatabaseHandlerMap.cpp - ) -ENDIF(WITH_DATABASE_STORAGE) + src/CAmDatabaseHandlerMap.cpp) +endif(WITH_DATABASE_STORAGE) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${PROJECT_INCLUDE_FOLDER} + ${AUDIOMANAGER_INCLUDE_FOLDER} + ${AUDIOMANAGER_UTILITIES_INCLUDE} ${INCLUDE_FOLDER} ${NSM_INCLUDE_DIR} ) -IF(WITH_CAPI_WRAPPER) - -IF(WITH_NSM) -# Find the common-api sources. -# The sources can be placed in the build directory (DESTINATION) or in the source tree (ALT_DESTINATION). -# The ALT_DESTINATION is used as fall back if the DESTINATION directory dosen't contain the sources or you just don't want to use the generator. -INCLUDE(CommonAPIGenerator) -COMMON_API_GENERATE_SOUCRES(TARGET COMMON_API - FIDLS fidls/NodeStateManager.fdepl # a list with fidls +if(WITH_CAPI_WRAPPER) + + if(WITH_NSM) + include (CommonAPIGenerator) + COMMON_API_GENERATE_SOUCRES(TARGET COMMON_API + FIDLS fidls/NodeStateManager.fidl # a list with fidls DESTINATION src-gen # a relative path to the build directory or an absolute path ALT_DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/src-gen # an alternative relative/absolute path with common-api sources, usually in the source tree DBUS) -ENDIF(WITH_NSM) - -INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} - ${COMMON_API_INCLUDE_DIRS} - ${COMMON_API_DBUS_INCLUDE_DIRS} - ${COMMON_API_GEN_INCLUDE_DIR} -) -ENDIF(WITH_CAPI_WRAPPER) - -IF(WITH_DLT) -INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} - ${DLT_INCLUDE_DIRS} -) -ENDIF(WITH_DLT) - -IF(WITH_DBUS_WRAPPER) -INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} + set(AUDIOMAN_SRCS_CXX + ${AUDIOMAN_SRCS_CXX} + ${COMMON_API_GEN_SOURCES}) + endif(WITH_NSM) + + INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} + ${COMMON_API_INCLUDE_DIRS} + ${COMMON_API_DBUS_INCLUDE_DIRS} + ${COMMON_API_GEN_INCLUDE_DIR}) + +endif(WITH_CAPI_WRAPPER) + +if(WITH_DLT) + INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) + +if(WITH_DBUS_WRAPPER) + INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_DIR} -) -ENDIF(WITH_DBUS_WRAPPER) - -file(GLOB ${AUDIOMAN_SRCS_CXX} ${COMMON_API_GEN_SOURCES}) - -ADD_EXECUTABLE(AudioManager ${AUDIOMAN_SRCS_CXX} ${COMMON_API_GEN_SOURCES}) - -TARGET_LINK_LIBRARIES(AudioManager - ${SQLITE_LIBRARIES} - ${CMAKE_DL_LIBS} - ) - - IF(WITH_DBUS_WRAPPER) - TARGET_LINK_LIBRARIES(AudioManager - ${DBUS_LIBRARY} - rt - ) -ELSEIF(WITH_CAPI_WRAPPER) - TARGET_LINK_LIBRARIES(AudioManager - ${COMMON_API_LIBRARIES} - ${COMMON_API_DBUS_LIBRARIES} - rt - ) -ENDIF() - -IF(WITH_DLT) - TARGET_LINK_LIBRARIES(AudioManager - ${DLT_LIBRARIES} - ) -ENDIF(WITH_DLT) - -IF (SYSTEMD_FOUND) - TARGET_LINK_LIBRARIES(AudioManager - ${SYSTEMD_LIBRARIES} - ) -ENDIF (SYSTEMD_FOUND) - -IF(WITH_CAPI_WRAPPER) - IF(WITH_NSM) - INSERT_DBUS_CONF_IF_NEEDED("@NSM_DBUS_CONF@" - "${CMAKE_SOURCE_DIR}/AudioManagerDaemon/fidls/NodeStateManager_dbus.conf" - NSM_DBUS_CONF) - ENDIF(WITH_NSM) -# Generates the dbus configuration file. Every component is responsible to append it dbus configuration part. -CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/fidls/AudioManager_dbus.conf.in ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/fidls/AudioManager_dbus.conf) -CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/fidls/AudioManager_dbus.conf.in ${CMAKE_BINARY_DIR}/AudioManager_dbus.conf) - -ENDIF(WITH_CAPI_WRAPPER) + ${DBUS_INCLUDE_DIR}) +endif(WITH_DBUS_WRAPPER) + +ADD_EXECUTABLE(AudioManager ${AUDIOMAN_SRCS_CXX}) +TARGET_LINK_LIBRARIES(AudioManager ${AM_LINK_LIBS}) INSTALL(TARGETS AudioManager - RUNTIME - DESTINATION bin + RUNTIME DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT bin -) + COMPONENT bin) INSTALL(DIRECTORY "${AUDIO_INCLUDE_FOLDER}/" - DESTINATION include - COMPONENT dev -) + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX} + COMPONENT dev) -IF(WITH_NSM) - IF(USE_BUILD_LIBS) - SET(NSM_INTROSPECTION_FILE ${EXECUTABLE_OUTPUT_PATH}/LifeCycleConsumer.xml) - execute_process( - COMMAND mkdir -p "${CMAKE_SOURCE_DIR}/bin" - COMMAND cp "${CMAKE_SOURCE_DIR}/cmake/LifecycleConsumer.xml" ${NSM_INTROSPECTION_FILE} - COMMAND cp "${CMAKE_BINARY_DIR}/AudioManager_dbus.conf" ${EXECUTABLE_OUTPUT_PATH}) - ELSE(USE_BUILD_LIBS) - SET(NSM_INTROSPECTION_FILE ${AM_SHARE_FOLDER}/LifecycleConsumer.xml) - INSTALL( - FILES ${CMAKE_SOURCE_DIR}/cmake/LifecycleConsumer.xml #${CMAKE_BINARY_DIR}/AudioManager_dbus.conf - DESTINATION "${NSM_INTROSPECTION_FILE}" - COMPONENT bin) - ENDIF(USE_BUILD_LIBS) -ENDIF(WITH_NSM) - -CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/config.cmake ${CMAKE_SOURCE_DIR}/include/config.h ) - -IF(WITH_TESTS) - add_subdirectory (test) -ENDIF(WITH_TESTS) - -# General packet dependency -IF(WITH_DATABASE_STORAGE) - SET(ADD_DEPEND_BIN_PROP "sqlite3(>=3.6.22)") -ENDIF(WITH_DATABASE_STORAGE) - -# Optional packet dependency -IF(WITH_DLT) - SET(ADD_DEPEND_BIN_PROP ${ADD_DEPEND_BIN_PROP} "dlt") -ENDIF(WITH_DLT) - -IF(WITH_DBUS_WRAPPER) - SET(ADD_DEPEND_BIN_PROP ${ADD_DEPEND_BIN_PROP} "libdbus-1-3(>=1.2.16)") -ENDIF(WITH_DBUS_WRAPPER) +INSTALL(DIRECTORY "${AUDIOMANAGER_UTILITIES_INCLUDE}/" + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX} + COMPONENT dev) -# Additional Dev packet dependency -SET(ADD_DEPEND_DEV_PROP "audiomanager-bin" ${ADD_DEPEND_BIN_PROP}) - -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-common -fno-strict-aliasing -DNDEBUG") - -MESSAGE(STATUS "bin packet dependency: ${ADD_DEPEND_BIN_PROP}") -MESSAGE(STATUS "dev dependency: ${ADD_DEPEND_DEV_PROP}") - -set_property(GLOBAL APPEND PROPERTY bin_prop "${ADD_DEPEND_BIN_PROP}") -set_property(GLOBAL APPEND PROPERTY dev_prop "${ADD_DEPEND_DEV_PROP}") +if(WITH_TESTS) + add_subdirectory (test) +endif(WITH_TESTS) diff --git a/AudioManagerDaemon/docx/Doxyfile.in b/AudioManagerDaemon/docx/Doxyfile.in index a17e7c6..5f04e05 100644 --- a/AudioManagerDaemon/docx/Doxyfile.in +++ b/AudioManagerDaemon/docx/Doxyfile.in @@ -6,7 +6,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = AudioManager PROJECT_NUMBER = @DAEMONVERSION@ -OUTPUT_DIRECTORY = @CMAKE_SOURCE_DIR@/doc +OUTPUT_DIRECTORY = @DOC_OUTPUT_PATH@ CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES @@ -93,7 +93,7 @@ FILE_PATTERNS = *.h *.cpp *.dox RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = */test/* */Plugin*DBus*/* */PluginControl*/* */build*/* */cmake/* */exampleCode/* */googleMock/* */ProjectSpecific/* +EXCLUDE_PATTERNS = */test/* */build*/* */cmake/* */googleMock/* EXCLUDE_SYMBOLS = EXAMPLE_PATH = @CMAKE_SOURCE_DIR@ EXAMPLE_PATTERNS = diff --git a/AudioManagerDaemon/fidls/AudioManagerTypes.fidl b/AudioManagerDaemon/fidls/AudioManagerTypes.fidl deleted file mode 100644 index 956b400..0000000 --- a/AudioManagerDaemon/fidls/AudioManagerTypes.fidl +++ /dev/null @@ -1,1287 +0,0 @@ -package org.genivi
-
-<**
- @author : Christian Linke -**>
-typeCollection am {
- version { - major 2 - minor 0 - } - array am_MainConnection_L of am_MainConnectionType_s -
- array am_SinkClass_L of am_SinkClass_s -
- array am_SinkType_L of am_SinkType_s -
- array am_SourceClass_L of am_SourceClass_s -
- array am_SourceType_L of am_SourceType_s -
- array am_SystemProperty_L of am_SystemProperty_s -
- array am_ClassProperty_L of am_ClassProperty_s -
- array am_ConnectionID_L of am_connectionID_t -
- array am_EarlyData_L of am_EarlyData_s -
- array am_MainSoundProperty_L of am_MainSoundProperty_s -
- array am_NotificationConfiguration_L of am_NotificationConfiguration_s -
- array am_RoutingElement_L of am_RoutingElement_s -
- array am_SoundProperty_L of am_SoundProperty_s -
- array am_Volumes_L of am_Volumes_s -
- array am_ConnectionFormat_L of am_CustomConnectionFormat_t -
- array am_Convertion_L of am_bool_t -
- <** - @description : a source ID - **> - typedef am_sourceID_t is UInt16 - typedef am_bool_t is Boolean -
- <** - @description : a domain ID - **> - typedef am_domainID_t is UInt16 -
- <** - @description : a gateway ID - **> - typedef am_gatewayID_t is UInt16
-
- <**
- @description : a converter ID
- **>
- typedef am_converterID_t is UInt16 -
- <** - @description : a connection ID - **> - typedef am_connectionID_t is UInt16 -
- <** - @description : a crossfader ID - **> - typedef am_crossfaderID_t is UInt16 -
- <** - @description : a mainConnection ID - **> - typedef am_mainConnectionID_t is UInt16 -
- <** - @description : This is the volume presented on the command interface. It is in the duty of the Controller to change the volumes given here into meaningful values on the routing interface. -The range of this type is customer specific.
- **> - typedef am_mainVolume_t is Int16 - - <** - @description : The unit is 0.1 db steps,The smallest value -3000 (=AM_MUTE). The minimum and maximum can be limited by actual project. - **> - typedef am_volume_t is Int16 - - <** - @description : time in ms! - **> - typedef am_time_t is Int16 - - <** - @description : offset time that is introduced in milli seconds. - **> - typedef am_timeSync_t is Int16 - typedef am_sourceClass_t is UInt16 - - <** - @description : speed - **> - typedef am_speed_t is UInt16 - typedef am_sinkClass_t is UInt16 - - <** - @description : a sink ID - **> - typedef am_sinkID_t is UInt16 - - <** - @description : This project specific value classifies the format in which data is exchanged within a connection. - **> - typedef am_CustomConnectionFormat_t is UInt16 - - <** - @description : This project specific value gives the information about reason for reason for Source/Sink change - **> - typedef am_CustomAvailabilityReason_t is UInt16 - - <** - @description : product specific identifier of property - **> - typedef am_CustomClassProperty_t is UInt16 - - <** - @description : For products, different ramp types can be defined here. -It is in the responsibility of the product to make sure that the routing plugins are aware of the ramp types used.
- **> - typedef am_CustomRampType_t is UInt16 - - <** - @description : Project specific sound properties. - **> - typedef am_CustomSoundPropertyType_t is UInt16 - - <** - @description : Here are all SoundProperties that can be set via the CommandInterface. Product specific - **> - typedef am_CustomMainSoundPropertyType_t is UInt16 - - <** - @description : describes the different system properties. Project specific - **> - typedef am_CustomSystemPropertyType_t is UInt16 - - <** - @description : gives the type of the Notification. - **> - typedef am_CustomNotificationType_t is UInt16 - - <** - @description : with the help of this enum, sinks and sources can report their availability state - **> - enumeration am_Availability_e { - - <** - @description : default - **> - A_UNKNOWN = "0" - - <** - @description : The source / sink is available - **> - A_AVAILABLE = "1" - - <** - @description : the source / sink is not available - **> - A_UNAVAILABLE = "2" - A_MAX - } - - <** - @description : describes the active sink of a crossfader. - **> - enumeration am_HotSink_e { - - <** - @description : default - **> - HS_UNKNOWN = "0" - - <** - @description : sinkA is active - **> - HS_SINKA = "1" - - <** - @description : sinkB is active - **> - HS_SINKB = "2" - - <** - @description : the crossfader is in the transition state - **> - HS_INTERMEDIATE = "3" - HS_MAX - } - - <** - @description : represents the connection state - **> - enumeration am_ConnectionState_e { - CS_UNKNOWN = "0" - - <** - @description : This means the connection is just building up - **> - CS_CONNECTING = "1" - - <** - @description : the connection is ready to be used - **> - CS_CONNECTED = "2" - - <** - @description : the connection is in the course to be knocked down - **> - CS_DISCONNECTING = "3" - - <** - @description : only relevant for connectionStatechanged. Is send after the connection was removed - **> - CS_DISCONNECTED = "4" - - <** - @description : this means the connection is still build up but unused at the moment - **> - CS_SUSPENDED = "5" - CS_MAX - } - - enumeration am_DomainState_e { - - <** - @description : default - **> - DS_UNKNOWN = "0" - - <** - @description : the domain is controlled by the daemon - **> - DS_CONTROLLED = "1" - - <** - @description : the domain is independent starting up - **> - DS_INDEPENDENT_STARTUP = "1" - - <** - @description : the domain is independent running down - **> - DS_INDEPENDENT_RUNDOWN = "2" - DS_MAX - } - - <** - @description : This enum characterizes the data of the EarlyData_t - **> - enumeration am_EarlyDataType_e { - - <** - @description : default - **> - ES_UNKNOWN = "0" - - <** - @description : the source volume - **> - ED_SOURCE_VOLUME = "1" - - <** - @description : the sink volume - **> - ED_SINK_VOLUME = "2" - - <** - @description : a source property - **> - ED_SOURCE_PROPERTY = "3" - - <** - @description : a sink property - **> - ED_SINK_PROPERTY = "4" - ED_MAX - } - - <** - @description : the errors of the audiomanager. All possible errors are in here. This enum is used widely as return parameter. - **> - enumeration am_Error_e { - - <** - @description : no error - positive reply - **> - E_OK = "0" - - <** - @description : default - **> - E_UNKNOWN = "1" - - <** - @description : value out of range - **> - E_OUT_OF_RANGE = "2" - - <** - @description : not used - **> - E_NOT_USED = "3" - - <** - @description : a database error occurred - **> - E_DATABASE_ERROR = "4" - - <** - @description : the desired object already exists - **> - E_ALREADY_EXISTS = "5" - - <** - @description : there is no change - **> - E_NO_CHANGE = "6" - - <** - @description : the desired action is not possible - **> - E_NOT_POSSIBLE = "7" - - <** - @description : the desired object is non existent - **> - E_NON_EXISTENT = "8" - - <** - @description : the asynchronous action was aborted - **> - E_ABORTED = "9" - - <** - @description : This error is returned in case a connect is issued with a connectionFormat that cannot be selected for the connection. This could be either due to the capabilities of a source or a sink or gateway compatibilities for example - **> - E_WRONG_FORMAT = "10" - E_MAX - } - - enumeration am_MuteState_e { - - <** - @description : default - **> - MS_UNKNOWN = "0" - - <** - @description : the source / sink is muted - **> - MS_MUTED = "1" - - <** - @description : the source / sink is unmuted - **> - MS_UNMUTED = "2" - MS_MAX - } - - enumeration am_InterruptState_e { - - <** - @description : default - **> - IS_UNKNOWN = "0" - - <** - @description : the interrupt state is off - no interrupt - **> - IS_OFF = "1" - - <** - @description : the interrupt state is interrupted - the interrupt is active - **> - IS_INTERRUPTED = "2" - IS_MAX - } - - <** - @description : This datatype determines if a sourceID or a sinkID is used in the union following - **> - enumeration am_VolumeType_e { - VT_UNKNOWN = "0" - - <** - @description : the following type is a sink - **> - VT_SINK = "1" - - <** - @description : the following type is a source - **> - VT_SOURCE = "2" - VT_MAX - } - - enumeration am_NotificationStatus_e { - NS_UNKNOWN = "0" - - <** - @description : No notification, the function is turned off - **> - NS_OFF = "1" - - <** - @description : Periodic notifications are sent out. The period in ms is given by am_NotificationParameter - **> - NS_PERIODIC = "2" - - <** - @description : The notification is sent out when the minimum given by am_NotificationParameter is reached. - **> - NS_MINIMUM = "3" - - <** - @description : The notification is sent out when the maximum given by am_NotificationParameter is reached. - **> - NS_MAXIMUM = "4" - - <** - @description : The notification is sent out when a change happened. The Resolution of the change is defined by am_NotificationParameter. - **> - NS_CHANGE_ = "5" - NS_MAX - } - - <** - @description : This enumeration is used to define the type of the action that is correlated to a handle. - **> - enumeration am_Handle_e { - H_UNKNOWN = "0" - H_CONNECT = "1" - H_DISCONNECT = "2" - H_SETSOURCESTATE = "3" - H_SETSINKVOLUME = "4" - H_SETSOURCEVOLUME = "5" - H_SETSINKSOUNDPROPERTY = "6" - H_SETSOURCESOUNDPROPERTY = "7" - H_SETSINKSOUNDPROPERTIES = "8" - H_SETSOURCESOUNDPROPERTIES = "9" - H_CROSSFADE = "10" - H_SETVOLUMES = "11" - H_SETSINKNOTIFICATION = "12" - H_SETSOURCENOTIFICATION = "13" - H_MAX - } - - <** - @description : The source state reflects the state of the source - **> - enumeration am_SourceState_e { - SS_UNKNNOWN = "0" - - <** - @description : The source can be activly heared - **> - SS_ON = "1" - - <** - @description : The source cannot be heared - **> - SS_OFF = "2" - - <** - @description : The source is paused. Meaning it cannot be heared but should be prepared to play again soon. - **> - SS_PAUSED = "3" - SS_MAX - } - - <** - @description : This enum describes the ready state of the routing part - **> - enumeration am_RoutingReady_e { - RR_UNKNOWN = "0" - RR_READY = "1" - RR_RUNDOWN = "2" - } - - <** - @description : a list of routing elements that lead from source to sink - **> - struct am_Route_s { - - <** - @description : the sourceID where the route starts - **> - am_sourceID_t sourceID - - <** - @description : the sinkID where the route ends - **> - am_sinkID_t sinkID - - <** - @description : the actual route as list of routing elements - **> - am_RoutingElement_L route - } - - <** - @description : this describes the availability of a sink or a source together with the latest change - **> - struct am_Availability_s { - - <** - @description : the current availability state - **> - am_Availability_e availability - - <** - @description : the reason for the last change. This can be used to trigger events that deal with state changes. - **> - am_CustomAvailabilityReason_t availabilityReason - } - - <** - @description : describes class properties - **> - struct am_ClassProperty_s { - - <** - @description : the property as enum - **> - am_CustomClassProperty_t classProperty - - <** - @description : the value of the property - **> - Int16 value - } - - <** - @description : This struct describes the attribiutes of a crossfader. - **> - struct am_Crossfader_s { - - <** - @description : This is the ID of the crossfader, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManager daemon), or it is a fixed (the project has to ensure the uniqueness of the ID). - **> - am_crossfaderID_t crossfaderID - - <** - @description : The name of the crossfader. Must be unique in the whole system. - **> - String name - - <** - @description : The sinkID of the SinkA. Sinks shall be registered before registering the crossfader. - **> - am_sinkID_t sinkID_A - - <** - @description : The sinkID of the SinkB. Sinks shall be registered before registering the crossfader. - **> - am_sinkID_t sinkID_B - - <** - @description : The sourceID of the crossfader source. The source shall be registered before the crossfader. - **> - am_sourceID_t sourceID - - <** - @description : This enum can have 3 states: -
- HS_SINKA sinkA is the current hot one, sinkB is not audible
- HS_SINKB sinkB is the current hot one, sinkB is not audible
- HS_INTERMEDIATE the fader is stuck in between a cross-fading action. This could be due to an abort or an error. Before using the crossfader, it must be set to either HS_SINKA or HS_SINKB.
- **> - am_HotSink_e hotSink - } - - <** - @description : This struct describes the attributes of a gateway. - **> - struct am_Gateway_s { - - <** - @description : This is the ID of the gateway, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID). - **> - am_gatewayID_t gatewayID - - <** - @description : The name of the gateway. Must be unique in the whole system. - **> - String name - - <** - @description : The sinkID of the gateway sink-end. The sink is a full blown sink with connectionFormats, sinkClassIDs etc... It makes sense to register the sinks of a gateway as non-visible. Care needs to be taken that the connectionsFormats match with the ones in the conversionMatrix. If the sink is located in the controllingDomain, the ID needs to be retrieved by registering the sink before registering the gateway. In case the sink is in a different domain, the ID needs to be retrieved via peeking. - **> - am_sinkID_t sinkID - - <** - @description : The sourceID of the gateway sink-end. The sink is a full blown source with connectionFormats, sinkClassIDs etc... It makes sense to register the sources of a gateway as non-visible. Care needs to be taken that the connectionsFormats match with the ones in the conversionMatrix. If the source is located in the controllingDomain, the ID needs to be retrieved by registering the source before registering the gateway. In case the source is in a different domain, the ID needs to be retrieved via peeking. - **> - am_sourceID_t sourceID - - <** - @description : The ID of the sink. If the domain is the same like the controlling domain, the ID is known due to registration. If the domain is different, the ID needs to be retrieved via peeking. - **> - am_domainID_t domainSinkID - - <** - @description : The ID of the source. If the domain is the same like the controlling domain, the ID is known due to registration. If the domain is different, the ID needs to be retrieved via peeking. - **> - am_domainID_t domainSourceID - - <** - @description : This is the ID of the domain that registers the gateway. - **> - am_domainID_t controlDomainID - - <** - @description : This is the list of available formats on the source side of the gateway. It is not defined during the gateway registration but copied from the source registration. - **> - am_ConnectionFormat_L listSourceFormats - - <** - @description : This is the list of available formats on the sink side of the gateway. It is not defined during the gateway registration but copied from the sink registration. - **> - am_ConnectionFormat_L listSinkFormats - - <** - @description : This is matrix holding information about the conversion capability of the gateway, it's length is defined by the length(listSinkFormats) x length(listSourceFormats). -If a SinkFormat can be converted into a SourceFormat, the vector will hold a 1, if no conversion is possible, a 0.
-The data is stored row orientated, where the rows are related to the sinksFormats and the columns to the sourceFormats. The first value will hold the conversion information from the first sourceFormat to the first sinkFormat for example and the seventh value the information about the 3rd sinkFormat to the 1st sourceFormat in case we would have 3 sourceFormats.
- **> - am_Convertion_L convertionMatrix - } -
-<**
- @description : This struct describes the attributes of a gateway.
- **>
- struct am_Converter_s {
-
- <**
- @description : This is the ID of the gateway, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).
- **>
- am_converterID_t converterID
-
- <**
- @description : The name of the gateway. Must be unique in the whole system.
- **>
- String name
-
- <**
- @description : The sinkID of the gateway sink-end. The sink is a full blown sink with connectionFormats, sinkClassIDs etc... It makes sense to register the sinks of a gateway as non-visible. Care needs to be taken that the connectionsFormats match with the ones in the conversionMatrix. If the sink is located in the controllingDomain, the ID needs to be retrieved by registering the sink before registering the gateway. In case the sink is in a different domain, the ID needs to be retrieved via peeking.
- **>
- am_sinkID_t sinkID
-
- <**
- @description : The sourceID of the gateway sink-end. The sink is a full blown source with connectionFormats, sinkClassIDs etc... It makes sense to register the sources of a gateway as non-visible. Care needs to be taken that the connectionsFormats match with the ones in the conversionMatrix. If the source is located in the controllingDomain, the ID needs to be retrieved by registering the source before registering the gateway. In case the source is in a different domain, the ID needs to be retrieved via peeking.
- **>
- am_sourceID_t sourceID
-
- <**
- @description : The ID of the sink. If the domain is the same like the controlling domain, the ID is known due to registration. If the domain is different, the ID needs to be retrieved via peeking.
- **>
- am_domainID_t domainID
-
- <**
- @description : This is the list of available formats on the source side of the gateway. It is not defined during the gateway registration but copied from the source registration.
- **>
- am_ConnectionFormat_L listSourceFormats
-
- <**
- @description : This is the list of available formats on the sink side of the gateway. It is not defined during the gateway registration but copied from the sink registration.
- **>
- am_ConnectionFormat_L listSinkFormats
-
- <**
- @description : This is matrix holding information about the conversion capability of the gateway, it's length is defined by the length(listSinkFormats) x length(listSourceFormats).
-If a SinkFormat can be converted into a SourceFormat, the vector will hold a 1, if no conversion is possible, a 0.
-The data is stored row orientated, where the rows are related to the sinksFormats and the columns to the sourceFormats. The first value will hold the conversion information from the first sourceFormat to the first sinkFormat for example and the seventh value the information about the 3rd sinkFormat to the 1st sourceFormat in case we would have 3 sourceFormats.
- **>
- am_Convertion_L convertionMatrix
- }
- - <** - @description : This represents one "hopp" in a route - **> - struct am_RoutingElement_s { - - <** - @description : the source ID - **> - am_sourceID_t sourceID - - <** - @description : the sinkID - **> - am_sinkID_t sinkID - - <** - @description : the domainID the routeElement is in - **> - am_domainID_t domainID - - <** - @description : the connectionformat that is used for the route - **> - am_CustomConnectionFormat_t connectionFormat - } - - <** - @description : struct describing the sound property - **> - struct am_SoundProperty_s { - - <** - @description : the type of the property - a project specific enum - **> - am_CustomSoundPropertyType_t type - - <** - @description : the actual value of the property - **> - Int16 value - } - - <** - @description : struct describing system properties - **> - struct am_SystemProperty_s { - - <** - @description : the type that is set - **> - am_CustomSystemPropertyType_t type - - <** - @description : the value - **> - Int16 value - } - - <** - @description : struct describing sinkclasses - **> - struct am_SinkClass_s { - - <** - @description : the ID of the sinkClass - **> - am_sinkClass_t sinkClassID - - <** - @description : the name of the sinkClass - must be unique in the system - **> - String name - - <** - @description : the list of the class properties. These are pairs of a project specific enum describing the type of the value and an integer holding the real value. - **> - am_ClassProperty_L listClassProperties - } - - <** - @description : struct describing source classes - **> - struct am_SourceClass_s { - - <** - @description : the source ID - **> - am_sourceClass_t sourceClassID - - <** - @description : the name of the sourceClass - must be unique in the system - **> - String name - - <** - @description : the list of the class properties. These are pairs of a project specific enum describing the type of the value and an integer holding the real value. - **> - am_ClassProperty_L listClassProperties - } - - <** - @description : this type holds all information of sources relevant to the HMI - **> - struct am_SourceType_s { - - <** - @description : This is the ID of the source, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID). - **> - am_sourceID_t sourceID - - <** - @description : The name of the source. Must be unique in the whole system. - **> - String name - - <** - @description : the availability of the source - **> - am_Availability_s availability - - <** - @description : the sourceClassID, indicates the class the source is in. This information can be used by the Controller to implement different behaviour for different classes. - **> - am_sourceClass_t sourceClassID - } - - <** - @description : this type holds all information of sinks relevant to the HMI - **> - struct am_SinkType_s { - - <** - @description : This is the ID of the sink, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID). - **> - am_sinkID_t sinkID - - <** - @description : The name of the sink. Must be unique in the whole system. - **> - String name - - <** - @description : This attribute reflects the availability of the sink. There are several reasons why a sink could be not available for the moment: for example the shutdown of a sink because of overtemperature or over- & undervoltage. The availability consists of two pieces of information: -
- Availablility: the status itself, can be A_AVAILABLE, A_UNAVAILABLE or A_UNKNOWN
- AvailabilityReason: this informs about the last reason for a change in availability. The reasons itself are product specific.
- **> - am_Availability_s availability - - <** - @description : This is the representation of the Volume for the commandInterface. It is used by the HMI to set the volume of a sink, the AudioManagerController has to transform this into real source and sink volumes. - **> - am_mainVolume_t volume - am_MuteState_e muteState - - <** - @description : The sinkClassID references to a sinkClass. With the help of classification, rules can be setup to define the system behaviour. - **> - am_sinkClass_t sinkClassID - } - - <** - @description : a handle is used for asynchronous operations and is uniquely assigned for each of this operations - **> - struct am_Handle_s { - - <** - @description : the handletype - **> - am_Handle_e handleType - - <** - @description : the handle as value - **> - UInt16 handle - } - - <** - @description : struct describung mainsound property - **> - struct am_MainSoundProperty_s { - - <** - @description : the type of the property - **> - am_CustomMainSoundPropertyType_t type - - <** - @description : the actual value - **> - Int16 value - } - - <** - @description : this type holds all information of connections relevant to the HMI - **> - struct am_MainConnectionType_s { - - <** - @description : the ID of the mainconnection - **> - am_mainConnectionID_t mainConnectionID - - <** - @description : the sourceID where the connection starts - **> - am_sourceID_t sourceID - - <** - @description : the sinkID where the connection ends - **> - am_sinkID_t sinkID - - <** - @description : the delay of the mainconnection - **> - am_timeSync_t delay - - <** - @description : the current connection state - **> - am_ConnectionState_e connectionState - } - - <** - @description : struct that holds attribiutes of a mainconnection - **> - struct am_MainConnection_s { - - <** - @description : the assigned ID - **> - am_mainConnectionID_t mainConnectionID - - <** - @description : the current connection state - **> - am_ConnectionState_e connectionState - - <** - @description : the sinkID - **> - am_sinkID_t sinkID - - <** - @description : the sourceID - **> - am_sourceID_t sourceID - - <** - @description : the delay of the connection - **> - am_timeSync_t delay - - <** - @description : the list of sub connection IDs the mainconnection consists of - **> - am_ConnectionID_L listConnectionID - } - - <** - @description : This struct holds the payload of a notification. - **> - struct am_NotificationPayload_s { - - <** - @description : This defines the notification type - **> - am_CustomNotificationType_t type - - <** - @description : This is finally the value of the notification. It's meaning depends on the notificationType - **> - Int16 value - } - - <** - @description : This struct holds information about the configuration for notifications - **> - struct am_NotificationConfiguration_s { - - <** - @description : The notification type of the notification - **> - am_CustomNotificationType_t type - - <** - @description : The Notification status. This can be periodic, min/max value based or even off for example - **> - am_NotificationStatus_e status - - <** - @description : This gives additional information to the notification status. -Relation between notification status and the value:
-NS_PERIODIC - the period in ms
-NS_MINIMUM - the minimum value that triggers the notification
-NS_MAXIMUM - the maximum value that triggers the notifcation
-NS_CHANGE - the resolution of the change value
- **> - Int16 parameter - } - - <** - @description : This struct describes the attribiutes of a sink - **> - struct am_Sink_s { - - <** - @description : This is the ID of the sink, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID). - **> - am_sinkID_t sinkID - - <** - @description : The name of the sink. Must be unique in the whole system. - **> - String name - - <** - @description : The domainID is the domain the sink belongs to. A sink can only be in one domain. - **> - am_domainID_t domainID - - <** - @description : The sinkClassID references to a sinkClass. With the help of classification, rules can be setup to define the system behaviour. - **> - am_sinkClass_t sinkClassID - - <** - @description : This is the volume of the sink. It is set by the AudioManagerController. - **> - am_volume_t volume - - <** - @description : This Boolean flag indicates whether a sink is visible to the commandInterface or not. If the User must have the possibility to choose the source in the HMI, it must be visible. But there are also good reasons for invisible sinks, for example if the sink is part of a crossfader or gateway. HMI relevant changes in visible sinks will be automatically reported by the daemon to the commandInterface. - **> - Boolean visible - - <** - @description : This attribute reflects the availability of the sink. There are several reasons why a sink could be not available for the moment: for example the shutdown of a sink because of overtemperature or over- & undervoltage. The availability consists of two pieces of information: -
- Availablility: the status itself, can be A_AVAILABLE, A_UNAVAILABLE or A_UNKNOWN
- AvailabilityReason: this informs about the last reason for a change in availability. The reasons itself are product specific.
- **> - am_Availability_s available - - <** - @description : This attribute reflects the muteState of the sink. The information is not the "real" state of the sink, but the HMI representation for he commandInterface controlled by the AudioManagerController. - **> - am_MuteState_e muteState - - <** - @description : This is the representation of the Volume for the commandInterface. It is used by the HMI to set the volume of a sink, the AudioManagerController has to transform this into real source and sink volumes. - **> - am_mainVolume_t mainVolume - - <** - @description : This is the list of soundProperties, that the sink is capable of. The soundProperties itself are project specific. For sinks, a possible soundProperty could be for example settings. - **> - am_SoundProperty_L listSoundProperties - - <** - @description : This list holds information about the formats that the Source is capable of supporting when delivering audio. - **> - am_ConnectionFormat_L listConnectionFormats - - <** - @description : This is the list of the available mainSoundProperties. The principle is the same than with soundProperties, but they are only visible to the CommandInterface. - **> - am_MainSoundProperty_L listMainSoundProperties - - <** - @description : This is the list of the MainNotificationConfigurations. These notifications work on the level of command interface. - **> - am_NotificationConfiguration_L listMainNotificationConfigurations - - <** - @description : This is the list of the NotificationConfigurations. These notifications work on the level of RoutingPlugins. - **> - am_NotificationConfiguration_L listNotificationConfigurations - } - - <** - @description : This struct describes the attribiutes of a source - **> - struct am_Source_s { - - <** - @description : This is the ID of the source, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID). - **> - am_sourceID_t sourceID - - <** - @description : The domainID is the domain the source belongs to. A source can only be in one domain. - **> - am_domainID_t domainID - - <** - @description : The name of the source. Must be unique in the whole system. - **> - String name - - <** - @description : the sourceClassID, indicates the class the source is in. This information can be used by the Controller to implement different behaviour for different classes. - **> - am_sourceClass_t sourceClassID - - <** - @description : The source state is an indication towards the source if it is actively heard or not. The source can use this information to implement features like automatic spin down of CD's in case the CD is not the active source or AF following of a tuner that is not actively heard. The source state is set by the AudioManagerController.There are 3 possible states: -
- SS_ON: the source is active
- SS_OFF: the source is off
- SS_PAUSED: the source is paused and not active.
- **> - am_SourceState_e sourceState -
- <** - @description : This is the volume of the source. It is set by the AudioManagerController. It is used to adopt different audiolevels in a system and mixing of sources (e.g. navigation hints & music). - **> - am_volume_t volume -
- <** - @description : This Boolean flag indicates whether a source is visible to the commandInterface or not. If the User must have the possibility to choose the source in the HMI, it must be visible. But there are also good reasons for invisible sources, for example if the source is part of a crossfader or gateway. HMI relevant changes in visible sources will be automatically reported by the daemon to the commandInterface. - **> - Boolean visible -
- <** - @description : This attribute reflects the availability of the source. There are several reasons why a source could be not available for the moment. For example a CD player which has no CD entered in the slot can be unavailable, or a USB player with no or unreadable stick attached. Other scenarios involve the shutdown of a source because of overtemperature or over- & undervoltage. The availability consists of two informations: -
- Availablility: the status itself, can be A_AVAILABLE, A_UNAVAILABLE or A_UNKNOWN
- AvailabilityReason: this informs about the last reason for a change in availability. The reasons itself are product specific.
- **> - am_Availability_s available -
- <** - @description : Some special sources can have special behaviors, the are so called "Low Level Interrupts". Here the current status is documented. The information can be used by the AudioManagerController to react to the changes by for example lowering the volume of the mainSources. The two states are -
- IS_OFF: the interrupt is not active at the moment
- IS_INTERRUPTED: the interrupt is playing at the moment.
- **> - am_InterruptState_e interruptState - - <** - @description : This is the list of soundProperties, that the source is capable of. The soundProperties itself are project specific. For sources, a possible soundProperty could be navigation volume offset, for example. - **> - am_SoundProperty_L listSoundProperties - - <** - @description : This list holds information about the formats that the Source is capable of supporting when delivering audio. - **> - am_ConnectionFormat_L listConnectionFormats - - <** - @description : This is the list of the available mainSoundProperties. The principle is the same than with soundProperties, but they are only visible to the CommandInterface. - **> - am_MainSoundProperty_L listMainSoundProperties - - <** - @description : The list of MainNotificationConfigurations. These notifications work on the level of CommandInterface. - **> - am_NotificationConfiguration_L listMainNotificationConfigurations - - <** - @description : The list of MainNotificationConfigurations. These notifications work on the level of RoutingInterface. - **> - am_NotificationConfiguration_L listNotificationConfigurations - } - - <** - @description : This struct describes the attribiutes of a domain - **> - struct am_Domain_s { - - <** - @description : the domain ID - **> - am_domainID_t domainID - - <** - @description : the name of the domain - **> - String name - - <** - @description : the busname. This is equal to a plugin name and is used to dispatch messages to the elements of a plugin - **> - String busname - - <** - @description : the name of the node - **> - String nodename - - <** - @description : indicated if the domain is independent at startup or not - **> - Boolean early - - <** - @description : indicates if the domain registration is complete or not - **> - Boolean complete - - <** - @description : the current domain state - **> - am_DomainState_e ^state - } - - struct am_EarlyData_s { - am_EarlyDataType_e type - am_DataType_u sinksource - am_EarlyData_u data - } - - <** - @description : a connection - **> - struct am_Connection_s { - - <** - @description : the assigned ID - **> - am_connectionID_t connectionID - - <** - @description : the source the audio flows from - **> - am_sourceID_t sourceID - - <** - @description : the sink the audio flows to - **> - am_sinkID_t sinkID - - <** - @description : the delay of the conneciton - **> - am_timeSync_t delay - - <** - @description : the used connectionformat - **> - am_CustomConnectionFormat_t connectionFormat - } - - <** - @description : This types describe a mixed description for source and sinks volumes. - **> - struct am_Volumes_s { - - <** - @description : describes the type of the volume: source or sink. - **> - am_VolumeType_e volumeType - - <** - @description : either sourceID or sinkID - **> - am_DataType_u volumeID - - <** - @description : The volume - **> - am_volume_t volume - - <** - @description : the ramp that shall be driven - **> - am_CustomRampType_t ramp - - <** - @description : the time for the ramp - **> - am_time_t time - } - - <** - @description : data type depends of am_EarlyDataType_e: -volume_t in case of ED_SOURCE_VOLUME, ED_SINK_VOLUME
-soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY
- **> - union am_EarlyData_u { - am_volume_t volume - am_SoundProperty_s soundProperty - } - - <** - @description : data type depends of am_EarlyDataType_e: -sourceID in case of ED_SOURCE_VOLUME, ED_SOURCE_PROPERTY
-sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY
- **> - union am_DataType_u { - am_sinkID_t sink - am_sourceID_t source - } -
-}
\ No newline at end of file diff --git a/AudioManagerDaemon/fidls/NodeStateManager_dbus.conf b/AudioManagerDaemon/fidls/NodeStateManager_dbus.conf deleted file mode 100755 index 59620a7..0000000 --- a/AudioManagerDaemon/fidls/NodeStateManager_dbus.conf +++ /dev/null @@ -1,32 +0,0 @@ -######################################### Node state manager configuration ####################################### -# NodeStateManager_dbus.conf # -# If you change something make sure you re-configure with 'ccmake..' which generates the *_dbus.conf file again. # -################################################################################################################## -# -# Copyright (C) 2012, BMW AG -# -# This file is part of GENIVI Project AudioManager. -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# -# \copyright -# This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# -# \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -# -# For further information see http://www.genivi.org/. -# - -[local:org.genivi.NodeStateManager.Consumer:org.genivi.NodeStateManager] -dbus_connection=org.genivi.NodeStateManager -dbus_object=/org/genivi/NodeStateManager -dbus_interface=org.genivi.NodeStateManager.Consumer -dbus_predefined=true -[local:org.genivi.NodeStateManager.LifeCycleConsumer:org.genivi.audiomanager] -dbus_connection=org.genivi.audiomanager -dbus_object=/org/genivi/audiomanager/LifeCycleConsumer -dbus_interface=org.genivi.NodeStateManager.LifeCycleConsumer diff --git a/AudioManagerDaemon/include/CAmCommandReceiver.h b/AudioManagerDaemon/include/CAmCommandReceiver.h index 8e9f0fd..fc27df7 100644 --- a/AudioManagerDaemon/include/CAmCommandReceiver.h +++ b/AudioManagerDaemon/include/CAmCommandReceiver.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmCommandReceiver.h * For further information see http://www.genivi.org/. diff --git a/AudioManagerDaemon/include/CAmCommandSender.h b/AudioManagerDaemon/include/CAmCommandSender.h index d7cc84c..78858f9 100644 --- a/AudioManagerDaemon/include/CAmCommandSender.h +++ b/AudioManagerDaemon/include/CAmCommandSender.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmCommandSender.h * For further information see http://www.genivi.org/. diff --git a/AudioManagerDaemon/include/CAmControlReceiver.h b/AudioManagerDaemon/include/CAmControlReceiver.h index 7902348..2a30108 100644 --- a/AudioManagerDaemon/include/CAmControlReceiver.h +++ b/AudioManagerDaemon/include/CAmControlReceiver.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmControlReceiver.h * For further information see http://www.genivi.org/. diff --git a/AudioManagerDaemon/include/CAmControlSender.h b/AudioManagerDaemon/include/CAmControlSender.h index fb82484..fe43fe3 100644 --- a/AudioManagerDaemon/include/CAmControlSender.h +++ b/AudioManagerDaemon/include/CAmControlSender.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmControlSender.h * For further information see http://www.genivi.org/. @@ -27,7 +27,7 @@ #endif #include "control/IAmControlSend.h" -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" #include "unistd.h" namespace am diff --git a/AudioManagerDaemon/include/CAmDatabaseHandlerSQLite.h b/AudioManagerDaemon/include/CAmDatabaseHandlerSQLite.h index 444ea5c..ad9a615 100644 --- a/AudioManagerDaemon/include/CAmDatabaseHandlerSQLite.h +++ b/AudioManagerDaemon/include/CAmDatabaseHandlerSQLite.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmDatabaseHandlerSQLite.h * For further information see http://www.genivi.org/. diff --git a/AudioManagerDaemon/include/CAmDatabaseObserver.h b/AudioManagerDaemon/include/CAmDatabaseObserver.h index d6f980d..4f3823d 100644 --- a/AudioManagerDaemon/include/CAmDatabaseObserver.h +++ b/AudioManagerDaemon/include/CAmDatabaseObserver.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmDatabaseObserver.h * For further information see http://www.genivi.org/. @@ -24,7 +24,7 @@ #include "audiomanagertypes.h" #include <queue> -#include "shared/CAmSerializer.h" +#include "CAmSerializer.h" namespace am { diff --git a/AudioManagerDaemon/include/CAmNodeStateCommunicatorDBus.h b/AudioManagerDaemon/include/CAmNodeStateCommunicatorDBus.h index cb78f0f..638adeb 100644 --- a/AudioManagerDaemon/include/CAmNodeStateCommunicatorDBus.h +++ b/AudioManagerDaemon/include/CAmNodeStateCommunicatorDBus.h @@ -21,7 +21,7 @@ #ifndef CAMNODESTATECOMMUNICATORDBUS_H_ #define CAMNODESTATECOMMUNICATORDBUS_H_ -#include "shared/CAmDbusWrapper.h" +#include "CAmDbusWrapper.h" #include "CAmNodeStateCommunicator.h" namespace am diff --git a/AudioManagerDaemon/include/CAmRouter.h b/AudioManagerDaemon/include/CAmRouter.h index 6a3aacc..0c522a3 100644 --- a/AudioManagerDaemon/include/CAmRouter.h +++ b/AudioManagerDaemon/include/CAmRouter.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Aleksandar Donchev, Aleksander.Donchev@partner.bmw.de BMW 2013,2014 * * \file CAmRouter.h diff --git a/AudioManagerDaemon/include/CAmRoutingReceiver.h b/AudioManagerDaemon/include/CAmRoutingReceiver.h index be81529..c81fd50 100644 --- a/AudioManagerDaemon/include/CAmRoutingReceiver.h +++ b/AudioManagerDaemon/include/CAmRoutingReceiver.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmRoutingReceiver.h * For further information see http://www.genivi.org/. diff --git a/AudioManagerDaemon/include/CAmRoutingSender.h b/AudioManagerDaemon/include/CAmRoutingSender.h index d1e26b5..d19141d 100644 --- a/AudioManagerDaemon/include/CAmRoutingSender.h +++ b/AudioManagerDaemon/include/CAmRoutingSender.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmRoutingSender.h * For further information see http://www.genivi.org/. diff --git a/AudioManagerDaemon/include/CAmTelnetMenuHelper.h b/AudioManagerDaemon/include/CAmTelnetMenuHelper.h index 9476751..8d3f67a 100644 --- a/AudioManagerDaemon/include/CAmTelnetMenuHelper.h +++ b/AudioManagerDaemon/include/CAmTelnetMenuHelper.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Frank Herchet, frank.fh.herchet@bmw.de BMW 2012 * * \file CAmTelnetMenuHelper.h diff --git a/AudioManagerDaemon/include/CAmTelnetServer.h b/AudioManagerDaemon/include/CAmTelnetServer.h index 4275cce..e7eeda0 100644 --- a/AudioManagerDaemon/include/CAmTelnetServer.h +++ b/AudioManagerDaemon/include/CAmTelnetServer.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Frank Herchet, frank.fh.herchet@bmw.de BMW 2012 * * \file CAmTelnetServer.h @@ -25,7 +25,7 @@ #include <queue> #include <map> -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" #include "CAmTelnetMenuHelper.h" namespace am diff --git a/AudioManagerDaemon/include/CAmWatchdog.h b/AudioManagerDaemon/include/CAmWatchdog.h index b839f98..2f2f9f8 100755 --- a/AudioManagerDaemon/include/CAmWatchdog.h +++ b/AudioManagerDaemon/include/CAmWatchdog.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmWatchdog.h * For further information see http://www.genivi.org/. @@ -22,7 +22,7 @@ #ifndef CAMWATCHDOG_H_ #define CAMWATCHDOG_H_ -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" namespace am { diff --git a/AudioManagerDaemon/include/TAmPluginTemplate.h b/AudioManagerDaemon/include/TAmPluginTemplate.h index a421cd1..f391535 100644 --- a/AudioManagerDaemon/include/TAmPluginTemplate.h +++ b/AudioManagerDaemon/include/TAmPluginTemplate.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file TAmPluginTemplate.h * For further information see http://www.genivi.org/. @@ -24,7 +24,7 @@ #include <dlfcn.h> #include <libgen.h> -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" namespace am { diff --git a/AudioManagerDaemon/src/CAmCommandReceiver.cpp b/AudioManagerDaemon/src/CAmCommandReceiver.cpp index 066fb81..43ccd20 100644 --- a/AudioManagerDaemon/src/CAmCommandReceiver.cpp +++ b/AudioManagerDaemon/src/CAmCommandReceiver.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmCommandReceiver.cpp * For further information see http://www.genivi.org/. @@ -24,8 +24,8 @@ #include <algorithm> #include "IAmDatabaseHandler.h" #include "CAmControlSender.h" -#include "shared/CAmDltWrapper.h" -#include "shared/CAmSocketHandler.h" +#include "CAmDltWrapper.h" +#include "CAmSocketHandler.h" namespace am { diff --git a/AudioManagerDaemon/src/CAmCommandSender.cpp b/AudioManagerDaemon/src/CAmCommandSender.cpp index bb49c19..3882162 100644 --- a/AudioManagerDaemon/src/CAmCommandSender.cpp +++ b/AudioManagerDaemon/src/CAmCommandSender.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmCommandSender.cpp * For further information see http://www.genivi.org/. @@ -29,7 +29,7 @@ #include <cstring> #include "CAmCommandReceiver.h" #include "TAmPluginTemplate.h" -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" namespace am { diff --git a/AudioManagerDaemon/src/CAmCommonAPIWrapper.cpp b/AudioManagerDaemon/src/CAmCommonAPIWrapper.cpp deleted file mode 100644 index 28103de..0000000 --- a/AudioManagerDaemon/src/CAmCommonAPIWrapper.cpp +++ /dev/null @@ -1,275 +0,0 @@ -/** - * Copyright (C) 2012, BMW AG - * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 - * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 - * - * \copyright - * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * \file CAmCommonAPIWrapper.cpp - * For further information see http://www.genivi.org/. - */ - - -#include <config.h> -#include <fstream> -#include <sstream> -#include <string> -#include <algorithm> -#include <cassert> -#include <cstdlib> -#include <stdexcept> -#include <poll.h> -#include <tuple> -#include "audiomanagertypes.h" -#include "shared/CAmSocketHandler.h" -#include "shared/CAmDltWrapper.h" -#include "shared/CAmCommonAPIWrapper.h" - - -namespace am -{ -static CAmCommonAPIWrapper* pSingleCommonAPIInstance = NULL; - - -using namespace CommonAPI; - -CAmCommonAPIWrapper::CAmCommonAPIWrapper(CAmSocketHandler* socketHandler): - pCommonPrepareCallback(this,&CAmCommonAPIWrapper::commonPrepareCallback), // - pCommonDispatchCallback(this, &CAmCommonAPIWrapper::commonDispatchCallback), // - pCommonFireCallback(this, &CAmCommonAPIWrapper::commonFireCallback), // - pCommonCheckCallback(this, &CAmCommonAPIWrapper::commonCheckCallback), // - pCommonTimerCallback(this, &CAmCommonAPIWrapper::commonTimerCallback), // - mpSocketHandler(socketHandler), // - mWatchToCheck(NULL) -{ - assert(NULL!=socketHandler); -//1. Load the runtime - std::shared_ptr<CommonAPI::Runtime> runtime = CommonAPI::Runtime::load(); -//2. Get the context and store a pointer to it - mContext = runtime->getNewMainLoopContext(); -//3. Make subscriptions - mDispatchSourceListenerSubscription = mContext->subscribeForDispatchSources( - std::bind(&CAmCommonAPIWrapper::registerDispatchSource, this, std::placeholders::_1, std::placeholders::_2), - std::bind(&CAmCommonAPIWrapper::deregisterDispatchSource, this, std::placeholders::_1)); - mWatchListenerSubscription = mContext->subscribeForWatches( - std::bind(&CAmCommonAPIWrapper::registerWatch, this, std::placeholders::_1, std::placeholders::_2), - std::bind(&CAmCommonAPIWrapper::deregisterWatch, this, std::placeholders::_1)); - mTimeoutSourceListenerSubscription = mContext->subscribeForTimeouts( - std::bind(&CAmCommonAPIWrapper::registerTimeout, this, std::placeholders::_1, std::placeholders::_2), - std::bind(&CAmCommonAPIWrapper::deregisterTimeout, this, std::placeholders::_1)); -//4. Create the factory - std::shared_ptr<CommonAPI::Factory> factory = runtime->createFactory(mContext); - assert(factory); - logInfo(__PRETTY_FUNCTION__,"CommonAPI -> Factory created"); - mFactory = factory; -//5. Get the publisher V.2.1 -// std::shared_ptr<CommonAPI::ServicePublisher> servicePublisher = runtime->getServicePublisher(); -// assert(servicePublisher); -// logInfo(__PRETTY_FUNCTION__,"CommonAPI -> Publisher available"); -//6. Instantiate your concrete stub implementations -// std::shared_ptr<StubImpl> theStub = std::make_shared<StubImpl>(1); -//7. Register the services -// std::string capiAddress("local:org.genivi.audiomanager.sourcestate:de.bmw.infotainment.broadcast.ta"); -// registerStub(theStub, capiAddress); -} - -CAmCommonAPIWrapper::~CAmCommonAPIWrapper() -{ - mContext->unsubscribeForDispatchSources(mDispatchSourceListenerSubscription); - mContext->unsubscribeForWatches(mWatchListenerSubscription); - mContext->unsubscribeForTimeouts(mTimeoutSourceListenerSubscription); -//The following objects must be released in the given order. - mFactory.reset(); - mContext.reset(); - - mpSocketHandler = NULL; - mWatchToCheck = NULL; -} - -CAmCommonAPIWrapper* CAmCommonAPIWrapper::instantiateOnce(CAmSocketHandler* socketHandler) -{ - if(NULL==pSingleCommonAPIInstance) - { - if(NULL==socketHandler) - throw std::runtime_error(std::string("Expected a valid socket handler. The socket handler pointer must not be NULL.")); - else - pSingleCommonAPIInstance = new CAmCommonAPIWrapper(socketHandler); - } - else - throw std::logic_error(std::string("The singleton instance has been already instantiated. This method should be called only once.")); - return pSingleCommonAPIInstance; -} - -CAmCommonAPIWrapper* CAmCommonAPIWrapper::getInstance() -{ - assert(NULL!=pSingleCommonAPIInstance); - return pSingleCommonAPIInstance; -} - -std::shared_ptr<CommonAPI::Factory> CAmCommonAPIWrapper::factory() const -{ - return mFactory; -} - - -std::shared_ptr<CommonAPI::Runtime> CAmCommonAPIWrapper::runtime() const -{ - return mFactory->getRuntime(); -} - -bool CAmCommonAPIWrapper::commonDispatchCallback(const sh_pollHandle_t handle, void *userData) -{ - (void) handle; - (void) userData; - - std::list<DispatchSource*>::iterator iterator(mSourcesToDispatch.begin()); - for(;iterator!=mSourcesToDispatch.end();) - { - DispatchSource* source = *iterator; - if (!source->dispatch()) { - iterator=mSourcesToDispatch.erase(iterator); - } - else - iterator++; - } - if (!mSourcesToDispatch.empty()) - return (true); - - return false; -} - -bool CAmCommonAPIWrapper::commonCheckCallback(const sh_pollHandle_t, void *) -{ - std::vector<DispatchSource*> vecDispatch=mWatchToCheck->getDependentDispatchSources(); - mSourcesToDispatch.insert(mSourcesToDispatch.end(), vecDispatch.begin(), vecDispatch.end()); - - return (mWatchToCheck || !mSourcesToDispatch.empty()); -} - -void CAmCommonAPIWrapper::commonFireCallback(const pollfd pollfd, const sh_pollHandle_t, void *) -{ - mWatchToCheck=NULL; - try - { - mWatchToCheck=mMapWatches.at(pollfd.fd); - } - catch (const std::out_of_range& error) { - logInfo(__PRETTY_FUNCTION__,error.what()); - return; - } - - mWatchToCheck->dispatch(pollfd.events); -} - -void CAmCommonAPIWrapper::commonPrepareCallback(const sh_pollHandle_t, void*) -{ - for (auto dispatchSourceIterator = mRegisteredDispatchSources.begin(); - dispatchSourceIterator != mRegisteredDispatchSources.end(); - dispatchSourceIterator++) - { - int64_t dispatchTimeout(TIMEOUT_INFINITE); - if(dispatchSourceIterator->second->prepare(dispatchTimeout)) - { - while (dispatchSourceIterator->second->dispatch()); - } - } -} - -void CAmCommonAPIWrapper::registerDispatchSource(DispatchSource* dispatchSource, const DispatchPriority dispatchPriority) -{ - mRegisteredDispatchSources.insert({dispatchPriority, dispatchSource}); -} - -void CAmCommonAPIWrapper::deregisterDispatchSource(DispatchSource* dispatchSource) -{ - for(auto dispatchSourceIterator = mRegisteredDispatchSources.begin(); - dispatchSourceIterator != mRegisteredDispatchSources.end(); - dispatchSourceIterator++) { - - if(dispatchSourceIterator->second == dispatchSource) { - mRegisteredDispatchSources.erase(dispatchSourceIterator); - break; - } - } -} - -void CAmCommonAPIWrapper::deregisterWatch(Watch* watch) -{ - logInfo(__PRETTY_FUNCTION__); - for(std::map<int,Watch*>::iterator iter(mMapWatches.begin());iter!=mMapWatches.end();iter++) - { - if (iter->second == watch) - { - mMapWatches.erase(iter); - break; - } - } -} - -void CAmCommonAPIWrapper::registerTimeout(Timeout* timeout, const DispatchPriority) -{ - logInfo(__PRETTY_FUNCTION__); - timespec pollTimeout; - int64_t localTimeout = timeout->getTimeoutInterval(); - - pollTimeout.tv_sec = localTimeout / 1000; - pollTimeout.tv_nsec = (localTimeout % 1000) * 1000000; - - //prepare handle and callback. new is eval, but there is no other choice because we need the pointer! - sh_timerHandle_t handle; - timerHandles myHandle({handle,timeout}); - mpListTimerhandles.push_back(myHandle); - - //add the timer to the pollLoop - mpSocketHandler->addTimer(pollTimeout, &pCommonTimerCallback, handle, timeout); - - return; -} - -void CAmCommonAPIWrapper::deregisterTimeout(Timeout* timeout) -{ - logInfo(__PRETTY_FUNCTION__); - for( std::vector<timerHandles>::iterator iter(mpListTimerhandles.begin());iter!=mpListTimerhandles.end();iter++) - { - if(iter->timeout==timeout) - { - mpSocketHandler->removeTimer(iter->handle); - } - } -} - -void CAmCommonAPIWrapper::registerWatch(Watch* watch, const DispatchPriority) -{ - logInfo(__PRETTY_FUNCTION__); - pollfd pollfd_ (watch->getAssociatedFileDescriptor()); - sh_pollHandle_t handle (0); - - am_Error_e error = mpSocketHandler->addFDPoll(pollfd_.fd, pollfd_.events, &pCommonPrepareCallback, &pCommonFireCallback, &pCommonCheckCallback, &pCommonDispatchCallback, watch, handle); - - //if everything is alright, add the watch and the handle to our map so we know this relationship - if (error == !am_Error_e::E_OK || handle == 0) - logError(__PRETTY_FUNCTION__,"entering watch failed"); - - mMapWatches.insert(std::make_pair(pollfd_.fd,watch)); -} - -void CAmCommonAPIWrapper::commonTimerCallback(sh_timerHandle_t handle, void *) -{ - for( std::vector<timerHandles>::iterator iter(mpListTimerhandles.begin());iter!=mpListTimerhandles.end();iter++) - { - if(iter->handle==handle) - { - iter->timeout->dispatch(); - } - } -} - -} diff --git a/AudioManagerDaemon/src/CAmControlReceiver.cpp b/AudioManagerDaemon/src/CAmControlReceiver.cpp index 6ac7e0a..19b05bd 100644 --- a/AudioManagerDaemon/src/CAmControlReceiver.cpp +++ b/AudioManagerDaemon/src/CAmControlReceiver.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmControlReceiver.cpp * For further information see http://www.genivi.org/. @@ -28,8 +28,8 @@ #include "CAmRoutingSender.h" #include "CAmCommandSender.h" #include "CAmRouter.h" -#include "shared/CAmDltWrapper.h" -#include "shared/CAmSocketHandler.h" +#include "CAmDltWrapper.h" +#include "CAmSocketHandler.h" #ifdef WITH_NSM #include "CAmNodeStateCommunicator.h" #endif diff --git a/AudioManagerDaemon/src/CAmControlSender.cpp b/AudioManagerDaemon/src/CAmControlSender.cpp index dd3558e..bc51be0 100644 --- a/AudioManagerDaemon/src/CAmControlSender.cpp +++ b/AudioManagerDaemon/src/CAmControlSender.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmControlSender.cpp * For further information see http://www.genivi.org/. @@ -26,7 +26,7 @@ #include <sstream> #include <stdexcept> #include "TAmPluginTemplate.h" -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" namespace am { diff --git a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp index 864ae8c..501ea11 100644 --- a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp +++ b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp @@ -30,7 +30,7 @@ #include "CAmDatabaseHandlerMap.h" #include "CAmDatabaseObserver.h" #include "CAmRouter.h" -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" namespace am diff --git a/AudioManagerDaemon/src/CAmDatabaseHandlerSQLite.cpp b/AudioManagerDaemon/src/CAmDatabaseHandlerSQLite.cpp index da86386..bad070c 100644 --- a/AudioManagerDaemon/src/CAmDatabaseHandlerSQLite.cpp +++ b/AudioManagerDaemon/src/CAmDatabaseHandlerSQLite.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmDatabaseHandlerSQLite.cpp * For further information see http://www.genivi.org/. @@ -28,7 +28,7 @@ #include <string> #include "CAmDatabaseObserver.h" #include "CAmRouter.h" -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" #include <sqlite3.h> namespace am diff --git a/AudioManagerDaemon/src/CAmDatabaseObserver.cpp b/AudioManagerDaemon/src/CAmDatabaseObserver.cpp index 57a76cc..cec033f 100644 --- a/AudioManagerDaemon/src/CAmDatabaseObserver.cpp +++ b/AudioManagerDaemon/src/CAmDatabaseObserver.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmDatabaseObserver.cpp * For further information see http://www.genivi.org/. @@ -28,8 +28,8 @@ #include "CAmCommandSender.h" #include "CAmRoutingSender.h" #include "CAmTelnetServer.h" -#include "shared/CAmDltWrapper.h" -#include "shared/CAmSerializer.h" +#include "CAmDltWrapper.h" +#include "CAmSerializer.h" namespace am { diff --git a/AudioManagerDaemon/src/CAmDbusWrapper.cpp b/AudioManagerDaemon/src/CAmDbusWrapper.cpp deleted file mode 100644 index c9c26a4..0000000 --- a/AudioManagerDaemon/src/CAmDbusWrapper.cpp +++ /dev/null @@ -1,472 +0,0 @@ -/** - * Copyright (C) 2012, BMW AG - * - * This file is part of GENIVI Project AudioManager. - * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. - * - * \copyright - * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 - * - * \file CAmDbusWrapper.cpp - * For further information see http://www.genivi.org/. - * - */ - -#include "shared/CAmDbusWrapper.h" -#include <config.h> -#include <fstream> -#include <sstream> -#include <string> -#include <cassert> -#include <cstdlib> -#include <stdexcept> -#include "shared/CAmDltWrapper.h" -#include "shared/CAmSocketHandler.h" - -namespace am -{ - -/** - * introspectio header - */ -#define ROOT_INTROSPECT_XML \ -DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \ -"<node>" \ -"<interface name='org.AudioManager.freedesktop.DBus.Introspectable'>" \ -"<method name='Introspect'>" \ -" <arg name='xml_data' type='s' direction='out'/>" \ -"</method>" \ -"</interface>" \ - -CAmDbusWrapper* CAmDbusWrapper::mpReference = NULL; - -CAmDbusWrapper::CAmDbusWrapper(CAmSocketHandler* socketHandler, DBusBusType type) : - pDbusPrepareCallback(this,&CAmDbusWrapper::dbusPrepareCallback), // - pDbusDispatchCallback(this, &CAmDbusWrapper::dbusDispatchCallback), // - pDbusFireCallback(this, &CAmDbusWrapper::dbusFireCallback), // - pDbusCheckCallback(this, &CAmDbusWrapper::dbusCheckCallback), // - pDbusTimerCallback(this, &CAmDbusWrapper::dbusTimerCallback), // - mpDbusConnection(0), // - mDBusError(), // - mListNodes(), // - mpListTimerhandles(), // - mpSocketHandler(socketHandler), // - mDbusType(type) -{ - assert(mpSocketHandler!=0); - - dbus_error_init(&mDBusError); - - if (!dbus_threads_init_default()) - logError("CAmDbusWrapper::CAmDbusWrapper threads init call failed"); - logInfo("DBusWrapper::DBusWrapper Opening DBus connection"); - mpDbusConnection = dbus_bus_get(mDbusType, &mDBusError); - if (dbus_error_is_set(&mDBusError)) - { - logError("DBusWrapper::DBusWrapper Error while getting the DBus"); - dbus_error_free(&mDBusError); - } - if (NULL == mpDbusConnection) - { - logError("DBusWrapper::DBusWrapper DBus Connection is null"); - } - - //then we need to adopt the dbus to our mainloop: - //first, we are old enought to live longer then the connection: - dbus_connection_set_exit_on_disconnect(mpDbusConnection, FALSE); - - //we do not need the manual dispatching, since it is not allowed to call from a different thread. So leave it uncommented: - //dbus_connection_set_dispatch_status_function - - //add watch functions: - dbus_bool_t watch = dbus_connection_set_watch_functions(mpDbusConnection, addWatch, removeWatch, toogleWatch, this, NULL); - if (!watch) - { - logError("DBusWrapper::DBusWrapper Registering of watch functions failed"); - } - - //add timer functions: - dbus_bool_t timer = dbus_connection_set_timeout_functions(mpDbusConnection, addTimeout, removeTimeout, toggleTimeout, this, NULL); - if (!timer) - { - logError("DBusWrapper::DBusWrapper Registering of timer functions failed"); - } - - //register callback for Introspectio - mObjectPathVTable.message_function = CAmDbusWrapper::cbRootIntrospection; - logInfo("dbusconnection ",mpDbusConnection); - dbus_connection_register_object_path(mpDbusConnection, DBUS_SERVICE_OBJECT_PATH, &mObjectPathVTable, this); - int ret = dbus_bus_request_name(mpDbusConnection, DBUS_SERVICE_PREFIX, DBUS_NAME_FLAG_DO_NOT_QUEUE, &mDBusError); - if (dbus_error_is_set(&mDBusError)) - { - logError("DBusWrapper::DBusWrapper Name Error", mDBusError.message); - dbus_error_free(&mDBusError); - } - if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) - { - logError("DBusWrapper::DBusWrapper Wrapper is not the Primary Owner ! Another instance already running?"); - throw std::runtime_error("DBusWrapper::DBusWrapper Wrapper is not the Primary Owner ! Another instance already running?"); - } -} - -CAmDbusWrapper::~CAmDbusWrapper() -{ - //close the connection again - logInfo("DBusWrapper::~DBusWrapper Closing DBus connection"); - dbus_connection_unref(mpDbusConnection); - - //clean up all timerhandles we created but did not delete before - std::vector<sh_timerHandle_t*>::iterator it = mpListTimerhandles.begin(); - for (; it != mpListTimerhandles.end(); ++it) - { - delete *it; - } -} - -/** - * registers a callback that is entered as path below the main path. - * The configuration of the mainpath is done via DBusConfiguration.h - * @param vtable the vtable that holds a pointer to the callback that is called when the path is called from the dbus - * @param path the name of the path - * @param userdata pointer to the class that will handle the callback - */ -void CAmDbusWrapper::registerCallback(const DBusObjectPathVTable* vtable, const std::string& path, void* userdata) -{ - logInfo("DBusWrapper::registerCallback register callback:", path); - - std::string completePath = std::string(DBUS_SERVICE_OBJECT_PATH) + "/" + path; - dbus_error_init(&mDBusError); - mpDbusConnection = dbus_bus_get(mDbusType, &mDBusError); - dbus_connection_register_object_path(mpDbusConnection, completePath.c_str(), vtable, userdata); - if (dbus_error_is_set(&mDBusError)) - { - logError("DBusWrapper::registerCallack error: ", mDBusError.message); - dbus_error_free(&mDBusError); - } - mListNodes.push_back(path); -} - -/** - * internal callback for the root introspection - * @param conn - * @param msg - * @param reference - * @return - */ -DBusHandlerResult CAmDbusWrapper::cbRootIntrospection(DBusConnection *conn, DBusMessage *msg, void *reference) -{ - //logInfo("DBusWrapper::~cbRootIntrospection called:"); - - mpReference = (CAmDbusWrapper*) reference; - std::vector<std::string> nodesList = mpReference->mListNodes; - DBusMessage * reply; - DBusMessageIter args; - dbus_uint32_t serial = 0; - if (dbus_message_is_method_call(msg, DBUS_INTERFACE_INTROSPECTABLE, "Introspect")) - { - std::vector<std::string>::iterator nodeIter = nodesList.begin(); - const char *xml = ROOT_INTROSPECT_XML; - std::stringstream introspect; - introspect << std::string(xml); - for (; nodeIter != nodesList.end(); ++nodeIter) - { - introspect << "<node name='" << nodeIter->c_str() << "'/>"; - } - introspect << "</node>"; - - reply = dbus_message_new_method_return(msg); - std::string s = introspect.str(); - const char* string = s.c_str(); - - // add the arguments to the reply - dbus_message_iter_init_append(reply, &args); - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &string)) - { - logError("DBusWrapper::~cbRootIntrospection DBUS Out Of Memory!"); - } - - // send the reply && flush the connection - if (!dbus_connection_send(conn, reply, &serial)) - { - logError("DBusWrapper::~cbRootIntrospection DBUS Out Of Memory!"); - } - dbus_connection_flush(conn); - // free the reply - dbus_message_unref(reply); - - return (DBUS_HANDLER_RESULT_HANDLED); - } - else - { - return (DBUS_HANDLER_RESULT_NOT_YET_HANDLED); - } -} - -/** - * returns the dbus connection - * @param connection pointer to the connection - */ -void CAmDbusWrapper::getDBusConnection(DBusConnection *& connection) const -{ - connection = mpDbusConnection; -} - -dbus_bool_t CAmDbusWrapper::addWatch(DBusWatch *watch, void *userData) -{ - mpReference = (CAmDbusWrapper*) userData; - assert(mpReference!=0); - return (mpReference->addWatchDelegate(watch, userData)); -} - -dbus_bool_t CAmDbusWrapper::addWatchDelegate(DBusWatch * watch, void* userData) -{ - (void) userData; - int16_t event = 0; - sh_pollHandle_t handle = 0; - uint flags = dbus_watch_get_flags(watch); - - /* no watch flags for disabled watches */ - if (dbus_watch_get_enabled(watch)) - { - if (flags & DBUS_WATCH_READABLE) - event |= POLLIN; - if (flags & DBUS_WATCH_WRITABLE) - event |= POLLOUT; - } - - logInfo("DBusWrapper::addWatchDelegate entered new watch, fd=", dbus_watch_get_unix_fd(watch), "event flag=", event); - am_Error_e error = mpSocketHandler->addFDPoll(dbus_watch_get_unix_fd(watch), event, &pDbusPrepareCallback, &pDbusFireCallback, &pDbusCheckCallback, &pDbusDispatchCallback, watch, handle); - - //if everything is alright, add the watch and the handle to our map so we know this relationship - if (error == E_OK && handle != 0) - { - mMapHandleWatch.insert(std::make_pair(watch, handle)); - return (true); - } - logError("DBusWrapper::addWatchDelegate entering watch failed"); - return (true); -} - -void CAmDbusWrapper::removeWatch(DBusWatch *watch, void *userData) -{ - mpReference = (CAmDbusWrapper*) userData; - assert(mpReference!=0); - mpReference->removeWatchDelegate(watch, userData); -} - -void CAmDbusWrapper::removeWatchDelegate(DBusWatch *watch, void *userData) -{ - (void) userData; - std::map<DBusWatch*, sh_pollHandle_t>::iterator iterator = mMapHandleWatch.begin(); - iterator = mMapHandleWatch.find(watch); - if (iterator != mMapHandleWatch.end()) - { - mpSocketHandler->removeFDPoll(iterator->second); - logInfo("DBusWrapper::removeWatch removed watch with handle", iterator->second); - mMapHandleWatch.erase(iterator); - } - else - { - logError("DBusWrapper::removeWatch could not find handle !"); - } -} - -void CAmDbusWrapper::toogleWatch(DBusWatch *watch, void *userData) -{ - mpReference = (CAmDbusWrapper*) userData; - assert(mpReference!=0); - mpReference->toogleWatchDelegate(watch, userData); -} - -void CAmDbusWrapper::toogleWatchDelegate(DBusWatch *watch, void *userData) -{ - (void) userData; - int16_t event = 0; - dbus_watch_get_unix_fd(watch); - uint flags = dbus_watch_get_flags(watch); - /* no watch flags for disabled watches */ - if (dbus_watch_get_enabled(watch)) - { - if (flags & DBUS_WATCH_READABLE) - event |= POLLIN; - if (flags & DBUS_WATCH_WRITABLE) - event |= POLLOUT; - } - std::map<DBusWatch*, sh_pollHandle_t>::iterator iterator = mMapHandleWatch.begin(); - iterator = mMapHandleWatch.find(watch); - if (iterator != mMapHandleWatch.end()) - mpSocketHandler->updateEventFlags(iterator->second, event); -} - -dbus_bool_t CAmDbusWrapper::addTimeout(DBusTimeout *timeout, void* userData) -{ - mpReference = (CAmDbusWrapper*) userData; - assert(mpReference!=0); - return (mpReference->addTimeoutDelegate(timeout, userData)); -} - -dbus_bool_t CAmDbusWrapper::addTimeoutDelegate(DBusTimeout *timeout, void* userData) -{ - (void)userData; - - if (!dbus_timeout_get_enabled(timeout)) - return (false); - - //calculate the timeout in timeval - timespec pollTimeout; - int localTimeout = dbus_timeout_get_interval(timeout); - pollTimeout.tv_sec = localTimeout / 1000; - pollTimeout.tv_nsec = (localTimeout % 1000) * 1000000; - - //prepare handle and callback. new is eval, but there is no other choice because we need the pointer! - sh_timerHandle_t* handle = new sh_timerHandle_t; - mpListTimerhandles.push_back(handle); - - //add the timer to the pollLoop - mpSocketHandler->addTimer(pollTimeout, &pDbusTimerCallback, *handle, timeout); - - //save the handle with dbus context - dbus_timeout_set_data(timeout, handle, NULL); - - //save timeout in Socket context - userData = timeout; - return (true); -} - -void CAmDbusWrapper::removeTimeout(DBusTimeout *timeout, void* userData) -{ - mpReference = (CAmDbusWrapper*) userData; - assert(mpReference!=0); - mpReference->removeTimeoutDelegate(timeout, userData); -} - -void CAmDbusWrapper::removeTimeoutDelegate(DBusTimeout *timeout, void* userData) -{ - (void) userData; - //get the pointer to the handle and remove the timer - sh_timerHandle_t* handle = (sh_timerHandle_t*) dbus_timeout_get_data(timeout); - mpSocketHandler->removeTimer(*handle); - - //now go throught the timerlist and remove the pointer, free memory - std::vector<sh_timerHandle_t*>::iterator it = mpListTimerhandles.begin(); - for (; it != mpListTimerhandles.end(); ++it) - { - if (*it == handle) - { - mpListTimerhandles.erase(it); - break; - } - } - delete handle; - } - -void CAmDbusWrapper::toggleTimeout(DBusTimeout *timeout, void* userData) -{ - mpReference = (CAmDbusWrapper*) userData; - assert(mpReference!=0); - mpReference->toggleTimeoutDelegate(timeout, userData); -} - -bool am::CAmDbusWrapper::dbusDispatchCallback(const sh_pollHandle_t handle, void *userData) -{ - (void) handle; - (void) userData; - bool returnVal = true; - dbus_connection_ref(mpDbusConnection); - if (dbus_connection_dispatch(mpDbusConnection) == DBUS_DISPATCH_COMPLETE) - returnVal = false; - dbus_connection_unref(mpDbusConnection); - //logInfo("DBusWrapper::dbusDispatchCallback was called"); - return (returnVal); -} - -bool am::CAmDbusWrapper::dbusCheckCallback(const sh_pollHandle_t handle, void *userData) -{ - (void) handle; - (void) userData; - bool returnVal = false; - dbus_connection_ref(mpDbusConnection); - if (dbus_connection_get_dispatch_status(mpDbusConnection) == DBUS_DISPATCH_DATA_REMAINS) - returnVal = true; - dbus_connection_unref(mpDbusConnection); - //logInfo("DBusWrapper::dbusCheckCallback was called"); - return (returnVal); -} - -void am::CAmDbusWrapper::dbusFireCallback(const pollfd pollfd, const sh_pollHandle_t handle, void *userData) -{ - (void) handle; - (void) userData; - assert(userData!=NULL); - uint flags = 0; - - if (pollfd.revents & POLLIN) - flags |= DBUS_WATCH_READABLE; - if (pollfd.revents & POLLOUT) - flags |= DBUS_WATCH_WRITABLE; - if (pollfd.revents & POLLHUP) - flags |= DBUS_WATCH_HANGUP; - if (pollfd.revents & POLLERR) - flags |= DBUS_WATCH_ERROR; - - DBusWatch *watch = (DBusWatch*) userData; - - dbus_connection_ref(mpDbusConnection); - dbus_watch_handle(watch, flags); - dbus_connection_unref(mpDbusConnection); - //logInfo("DBusWrapper::dbusFireCallback was called"); -} - -void CAmDbusWrapper::dbusPrepareCallback(const sh_pollHandle_t handle, void* userData) -{ - (void) handle; - (void) userData; - dbus_connection_ref(mpDbusConnection); - while (dbus_connection_get_dispatch_status(mpDbusConnection) == DBUS_DISPATCH_DATA_REMAINS) - { - dbus_connection_dispatch(mpDbusConnection); - //logInfo("prepare was neccessary!"); - } - dbus_connection_unref(mpDbusConnection); -} - -void CAmDbusWrapper::toggleTimeoutDelegate(DBusTimeout *timeout, void* userData) -{ - (void) userData; - //get the pointer to the handle and remove the timer - sh_timerHandle_t* handle = (sh_timerHandle_t*) dbus_timeout_get_data(timeout); - - //stop or restart? - if (dbus_timeout_get_enabled(timeout)) - { - //calculate the timeout in timeval - timespec pollTimeout; - int localTimeout = dbus_timeout_get_interval(timeout); - pollTimeout.tv_sec = localTimeout / 1000; - pollTimeout.tv_nsec = (localTimeout % 1000) * 1000000; - mpSocketHandler->updateTimer(*handle, pollTimeout); - } - else - { - mpSocketHandler->stopTimer(*handle); - } -} - -void CAmDbusWrapper::dbusTimerCallback(sh_timerHandle_t handle, void *userData) -{ - assert(userData!=NULL); - if (dbus_timeout_get_enabled((DBusTimeout*) userData)) - { - mpSocketHandler->restartTimer(handle); - } - dbus_timeout_handle((DBusTimeout*) userData); -} -} - diff --git a/AudioManagerDaemon/src/CAmDltWrapper.cpp b/AudioManagerDaemon/src/CAmDltWrapper.cpp deleted file mode 100644 index fc2aaa4..0000000 --- a/AudioManagerDaemon/src/CAmDltWrapper.cpp +++ /dev/null @@ -1,350 +0,0 @@ -/** - * Copyright (C) 2012, BMW AG - * - * This file is part of GENIVI Project AudioManager. - * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. - * - * \copyright - * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 - * Jens Lorenz, jlorenz@de.adit-jv.com ADIT 2014 - * - * \file CAmDltWrapper.cpp - * For further information see http://www.genivi.org/. - * - */ - - -#include "shared/CAmDltWrapper.h" -#include <string> -#include <sstream> -#include <iostream> -#include <string.h> - -namespace am -{ - -CAmDltWrapper* CAmDltWrapper::mpDLTWrapper = NULL; -pthread_mutex_t CAmDltWrapper::mMutex = PTHREAD_MUTEX_INITIALIZER; - -CAmDltWrapper *CAmDltWrapper::instance(const bool enableNoDLTDebug) -{ - if (!mpDLTWrapper) - mpDLTWrapper = new CAmDltWrapper(enableNoDLTDebug); -#ifndef WITH_DLT - if(enableNoDLTDebug) - mpDLTWrapper->enableNoDLTDebug(true); -#endif - return (mpDLTWrapper); -} - -void CAmDltWrapper::unregisterContext(DltContext & handle) -{ -#ifdef WITH_DLT - dlt_unregister_context(&handle); -#else - (void) handle; -#endif -} - -void CAmDltWrapper::deinit() -{ -#ifdef WITH_DLT - unregisterContext(mDltContext); -#endif -} - -CAmDltWrapper::CAmDltWrapper(const bool enableNoDLTDebug) : -#ifndef WITH_DLT - mEnableNoDLTDebug(enableNoDLTDebug), -#endif - mDltContext(), // - mDltContextData() -{ - (void) enableNoDLTDebug; -#ifndef WITH_DLT - std::cout << "\e[0;34m[DLT]\e[0;30m\tRunning without DLT-support" << std::endl; -#endif -} - -void CAmDltWrapper::registerApp(const char *appid, const char *description) -{ -#ifdef WITH_DLT - dlt_register_app(appid, description); - //register a default context - dlt_register_context(&mDltContext, "def", "default Context registered by DLTWrapper CLass"); -#else - (void) appid; - (void) description; -#endif -} - -void CAmDltWrapper::registerContext(DltContext& handle, const char *contextid, const char *description) -{ -#ifdef WITH_DLT - dlt_register_context(&handle, contextid, description); -#else - strncpy(handle.contextID,contextid,4); - - // store only the first contextID - if(0 == strlen(mDltContext.contextID)) - { - memcpy(&mDltContext.contextID,contextid,4); - const size_t str_len = strlen(description); - if(str_len < 2000) - { - mDltContextData.context_description = new char[str_len + 1]; - (void) strcpy(mDltContextData.context_description,description); - } - } - - std::cout << "\e[0;34m[DLT]\e[0;30m\tRegistering Context " << contextid << " , " << description << std::endl; - -#endif -} - -bool CAmDltWrapper::init(DltLogLevelType loglevel, DltContext* context) -{ - (void) loglevel; - pthread_mutex_lock(&mMutex); - if (!context) - context = &mDltContext; -#ifdef WITH_DLT - if (dlt_user_log_write_start(context, &mDltContextData, loglevel) <= 0) - { - pthread_mutex_unlock(&mMutex); - return false; - } -#else - if(mEnableNoDLTDebug) - std::cout << "\e[0;34m[" << context->contextID << "]\e[0;30m\t"; -#endif - return true; -} - -void CAmDltWrapper::send() -{ -#ifdef WITH_DLT - dlt_user_log_write_finish(&mDltContextData); -#else - if(mEnableNoDLTDebug) - std::cout << mDltContextData.buffer.str().c_str() << std::endl; - - mDltContextData.buffer.str(""); - mDltContextData.buffer.clear(); -#endif - pthread_mutex_unlock(&mMutex); -} - -void CAmDltWrapper::append(const int8_t value) -{ -#ifdef WITH_DLT - dlt_user_log_write_int8(&mDltContextData, value); -#else - appendNoDLT(value); -#endif -} - -void CAmDltWrapper::append(const uint8_t value) -{ -#ifdef WITH_DLT - dlt_user_log_write_uint8(&mDltContextData, value); -#else - appendNoDLT(value); -#endif -} - -void CAmDltWrapper::append(const int16_t value) -{ -#ifdef WITH_DLT - dlt_user_log_write_int16(&mDltContextData, value); -#else - appendNoDLT(value); -#endif -} - -void CAmDltWrapper::append(const uint16_t value) -{ -#ifdef WITH_DLT - dlt_user_log_write_uint16(&mDltContextData, value); -#else - appendNoDLT(value); -#endif -} - -void CAmDltWrapper::append(const int32_t value) -{ -#ifdef WITH_DLT - dlt_user_log_write_int32(&mDltContextData, value); -#else - appendNoDLT(value); -#endif -} - -void CAmDltWrapper::append(const uint32_t value) -{ -#ifdef WITH_DLT - dlt_user_log_write_uint32(&mDltContextData, value); -#else - appendNoDLT(value); -#endif -} - -void CAmDltWrapper::append(const char*& value) -{ -#ifdef WITH_DLT - dlt_user_log_write_string(&mDltContextData, value); -#else - mDltContextData.buffer << value; -#endif -} - -void CAmDltWrapper::append(const std::string& value) -{ -#ifdef WITH_DLT - dlt_user_log_write_string(&mDltContextData, value.c_str()); -#else - mDltContextData.buffer << value; -#endif -} - -void CAmDltWrapper::append(const bool value) -{ -#ifdef WITH_DLT - dlt_user_log_write_bool(&mDltContextData, static_cast<uint8_t>(value)); -#else - appendNoDLT(value); -#endif -} - -void CAmDltWrapper::append(const int64_t value) -{ -#ifdef WITH_DLT - dlt_user_log_write_int64(&mDltContextData, value); -#else - appendNoDLT(value); -#endif -} - -void CAmDltWrapper::append(const uint64_t value) -{ -#ifdef WITH_DLT - dlt_user_log_write_uint64(&mDltContextData, value); -#else - appendNoDLT(value); -#endif -} - -void CAmDltWrapper::append(const am_Error_e value) -{ - switch (value) - { - case am_Error_e::E_OK: - #ifdef WITH_DLT - dlt_user_log_write_string(&mDltContextData, "E_OK"); - #else - mDltContextData.buffer << "E_OK"; - #endif - break; - case am_Error_e::E_ABORTED: - #ifdef WITH_DLT - dlt_user_log_write_string(&mDltContextData, "E_ABORTED"); - #else - mDltContextData.buffer << "E_ABORTED"; - #endif - break; - case am_Error_e::E_ALREADY_EXISTS: - #ifdef WITH_DLT - dlt_user_log_write_string(&mDltContextData, "E_ALREADY_EXISTS"); - #else - mDltContextData.buffer << "E_ALREADY_EXISTS"; - #endif - break; - case am_Error_e::E_DATABASE_ERROR: - #ifdef WITH_DLT - dlt_user_log_write_string(&mDltContextData, "E_DATABASE_ERROR"); - #else - mDltContextData.buffer << "E_DATABASE_ERROR"; - #endif - break; - case am_Error_e::E_NON_EXISTENT: - #ifdef WITH_DLT - dlt_user_log_write_string(&mDltContextData, "E_NON_EXISTENT"); - #else - mDltContextData.buffer << "E_NON_EXISTENT"; - #endif - break; - case am_Error_e::E_NOT_POSSIBLE: - #ifdef WITH_DLT - dlt_user_log_write_string(&mDltContextData, "E_NOT_POSSIBLE"); - #else - mDltContextData.buffer << "E_NOT_POSSIBLE"; - #endif - break; - case am_Error_e::E_NOT_USED: - #ifdef WITH_DLT - dlt_user_log_write_string(&mDltContextData, "E_NOT_USED"); - #else - mDltContextData.buffer << "E_NOT_USED"; - #endif - break; - case am_Error_e::E_NO_CHANGE: - #ifdef WITH_DLT - dlt_user_log_write_string(&mDltContextData, "E_NO_CHANGE"); - #else - mDltContextData.buffer << "E_NO_CHANGE"; - #endif - break; - case am_Error_e::E_OUT_OF_RANGE: - #ifdef WITH_DLT - dlt_user_log_write_string(&mDltContextData, "E_OUT_OF_RANGE"); - #else - mDltContextData.buffer << "E_OUT_OF_RANGE"; - #endif - break; - case am_Error_e::E_UNKNOWN: - #ifdef WITH_DLT - dlt_user_log_write_string(&mDltContextData, "E_UNKNOWN"); - #else - mDltContextData.buffer << "E_UNKNOWN"; - #endif - break; - default: - #ifdef WITH_DLT - dlt_user_log_write_string(&mDltContextData, "E_UNKNOWN"); - #else - mDltContextData.buffer << "E_UNKNOWN"; - #endif - - } -} - -#ifndef WITH_DLT -template<class T> void CAmDltWrapper::appendNoDLT(T value) -{ - mDltContextData.buffer << value; -} - -void CAmDltWrapper::enableNoDLTDebug(const bool enableNoDLTDebug) -{ - mEnableNoDLTDebug = enableNoDLTDebug; -} -#endif - -CAmDltWrapper::~CAmDltWrapper() -{ - if (mpDLTWrapper) - { - mpDLTWrapper->unregisterContext(mDltContext); - delete mpDLTWrapper; - } -} -} - - diff --git a/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp b/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp index d772837..19aaa4b 100644 --- a/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp +++ b/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp @@ -1,5 +1,5 @@ /** - * Copyright (C) 2012, BMW AG +Von mir aus gerne. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. * @@ -28,8 +28,8 @@ #include <memory> #include <CommonAPI/CommonAPI.h> #include "config.h" -#include "shared/CAmCommonAPIWrapper.h" -#include "shared/CAmDltWrapper.h" +#include "CAmCommonAPIWrapper.h" +#include "CAmDltWrapper.h" #include "CAmNodeStateCommunicatorCAPI.h" #include "CAmControlSender.h" #include <org/genivi/NodeStateManager/LifeCycleConsumerProxy.h> diff --git a/AudioManagerDaemon/src/CAmNodeStateCommunicatorDBus.cpp b/AudioManagerDaemon/src/CAmNodeStateCommunicatorDBus.cpp index 4173890..14f208b 100644 --- a/AudioManagerDaemon/src/CAmNodeStateCommunicatorDBus.cpp +++ b/AudioManagerDaemon/src/CAmNodeStateCommunicatorDBus.cpp @@ -26,7 +26,7 @@ #include <sstream> #include <stdexcept> #include "CAmControlSender.h" -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" #include "config.h" namespace am diff --git a/AudioManagerDaemon/src/CAmRouter.cpp b/AudioManagerDaemon/src/CAmRouter.cpp index 6ab0a07..8e3069d 100644 --- a/AudioManagerDaemon/src/CAmRouter.cpp +++ b/AudioManagerDaemon/src/CAmRouter.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Aleksandar Donchev, Aleksander.Donchev@partner.bmw.de BMW 2013,2014 * * \file CAmRouter.cpp @@ -27,7 +27,7 @@ #include "CAmRouter.h" #include "IAmDatabaseHandler.h" #include "CAmControlSender.h" -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" diff --git a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp index 29f7db7..c36cde7 100644 --- a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp +++ b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmRoutingReceiver.cpp * For further information see http://www.genivi.org/. @@ -25,8 +25,8 @@ #include "IAmDatabaseHandler.h" #include "CAmRoutingSender.h" #include "CAmControlSender.h" -#include "shared/CAmDltWrapper.h" -#include "shared/CAmSocketHandler.h" +#include "CAmDltWrapper.h" +#include "CAmSocketHandler.h" namespace am { diff --git a/AudioManagerDaemon/src/CAmRoutingSender.cpp b/AudioManagerDaemon/src/CAmRoutingSender.cpp index cd9c3d7..77f12d0 100644 --- a/AudioManagerDaemon/src/CAmRoutingSender.cpp +++ b/AudioManagerDaemon/src/CAmRoutingSender.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmRoutingSender.cpp * For further information see http://www.genivi.org/. @@ -31,7 +31,7 @@ #include <sstream> #include "CAmRoutingReceiver.h" #include "TAmPluginTemplate.h" -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" namespace am { diff --git a/AudioManagerDaemon/src/CAmSocketHandler.cpp b/AudioManagerDaemon/src/CAmSocketHandler.cpp deleted file mode 100644 index 455cb32..0000000 --- a/AudioManagerDaemon/src/CAmSocketHandler.cpp +++ /dev/null @@ -1,546 +0,0 @@ -/** - * Copyright (C) 2012, BMW AG - * - * This file is part of GENIVI Project AudioManager. - * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. - * - * \copyright - * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 - * - * \file CAmSocketHandler.cpp - * For further information see http://www.genivi.org/. - * - */ - -#include "shared/CAmSocketHandler.h" -#include <config.h> -#include <cassert> -#include <sys/fcntl.h> -#include <sys/errno.h> -#include <sys/poll.h> -#include <time.h> -#include <algorithm> -#include <features.h> -#include <csignal> -#include <unistd.h> -#include "shared/CAmDltWrapper.h" - -namespace am -{ - -CAmSocketHandler::CAmSocketHandler() : - receiverCallbackT(this, &CAmSocketHandler::receiverCallback),// - checkerCallbackT(this, &CAmSocketHandler::checkerCallback),// - mPipe(), // - mDispatchDone(1),// - mListPoll(), // - mListTimer(), // - mListActiveTimer(), // - mLastInsertedHandle(0), // - mLastInsertedPollHandle(0), // - mRecreatePollfds(true), // - mStartTime() // -{ - if (pipe(mPipe) == -1) - { - logError("CAmSerializer could not create pipe!"); - } - - //add the pipe to the poll - nothing needs to be proccessed here we just need the pipe to trigger the ppoll - short event = 0; - sh_pollHandle_t handle; - event |= POLLIN; - addFDPoll(mPipe[0], event, NULL, &receiverCallbackT, &checkerCallbackT, NULL, NULL, handle); -} - -CAmSocketHandler::~CAmSocketHandler() -{ -} - -//todo: maybe have some: give me more time returned? -/** - * start the block listening for filedescriptors. This is the mainloop. - */ -void CAmSocketHandler::start_listenting() -{ - mDispatchDone = 0; - int16_t pollStatus; - - //prepare the signalmask - sigset_t sigmask; - sigemptyset(&sigmask); - sigaddset(&sigmask, SIGINT); - sigaddset(&sigmask, SIGQUIT); - sigaddset(&sigmask, SIGTERM); - sigaddset(&sigmask, SIGHUP); - sigaddset(&sigmask, SIGQUIT); - - clock_gettime(CLOCK_MONOTONIC, &mStartTime); - while (!mDispatchDone) - { - //first we go through the registered filedescriptors and check if someone needs preparation: - std::for_each(mListPoll.begin(), mListPoll.end(), CAmShCallPrep()); - - if (mRecreatePollfds) - { - mfdPollingArray.clear(); - //there was a change in the setup, so we need to recreate the fdarray from the list - std::for_each(mListPoll.begin(), mListPoll.end(), CAmShCopyPollfd(mfdPollingArray)); - mRecreatePollfds = false; - } - - timerCorrection(); - - //block until something is on a filedescriptor - - timespec buffertime; - if ((pollStatus = ppoll(&mfdPollingArray[0], mfdPollingArray.size(), insertTime(buffertime), &sigmask)) < 0) - { - if (errno == EINTR) - { - //a signal was received, that means it's time to go... - pollStatus = 0; - } - else - { - logError("SocketHandler::start_listenting ppoll returned with error", errno); - exit(0); - } - } - - if (pollStatus != 0) //only check filedescriptors if there was a change - { - //todo: here could be a timer that makes sure naughty plugins return! - - //freeze mListPoll by copying it - otherwise we get problems when we want to manipulate it during the next lines - std::list<sh_poll_s> listPoll; - mListPoll_t::iterator listmPollIt; - - //remove all filedescriptors who did not fire - std::vector<pollfd>::iterator it = mfdPollingArray.begin(); - do - { - it = std::find_if(it, mfdPollingArray.end(), eventFired); - if (it != mfdPollingArray.end()) - { - listmPollIt = mListPoll.begin(); - std::advance(listmPollIt, std::distance(mfdPollingArray.begin(), it)); - listPoll.push_back(*listmPollIt); - listPoll.back().pollfdValue = *it; - it++; - } - } while (it != mfdPollingArray.end()); - - //stage 1, call firedCB - std::for_each(listPoll.begin(), listPoll.end(), CAmShCallFire()); - - //stage 2, lets ask around if some dispatching is necessary, the ones who need stay on the list - listPoll.remove_if(noDispatching); - - //stage 3, the ones left need to dispatch, we do this as long as there is something to dispatch.. - do - { - listPoll.remove_if(dispatchingFinished); - } while (!listPoll.empty()); - - } - else //Timerevent - { - //this was a timer event, we need to take care about the timers - timerUp(); - } - } -} - -/** - * exits the loop - */ -void CAmSocketHandler::stop_listening() -{ - mDispatchDone = 1; - - //this is for all running timers only - we need to handle the additional offset here - if (!mListActiveTimer.empty()) - { - timespec currentTime, correctionTime; - clock_gettime(CLOCK_MONOTONIC, ¤tTime); - correctionTime = timespecSub(currentTime, mStartTime); - std::for_each(mListActiveTimer.begin(), mListActiveTimer.end(), CAmShSubstractTime(correctionTime)); - } - -} - -/** - * Adds a filedescriptor to the polling loop - * @param fd the filedescriptor - * @param event the event flags - * @param prepare a callback that is called before the loop is entered - * @param fired a callback that is called when the filedescriptor needs to be read - * @param check a callback that is called to check if further actions are neccessary - * @param dispatch a callback that is called to dispatch the received data - * @param userData a pointer to userdata that is always passed around - * @param handle the handle of this poll - * @return E_OK if the descriptor was added, E_NON_EXISTENT if the fd is not valid - */ -am_Error_e CAmSocketHandler::addFDPoll(const int fd, const short event, IAmShPollPrepare *prepare, IAmShPollFired *fired, IAmShPollCheck *check, IAmShPollDispatch *dispatch, void *userData, sh_pollHandle_t & handle) -{ - if (!fdIsValid(fd)) - return (E_NON_EXISTENT); - - sh_poll_s pollData; - pollData.pollfdValue.fd = fd; - pollData.handle = ++mLastInsertedPollHandle; - pollData.pollfdValue.events = event; - pollData.pollfdValue.revents = 0; - pollData.userData = userData; - pollData.prepareCB = prepare; - pollData.firedCB = fired; - pollData.checkCB = check; - pollData.dispatchCB = dispatch; - - //add new data to the list - mListPoll.push_back(pollData); - - mRecreatePollfds = true; - - handle = pollData.handle; - return (E_OK); -} - -/** - * removes a filedescriptor from the poll loop - * @param handle - * @return - */ -am_Error_e CAmSocketHandler::removeFDPoll(const sh_pollHandle_t handle) -{ - mListPoll_t::iterator iterator = mListPoll.begin(); - - for (; iterator != mListPoll.end(); ++iterator) - { - if (iterator->handle == handle) - { - iterator = mListPoll.erase(iterator); - mRecreatePollfds = true; - return (E_OK); - } - } - return (E_UNKNOWN); -} - -/** - * adds a timer to the list of timers. The callback will be fired when the timer is up. - * This is not a high precise timer, it is very coarse. It is meant to be used for timeouts when waiting - * for an answer via a filedescriptor. - * One time timer. If you need again a timer, you need to add a new timer in the callback of the old one. - * @param timeouts timeouts time until the callback is fired - * @param callback callback the callback - * @param handle handle the handle that is created for the timer is returned. Can be used to remove the timer - * @param userData pointer always passed with the call - * @return E_OK in case of success - */ -am_Error_e CAmSocketHandler::addTimer(const timespec timeouts, IAmShTimerCallBack* callback, sh_timerHandle_t& handle, void * userData) -{ - assert(!((timeouts.tv_sec==0) && (timeouts.tv_nsec==0))); - assert(callback!=NULL); - - sh_timer_s timerItem; - - //create a new handle for the timer - handle = ++mLastInsertedHandle; //todo: overflow ruling !o - timerItem.handle = handle; - timerItem.countdown = timeouts; - timerItem.callback = callback; - timerItem.userData = userData; - - mListTimer.push_back(timerItem); - - //we add here the time difference between startTime and currenttime, because this time will be substracted later on in timecorrection - timespec currentTime; - clock_gettime(CLOCK_MONOTONIC, ¤tTime); - if (!mDispatchDone) //the mainloop is started - timerItem.countdown = timespecAdd(timeouts, timespecSub(currentTime, mStartTime)); - - mListActiveTimer.push_back(timerItem); - mListActiveTimer.sort(compareCountdown); - return (E_OK); -} - -/** - * removes a timer from the list of timers - * @param handle the handle to the timer - * @return E_OK in case of success, E_UNKNOWN if timer was not found. - */ -am_Error_e CAmSocketHandler::removeTimer(const sh_timerHandle_t handle) -{ - assert(handle!=0); - - //stop the current timer - stopTimer(handle); - - std::list<sh_timer_s>::iterator it(mListTimer.begin()); - for (; it != mListTimer.end(); ++it) - { - if (it->handle == handle) - { - it = mListTimer.erase(it); - return (E_OK); - } - } - return (E_UNKNOWN); -} - -/** - * restarts a timer and updates with a new interva - * @param handle handle to the timer - * @param timeouts new timout time - * @return E_OK on success, E_NON_EXISTENT if the handle was not found - */ -am_Error_e CAmSocketHandler::updateTimer(const sh_timerHandle_t handle, const timespec timeouts) -{ - //update the mList .... - sh_timer_s timerItem; - std::list<sh_timer_s>::iterator it(mListTimer.begin()), activeIt(mListActiveTimer.begin()); - bool found(false); - for (; it != mListTimer.end(); ++it) - { - if (it->handle == handle) - { - it->countdown = timeouts; - timerItem = *it; - found = true; - break; - } - } - if (!found) - return (E_NON_EXISTENT); - - found = false; - - //we add here the time difference between startTime and currenttime, because this time will be substracted later on in timecorrection - timespec currentTime, timeoutsCorrected; - currentTime.tv_nsec=timeoutsCorrected.tv_nsec=0; - currentTime.tv_sec=timeoutsCorrected.tv_sec=0; - clock_gettime(CLOCK_MONOTONIC, ¤tTime); - if (!mDispatchDone) //the mainloop is started - timeoutsCorrected = timespecAdd(timeouts, timespecSub(currentTime, mStartTime)); - - for (; activeIt != mListActiveTimer.end(); ++activeIt) - { - if (activeIt->handle == handle) - { - activeIt->countdown = timeoutsCorrected; - found = true; - break; - } - } - - if (!found) - timerItem.countdown = timeoutsCorrected; - mListActiveTimer.push_back(timerItem); - - mListActiveTimer.sort(compareCountdown); - return (E_OK); -} - -/** - * restarts a timer with the original value - * @param handle - * @return E_OK on success, E_NON_EXISTENT if the handle was not found - */ -am_Error_e CAmSocketHandler::restartTimer(const sh_timerHandle_t handle) -{ - sh_timer_s timerItem; //!<the original timer value - //find the original value - std::list<sh_timer_s>::iterator it(mListTimer.begin()), activeIt(mListActiveTimer.begin()); - bool found(false); - for (; it != mListTimer.end(); ++it) - { - if (it->handle == handle) - { - timerItem = *it; - found = true; - break; - } - } - if (!found) - return (E_NON_EXISTENT); - - found = false; - - //we add here the time difference between startTime and currenttime, because this time will be substracted later on in timecorrection - timespec currentTime, timeoutsCorrected; - clock_gettime(CLOCK_MONOTONIC, ¤tTime); - if (!mDispatchDone) //the mainloop is started - { - timeoutsCorrected = timespecAdd(timerItem.countdown, timespecSub(currentTime, mStartTime)); - timerItem.countdown = timeoutsCorrected; - } - - for (; activeIt != mListActiveTimer.end(); ++activeIt) - { - if (activeIt->handle == handle) - { - activeIt->countdown = timerItem.countdown; - found = true; - break; - } - } - - if (!found) - mListActiveTimer.push_back(timerItem); - - mListActiveTimer.sort(compareCountdown); - - return (E_OK); -} - -/** - * stops a timer - * @param handle - * @return E_OK on success, E_NON_EXISTENT if the handle was not found - */ -am_Error_e CAmSocketHandler::stopTimer(const sh_timerHandle_t handle) -{ - //go through the list and remove the timer with the handle - std::list<sh_timer_s>::iterator it(mListActiveTimer.begin()); - for (; it != mListActiveTimer.end(); ++it) - { - if (it->handle == handle) - { - it = mListActiveTimer.erase(it); - return (E_OK); - } - } - return (E_NON_EXISTENT); -} - -/** - * updates the eventFlags of a poll - * @param handle - * @param events - * @return @return E_OK on succsess, E_NON_EXISTENT if fd was not found - */ -am_Error_e CAmSocketHandler::updateEventFlags(const sh_pollHandle_t handle, const short events) -{ - mListPoll_t::iterator iterator = mListPoll.begin(); - - for (; iterator != mListPoll.end(); ++iterator) - { - if (iterator->handle == handle) - { - iterator->pollfdValue.events = events; - mRecreatePollfds = true; - return (E_OK); - } - } - return (E_UNKNOWN); -} - -/** - * checks if a filedescriptor is validCAmShSubstractTime - * @param fd the filedescriptor - * @return true if the fd is valid - */ -bool CAmSocketHandler::fdIsValid(const int fd) const -{ - return (fcntl(fd, F_GETFL) != -1 || errno != EBADF); -} - -/** - * timer is up. - */ -void CAmSocketHandler::timerUp() -{ - //find out the timedifference to starttime - timespec currentTime, diffTime; - clock_gettime(CLOCK_MONOTONIC, ¤tTime); - diffTime = timespecSub(currentTime, mStartTime); - - //now we need to substract the diffTime from all timers and see if they are up - std::list<sh_timer_s>::reverse_iterator overflowIter = std::find_if(mListActiveTimer.rbegin(), mListActiveTimer.rend(), CAmShCountdownUp(diffTime)); - - //copy all fired timers into a list - std::vector<sh_timer_s> tempList(overflowIter, mListActiveTimer.rend()); - - //erase all fired timers - std::list<sh_timer_s>::iterator it(overflowIter.base()); - mListActiveTimer.erase(mListActiveTimer.begin(), it); - - //call the callbacks for the timers - std::for_each(tempList.begin(), tempList.end(), CAmShCallTimer()); -} - -/** - * correct timers and fire the ones who are up - */ -void CAmSocketHandler::timerCorrection() -{ - //get the current time and calculate the correction value - timespec currentTime, correctionTime; - clock_gettime(CLOCK_MONOTONIC, ¤tTime); - correctionTime = timespecSub(currentTime, mStartTime); - mStartTime = currentTime; - - if (!mListActiveTimer.empty()) - { - - //subtract the correction value from all items in the list - std::for_each(mListActiveTimer.begin(), mListActiveTimer.end(), CAmShSubstractTime(correctionTime)); - - //find the last occurrence of zero -> timer overflowed - std::list<sh_timer_s>::reverse_iterator overflowIter = std::find_if(mListActiveTimer.rbegin(), mListActiveTimer.rend(), CAmShCountdownZero()); - - //only if a timer overflowed - if (overflowIter != mListActiveTimer.rend()) - { - //copy all timers that need to be called to a new list - std::vector<sh_timer_s> tempList(overflowIter, mListActiveTimer.rend()); - - //erase all fired timers - std::list<sh_timer_s>::iterator it(overflowIter.base()); - mListActiveTimer.erase(mListActiveTimer.begin(), it); - - //call the callbacks for the timers - std::for_each(tempList.begin(), tempList.end(), CAmShCallTimer()); - } - } -} - -void CAmSocketHandler::exit_mainloop() -{ - //end the while loop - stop_listening(); - - //fire the ending filedescriptor - int p(1); - write(mPipe[1], &p, sizeof(p)); -} - -/** - * is used to set the pointer for the ppoll command - * @param buffertime - * @return - */ -inline timespec* CAmSocketHandler::insertTime(timespec& buffertime) -{ - if (!mListActiveTimer.empty()) - { - buffertime = mListActiveTimer.front().countdown; - return (&buffertime); - } - else - { - return (NULL); - } -} - -} - diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp index 1fb3ddf..f2fe095 100644 --- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp +++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Frank Herchet, frank.fh.herchet@bmw.de BMW 2012 * * \file CAmTelnetMenuHelper.cpp @@ -32,7 +32,7 @@ #include "CAmRoutingReceiver.h" #include "CAmCommandReceiver.h" #include "CAmControlReceiver.h" -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" static const std::string COLOR_WELCOME("\033[1;33m\033[44m"); static const std::string COLOR_HEAD("\033[1m\033[42m"); diff --git a/AudioManagerDaemon/src/CAmTelnetServer.cpp b/AudioManagerDaemon/src/CAmTelnetServer.cpp index 3212ea7..4ae7420 100755 --- a/AudioManagerDaemon/src/CAmTelnetServer.cpp +++ b/AudioManagerDaemon/src/CAmTelnetServer.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Frank Herchet, frank.fh.herchet@bmw.de BMW 2012 * * \file CAmTelnetServer.cpp @@ -38,7 +38,7 @@ #include <cstdlib> #include "CAmRoutingSender.h" #include "CAmTelnetMenuHelper.h" -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" namespace am { diff --git a/AudioManagerDaemon/src/CAmWatchdog.cpp b/AudioManagerDaemon/src/CAmWatchdog.cpp index db34009..874696e 100755 --- a/AudioManagerDaemon/src/CAmWatchdog.cpp +++ b/AudioManagerDaemon/src/CAmWatchdog.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * \file CAmWatchdog.cpp * For further information see http://www.genivi.org/. @@ -24,7 +24,7 @@ #include <cstdlib> #include <stdexcept> #include "config.h" -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" #ifdef SYSTEMD_FOUND #include <systemd/sd-daemon.h> diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index c6d212e..b8a0688 100755 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Frank Herchet, frank.fh.herchet@bmw.de BMW 2012 * * \file main.cpp @@ -34,10 +34,10 @@ #endif #ifdef WITH_CAPI_WRAPPER - #include "shared/CAmCommonAPIWrapper.h" + #include "CAmCommonAPIWrapper.h" #else #ifdef WITH_DBUS_WRAPPER - #include "shared/CAmDbusWrapper.h" + #include "CAmDbusWrapper.h" #endif #endif @@ -79,8 +79,8 @@ #include "CAmCommandReceiver.h" #include "CAmControlReceiver.h" #include "CAmDatabaseObserver.h" -#include "shared/CAmDltWrapper.h" -#include "shared/CAmSocketHandler.h" +#include "CAmDltWrapper.h" +#include "CAmSocketHandler.h" using namespace am; diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp index 2dd059f..b20a4f7 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -23,7 +23,7 @@ #include <string> #include <vector> #include <set> -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" using namespace am; using namespace testing; @@ -32,7 +32,6 @@ DLT_DECLARE_CONTEXT(AudioManager) CAmControlInterfaceTest::CAmControlInterfaceTest() : pSocketHandler(), // - pDBusWrapper((CAmDbusWrapper*) 1), // plistCommandPluginDirs(), // plistRoutingPluginDirs(), // pDatabaseHandler(), // @@ -47,7 +46,7 @@ CAmControlInterfaceTest::CAmControlInterfaceTest() : pRouter(&pDatabaseHandler,&pControlSender), // pDatabaseObserver(&pCommandSender, &pRoutingSender, &pSocketHandler), // pControlReceiver(&pDatabaseHandler, &pRoutingSender, &pCommandSender, &pSocketHandler, &pRouter), // - pRoutingReceiver(&pDatabaseHandler, &pRoutingSender, &pControlSender, &pSocketHandler, pDBusWrapper) + pRoutingReceiver(&pDatabaseHandler, &pRoutingSender, &pControlSender, &pSocketHandler) { CAmDltWrapper::instance(0)->registerApp("AudioManagerDeamon", "AudioManagerDeamon"); CAmDltWrapper::instance()->registerContext(AudioManager, "Main", "Main Context"); diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h index 861b9ac..92ebb4f 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -38,8 +38,7 @@ #include "../CAmCommonFunctions.h" #include "../MockIAmRoutingSend.h" #include "../MockIAmControlSend.h" -#include "shared/CAmSocketHandler.h" -#include "shared/CAmDbusWrapper.h" +#include "CAmSocketHandler.h" namespace am { @@ -50,7 +49,6 @@ public: CAmControlInterfaceTest(); ~CAmControlInterfaceTest(); CAmSocketHandler pSocketHandler; - CAmDbusWrapper* pDBusWrapper; std::vector<std::string> plistCommandPluginDirs; std::vector<std::string> plistRoutingPluginDirs; CAmDatabaseHandlerMap pDatabaseHandler; diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt index a2238b1..33a2f8b 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt @@ -7,88 +7,82 @@ # # copyright # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +# Mozilla Public License, v. 2.0. if a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmControlInterfaceTest) +project(AmControlInterfaceTest) -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") -FIND_PACKAGE(PkgConfig) -IF(WITH_DATABASE_STORAGE) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) + +if(WITH_DATABASE_STORAGE) pkg_check_modules(SQLITE REQUIRED sqlite3) -ENDIF(WITH_DATABASE_STORAGE) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${SQLITE_LIBRARIES}) +endif(WITH_DATABASE_STORAGE) -IF(WITH_DLT) +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} - ${CMAKE_SOURCE_DIR} ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} - ${GMOCK_INCLUDE_DIR} -) + ${GMOCK_INCLUDE_DIR}) + +if(WITH_DLT) + INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) +endif(WITH_DLT) + file(GLOB CONTROL_INTERFACE_SRCS_CXX - "../../src/CAmDatabaseHandlerMap.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmControlReceiver.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" "../CAmCommonFunctions.cpp" "*.cpp" ) -IF(WITH_NSM) - SET (CONTROL_INTERFACE_SRCS_CXX - ${CONTROL_INTERFACE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") -ENDIF(WITH_NSM) - -ADD_EXECUTABLE(AmControlInterfaceTest ${CONTROL_INTERFACE_SRCS_CXX}) +add_executable(AmControlInterfaceTest ${CONTROL_INTERFACE_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmControlInterfaceTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} + ${AM_LINK_LIBS} gtest - gmock -) + gmock) ADD_DEPENDENCIES(AmControlInterfaceTest gtest gmock) INSTALL(TARGETS AmControlInterfaceTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests -) - -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") + COMPONENT tests) diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp index 85a4c44..e5f9745 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -23,7 +23,7 @@ #include <string> #include <vector> #include <set> -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" using namespace am; using namespace testing; diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h index b23aba4..3ebd156 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -38,7 +38,7 @@ #include "../CAmCommonFunctions.h" #include "../MockIAmControlSend.h" #include "../MockIAmCommandSend.h" -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" namespace am { diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt index 99dd576..85741d8 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt @@ -7,87 +7,87 @@ # # copyright # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +# Mozilla Public License, v. 2.0. if a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmDatabaseHandlerTest) +project(AmDatabaseHandlerTest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") +#only build this test if sqlite is requested +if(WITH_DATABASE_STORAGE) -FIND_PACKAGE(PkgConfig) -IF(WITH_DATABASE_STORAGE) + set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) + pkg_check_modules(SQLITE REQUIRED sqlite3) -IF(WITH_DLT) - pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) - -INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} - ${CMAKE_SOURCE_DIR} - ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} - ${INCLUDE_FOLDER} - ${GOOGLE_TEST_INCLUDE_DIR} - ${GMOCK_INCLUDE_DIR} -) - -file(GLOB DATABASE_SRCS_CXX - "../../src/CAmDatabaseHandlerSQLite.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmControlReceiver.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmDbusWrapper.cpp" - "../CAmCommonFunctions.cpp" - "*.cpp" + if(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) + endif(WITH_DLT) + + INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_BINARY_DIR} + ${AUDIO_INCLUDE_FOLDER} + ${CMAKE_SOURCE_DIR} + ${STD_INCLUDE_DIRS} + ${INCLUDE_FOLDER} + ${GOOGLE_TEST_INCLUDE_DIR} + ${GMOCK_INCLUDE_DIR} ) -IF(WITH_NSM) - SET (DATABASE_SRCS_CXX - ${DATABASE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") -ENDIF(WITH_NSM) - -ADD_EXECUTABLE( AmDatabaseHandlerTest ${DATABASE_SRCS_CXX}) - -TARGET_LINK_LIBRARIES( AmDatabaseHandlerTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} - gtest - gmock -) - -ADD_DEPENDENCIES(AmDatabaseHandlerTest gtest gmock) - -INSTALL(TARGETS AmDatabaseHandlerTest - DESTINATION "~/AudioManagerTest/" - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests -) - -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") -ENDIF(WITH_DATABASE_STORAGE) + if(WITH_DLT) + INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) + endif(WITH_DLT) + + file(GLOB DATABASE_SRCS_CXX + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerSQLite.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "../CAmCommonFunctions.cpp" + "*.cpp" + ) + + + ADD_EXECUTABLE( AmDatabaseHandlerTest ${DATABASE_SRCS_CXX}) + + TARGET_LINK_LIBRARIES( AmDatabaseHandlerTest + ${AM_LINK_LIBS} + ${SQLITE_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ${CMAKE_DL_LIBS} + gtest + gmock + ) + + ADD_DEPENDENCIES(AmDatabaseHandlerTest gtest gmock) + + INSTALL(TARGETS AmDatabaseHandlerTest + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ + COMPONENT tests + ) + +endif(WITH_DATABASE_STORAGE) diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp index df72f2d..3ad5713 100644 --- a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 * * For further information see http://www.genivi.org/. @@ -25,7 +25,7 @@ #include <vector> #include <set> #include <ios> -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" using namespace am; using namespace testing; diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.h b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.h index f35aa0b..ae9b0f1 100644 --- a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.h +++ b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 * * For further information see http://www.genivi.org/. @@ -27,7 +27,7 @@ #include "gtest/gtest.h" #include "gmock/gmock.h" -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" #include "CAmDatabaseHandlerMap.h" #include "CAmControlReceiver.h" #include "CAmControlSender.h" diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt index 0381966..b4555e1 100644 --- a/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt @@ -7,73 +7,67 @@ # # copyright # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +# Mozilla Public License, v. 2.0. if a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmMapHandlerTest) +project(AmMapHandlerTest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") - -FIND_PACKAGE(PkgConfig) -#pkg_check_modules(SQLITE REQUIRED sqlite3) - -IF(WITH_DLT) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) + +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ) +if(WITH_DLT) + INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) +endif(WITH_DLT) + file(GLOB DATABASE_SRCS_CXX - "../../src/CAmDatabaseHandlerMap.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmControlReceiver.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" "../CAmCommonFunctions.cpp" "CAmTestDatabaseObserver.cpp" "*.cpp" ) -IF(WITH_NSM) - IF(WITH_DBUS_WRAPPER) - SET (DATABASE_SRCS_CXX - ${DATABASE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") - ENDIF() -ENDIF(WITH_NSM) - ADD_EXECUTABLE( AmMapHandlerTest ${DATABASE_SRCS_CXX}) TARGET_LINK_LIBRARIES( AmMapHandlerTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} + ${AM_LINK_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} gtest @@ -83,11 +77,8 @@ TARGET_LINK_LIBRARIES( AmMapHandlerTest ADD_DEPENDENCIES(AmMapHandlerTest gtest gmock) INSTALL(TARGETS AmMapHandlerTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.cpp b/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.cpp index e41e556..6eaf75a 100644 --- a/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.cpp +++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.cpp @@ -20,8 +20,8 @@ */ #include "CAmNodeStateCommunicatorTest.h" -#include "shared/CAmDltWrapper.h" -#include "shared/CAmSocketHandler.h" +#include "CAmDltWrapper.h" +#include "CAmSocketHandler.h" #include <unistd.h> diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.h b/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.h index c6a9a5a..d86b9c5 100644 --- a/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.h +++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CAmNodeStateCommunicatorTest.h @@ -29,7 +29,7 @@ #include "gmock/gmock.h" #include "../IAmControlBackdoor.h" #include "../MockIAmControlSend.h" -#include "shared/CAmCommonAPIWrapper.h" +#include "CAmCommonAPIWrapper.h" using namespace testing; using namespace am; diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CMakeLists.txt b/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CMakeLists.txt index 3a58b24..018d71a 100644 --- a/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorCAPITest/CMakeLists.txt @@ -15,71 +15,66 @@ # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmNodeStateCommunicatorCAPITest) +project(AmNodeStateCommunicatorCAPITest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1") -set(STD_INCLUDE_DIRS "/usr/include") +find_package(Threads) +find_package(CommonAPI REQUIRED) +find_package(PythonLibs REQUIRED) -set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH}) - -FIND_PACKAGE(Threads) -FIND_PACKAGE(PkgConfig) -FIND_PACKAGE(CommonAPI REQUIRED) -IF(WITH_DATABASE_STORAGE) - pkg_check_modules(SQLITE REQUIRED sqlite3) -ENDIF(WITH_DATABASE_STORAGE) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) -IF(WITH_DLT) - pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) +if(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( - ${STD_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${CMAKE_SOURCE_DIR} - ${DLT_INCLUDE_DIRS} - ${INCLUDE_FOLDER} ${PYTHON_INCLUDE_DIRS} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} - "../../include" ${COMMON_API_INCLUDE_DIRS} ${COMMON_API_DBUS_INCLUDE_DIRS} ${COMMON_API_GEN_INCLUDE_DIR} ) +if(WITH_DLT) +INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) +endif(WITH_DLT) + -file(GLOB NODESTATECOMMUNICATORCAPI - "../../src/CAmDatabaseHandler.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmCommonAPIWrapper.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmNodeStateCommunicatorCAPI.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmCommandReceiver.cpp" - "../CAmCommonFunctions.cpp" - "../../src/CAmRouter.cpp" - "*.cpp" - ${COMMON_API_GEN_SOURCES} - ) - -CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/fidls/AudioManager_dbus.conf.in ${CMAKE_BINARY_DIR}/AmNodeStateCommunicatorCAPITest_dbus.conf) - -ADD_EXECUTABLE(AmNodeStateCommunicatorCAPITest ${NODESTATECOMMUNICATORCAPI} ${COMMON_API_GEN_SOURCES}) +file(GLOB NODESTATECOMMUNICATORCAPI_SRCS_CXX + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmNodeStateCommunicatorCAPI.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmCommonAPIWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "../CAmCommonFunctions.cpp" + "*.cpp") + +ADD_EXECUTABLE(AmNodeStateCommunicatorCAPITest ${NODESTATECOMMUNICATORCAPI_SRCS_CXX} ${COMMON_API_GEN_SOURCES}) TARGET_LINK_LIBRARIES(AmNodeStateCommunicatorCAPITest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${CMAKE_DL_LIBS} + ${AM_LINK_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${PYTHON_LIBRARY} ${COMMON_API_LIBRARIES} @@ -91,7 +86,7 @@ TARGET_LINK_LIBRARIES(AmNodeStateCommunicatorCAPITest ADD_DEPENDENCIES(AmNodeStateCommunicatorCAPITest gtest gmock) INSTALL(TARGETS AmNodeStateCommunicatorCAPITest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) @@ -100,20 +95,17 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.genivi.NodeStateManager.Consumer.xml ${CMAKE_CURRENT_SOURCE_DIR}/nsm.py ${CMAKE_CURRENT_SOURCE_DIR}/send2nsm.py - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -IF(USE_BUILD_LIBS) +if(USE_BUILD_LIBS) execute_process( COMMAND mkdir -p ${EXECUTABLE_OUTPUT_PATH} COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/org.genivi.NodeStateManager.Consumer.xml" ${EXECUTABLE_OUTPUT_PATH}/org.genivi.NodeStateManager.Consumer.xml COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/nsm.py" ${EXECUTABLE_OUTPUT_PATH}/nsm.py COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/send2nsm.py" ${EXECUTABLE_OUTPUT_PATH}/send2nsm.py - COMMAND cp "${CMAKE_BINARY_DIR}/AmNodeStateCommunicatorCAPITest_dbus.conf" ${EXECUTABLE_OUTPUT_PATH}) -ENDIF(USE_BUILD_LIBS) - -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "gtest" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") + COMMAND cp "${AUDIOMANAGER_DAEMON_FOLDER}/fidls/NodeStateManager_dbus.conf" ${EXECUTABLE_OUTPUT_PATH}/AmNodeStateCommunicatorCAPITest_dbus.conf) +endif(USE_BUILD_LIBS) diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CAmNodeStateCommunicatorTest.cpp b/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CAmNodeStateCommunicatorTest.cpp index 09e5f2b..df42fc1 100644 --- a/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CAmNodeStateCommunicatorTest.cpp +++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CAmNodeStateCommunicatorTest.cpp @@ -20,9 +20,9 @@ */ #include "CAmNodeStateCommunicatorTest.h" -#include "shared/CAmDltWrapper.h" -#include "shared/CAmSocketHandler.h" -#include "shared/CAmDbusWrapper.h" +#include "CAmDltWrapper.h" +#include "CAmSocketHandler.h" +#include "CAmDbusWrapper.h" #include <unistd.h> diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CMakeLists.txt b/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CMakeLists.txt index 242aff4..29e0e4e 100644 --- a/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorDBusTest/CMakeLists.txt @@ -15,70 +15,63 @@ # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmNodeStateCommunicatorDBusTest) +project(AmNodeStateCommunicatorDBusTest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1") -set(STD_INCLUDE_DIRS "/usr/include") -set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH}) - -FIND_PACKAGE(Threads) -FIND_PACKAGE(DBUS REQUIRED) -FIND_PACKAGE(PkgConfig) -IF(WITH_DATABASE_STORAGE) - pkg_check_modules(SQLITE REQUIRED sqlite3) -ENDIF(WITH_DATABASE_STORAGE) +find_package(Threads) +find_package(CommonAPI REQUIRED) +find_package(PythonLibs REQUIRED) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) -IF(WITH_DLT) - pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) +if(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( - ${STD_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} - ${CMAKE_SOURCE_DIR} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} - ${INCLUDE_FOLDER} ${PYTHON_INCLUDE_DIRS} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} - "../../include" + ${DBUS_ARCH_INCLUDE_DIR} + ${DBUS_INCLUDE_FOLDER} ) - + file(GLOB NODESTATECOMMUNICATOR - "../../src/CAmDatabaseHandler.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmDbusWrapper.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmNodeStateCommunicatorDBus.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmCommandReceiver.cpp" - "../CAmCommonFunctions.cpp" - "../../src/CAmRouter.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmNodeStateCommunicatorDBus.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "../CAmCommonFunctions.cpp" "*.cpp" ) ADD_EXECUTABLE(AmNodeStateCommunicatorDBusTest ${NODESTATECOMMUNICATOR}) -TARGET_LINK_LIBRARIES(AmNodeStateCommunicatorDBusTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_DL_LIBS} +TARGET_LINK_LIBRARIES(AmNodeStateCommunicatorCAPITest + ${AM_LINK_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${PYTHON_LIBRARY} + ${COMMON_API_LIBRARIES} + ${COMMON_API_DBUS_LIBRARIES} gtest gmock ) @@ -86,7 +79,7 @@ TARGET_LINK_LIBRARIES(AmNodeStateCommunicatorDBusTest ADD_DEPENDENCIES(AmNodeStateCommunicatorDBusTest gtest gmock) INSTALL(TARGETS AmNodeStateCommunicatorDBusTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) @@ -95,7 +88,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.genivi.NodeStateManager.Consumer.xml ${CMAKE_CURRENT_SOURCE_DIR}/nsm.py ${CMAKE_CURRENT_SOURCE_DIR}/send2nsm.py - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) @@ -108,6 +101,3 @@ IF(USE_BUILD_LIBS) COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/send2nsm.py" ${EXECUTABLE_OUTPUT_PATH}/send2nsm.py) ENDIF(USE_BUILD_LIBS) -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "gtest" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - diff --git a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.cpp b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.cpp index a6680e5..6481a59 100644 --- a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.cpp +++ b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.cpp @@ -20,7 +20,7 @@ #include "CAmRouterMapTest.h" #include <string.h> -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" using namespace am; diff --git a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h index 19bccfe..5b86e1a 100644 --- a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h +++ b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h @@ -36,7 +36,7 @@ #include "CAmDatabaseObserver.h" #include "CAmRoutingSender.h" #include "CAmRouter.h" -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" #include "../IAmControlBackdoor.h" #include "../IAmCommandBackdoor.h" #include "../CAmCommonFunctions.h" diff --git a/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt index 2209f40..e870e20 100644 --- a/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt @@ -10,80 +10,65 @@ # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmRouterMapTest) +project (AmRouterMapTest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") - -FIND_PACKAGE(PkgConfig) - -IF(WITH_DLT) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) + +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} - ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ) file(GLOB ROUTINGMAP_SRCS_CXX - "../../src/CAmDatabaseHandlerMap.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmControlReceiver.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" "../CAmCommonFunctions.cpp" "*.cpp" ) -IF(WITH_NSM) - SET (DATABASE_SRCS_CXX - ${DATABASE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") -ENDIF(WITH_NSM) - ADD_EXECUTABLE( AmRouterMapTest ${ROUTINGMAP_SRCS_CXX}) -TARGET_LINK_LIBRARIES( AmRouterMapTest - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} +TARGET_LINK_LIBRARIES(AmRouterMapTest + ${AM_LINK_LIBS} gtest - gmock -) + gmock) ADD_DEPENDENCIES(AmRouterMapTest gtest gmock) INSTALL(TARGETS AmRouterMapTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - diff --git a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp index f6f523f..dc6871a 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp +++ b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp @@ -20,7 +20,7 @@ #include "CAmRouterTest.h" #include <string.h> -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" using namespace am; using namespace testing; diff --git a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h index ee66bf3..fd0c15a 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h +++ b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h @@ -36,7 +36,7 @@ #include "CAmDatabaseObserver.h" #include "CAmRoutingSender.h" #include "CAmRouter.h" -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" #include "../IAmControlBackdoor.h" #include "../IAmCommandBackdoor.h" #include "../CAmCommonFunctions.h" diff --git a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt index 7a7b890..b19f6f1 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt @@ -7,84 +7,68 @@ # # copyright # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +# Mozilla Public License, v. 2.0. if a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmRouterTest) +project(AmRouterTest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) -FIND_PACKAGE(PkgConfig) - -IF(WITH_DLT) +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} - ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ) file(GLOB ROUTING_SRCS_CXX - "../../src/CAmDatabaseHandlerMap.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmControlReceiver.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" "../CAmCommonFunctions.cpp" "*.cpp" ) -IF(WITH_NSM) - SET (DATABASE_SRCS_CXX - ${DATABASE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") -ENDIF(WITH_NSM) - ADD_EXECUTABLE( AmRouterTest ${ROUTING_SRCS_CXX}) -TARGET_LINK_LIBRARIES( AmRouterTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} +TARGET_LINK_LIBRARIES(AmRouterTest + ${AM_LINK_LIBS} gtest - gmock -) + gmock) ADD_DEPENDENCIES(AmRouterTest gtest gmock) INSTALL(TARGETS AmRouterTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp index ea94f7b..9eca986 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp @@ -12,14 +12,14 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * */ #include "CAmRoutingInterfaceTest.h" -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" using namespace am; using namespace testing; diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h index c354f75..ec30bfb 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -36,7 +36,7 @@ #include "../IAmCommandBackdoor.h" #include "../CAmCommonFunctions.h" #include "../MockIAmRoutingSend.h" -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" namespace am { diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt index b9aa9c5..6294f7d 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt @@ -10,84 +10,74 @@ # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmRoutingInterfaceTest) +project (AmRoutingInterfaceTest) -#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") +find_package(PkgConfig) -FIND_PACKAGE(PkgConfig) - -IF(WITH_DLT) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) + +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ) + +if(WITH_DLT) + INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) +endif(WITH_DLT) file(GLOB ROUTING_INTERFACE_SRCS_CXX - "../../src/CAmControlReceiver.cpp" - "../../src/CAmDatabaseHandlerMap.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmControlSender.cpp" - "../CAmCommonFunctions.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "../CAmCommonFunctions.cpp" "*.cpp" ) -IF(WITH_NSM) - SET (DATABASE_SRCS_CXX - ${DATABASE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") -ENDIF(WITH_NSM) - ADD_EXECUTABLE(AmRoutingInterfaceTest ${ROUTING_INTERFACE_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmRoutingInterfaceTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} + ${AM_LINK_LIBS} gtest - gmock -) + gmock) ADD_DEPENDENCIES(AmRoutingInterfaceTest gtest gmock) INSTALL(TARGETS AmRoutingInterfaceTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - - - diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp index d357d80..1b28326 100644 --- a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -28,7 +28,7 @@ #include <fcntl.h> #include <sys/un.h> #include <sys/poll.h> -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" //todo: expand test, implement more usecases //todo: test removeFD diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h index 3866fa8..aea5fb1 100644 --- a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h +++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * @@ -21,9 +21,11 @@ #ifndef SOCKETHANDLERTEST_H_ #define SOCKETHANDLERTEST_H_ +#define WITH_DLT + #include "gtest/gtest.h" #include <queue> -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" namespace am { diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt index 1d02636..8cd4197 100644 --- a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt @@ -10,71 +10,64 @@ # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmSocketHandlerTest) +project(AmSocketHandlerTest) -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") -set(STD_INCLUDE_DIRS "/usr/include") -set(DBUS_FOLDER ${CMAKE_SOURCE_DIR}/../../../dbusInterfaces) -set(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../include) -set(DBUS_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude) -set(INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../include) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) - -FIND_PACKAGE(PkgConfig) - -IF(WITH_DLT) +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) + INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} - ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} + ${AUDIOMANAGER_UTILITIES_INCLUDE} ${GMOCK_INCLUDE_DIR} ) + +if(WITH_DLT) + INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) +endif(WITH_DLT) file(GLOB Socket_SRCS_CXX - "../../src/CAmSocketHandler.cpp" - "../../src/CAmDltWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" "*.cpp" ) ADD_EXECUTABLE(AmSocketHandlerTest ${Socket_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmSocketHandlerTest - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} + ${AM_LINK_LIBS} gtest - gmock - rt -) + gmock) ADD_DEPENDENCIES(AmSocketHandlerTest gtest gmock) INSTALL(TARGETS AmSocketHandlerTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp index e940423..1d677ad 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Frank Herchet, frank.fh.herchet@bmw.de BMW 2012 * * For further information see http://www.genivi.org/. @@ -57,7 +57,6 @@ CAmEnvironment::CAmEnvironment() , mDatabasehandler() , mRoutingSender(mlistRoutingPluginDirs) , mCommandSender(mlistRoutingPluginDirs) -, mControlSender(controllerPlugin,&mSocketHandler) , mRouter(&mDatabasehandler,&mControlSender) , mpCommandReceiver(NULL) , mpRoutingReceiver(NULL) @@ -102,12 +101,12 @@ void CAmEnvironment::setSocketHandler(CAmSocketHandler* pSocketHandler) mpControlReceiver = new CAmControlReceiver(&mDatabasehandler,&mRoutingSender,&mCommandSender,mpSocketHandler,&mRouter); //startup all the Plugins and Interfaces - mControlSender.startupController(mpControlReceiver); - mCommandSender.startupInterfaces(mpCommandReceiver); - mRoutingSender.startupInterfaces(mpRoutingReceiver); + //mControlSender.startupController(mpControlReceiver); + //mCommandSender.startupInterfaces(mpCommandReceiver); + //mRoutingSender.startupInterfaces(mpRoutingReceiver); //when the routingInterface is done, all plugins are loaded: - mControlSender.setControllerReady(); + //mControlSender.setControllerReady(); // Starting TelnetServer mpTelnetServer = new CAmTelnetServer(mpSocketHandler,&mCommandSender,mpCommandReceiver,&mRoutingSender,mpRoutingReceiver,&mControlSender,mpControlReceiver,&mDatabasehandler,&mRouter,servPort,3); diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h index 6f4ab6a..2be89f5 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * \author Frank Herchet, frank.fh.herchet@bmw.de BMW 2012 * * For further information see http://www.genivi.org/. @@ -29,11 +29,7 @@ #include "CAmControlSender.h" #include "CAmRouter.h" #include "config.h" -#ifdef WITH_DATABASE_STORAGE - #include "CAmDatabaseHandlerSQLite.h" -#else - #include "CAmDatabaseHandlerMap.h" -#endif +#include "CAmDatabaseHandlerMap.h" @@ -72,11 +68,7 @@ class CAmEnvironment : public ::testing::Environment std::vector<std::string> mlistCommandPluginDirs; CAmSocketHandler mSocketHandler; -#ifdef WITH_DATABASE_STORAGE - CAmDatabaseHandlerSQLite mDatabasehandler; -#else CAmDatabaseHandlerMap mDatabasehandler; -#endif CAmRoutingSender mRoutingSender; CAmCommandSender mCommandSender; CAmControlSender mControlSender; diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt index 1dfa5c1..d613ed6 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt @@ -10,95 +10,74 @@ # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) PROJECT(AmTelnetServerTest) -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic") -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") - -set(STD_INCLUDE_DIRS "/usr/include") -set(DBUS_FOLDER ${CMAKE_SOURCE_DIR}/../../../dbusInterfaces) -set(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../include) -set(DBUS_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude) -set(INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../include) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") -FIND_PACKAGE(PkgConfig) -IF(WITH_DLT) +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} - ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ) + +if(WITH_DLT) +INCLUDE_DIRECTORIES( + ${INCLUDE_DIRECTORIES} + ${DLT_INCLUDE_DIRS}) +endif(WITH_DLT) file(GLOB TELNET_SRCS_CXX - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmControlReceiver.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmTelnetServer.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmTelnetMenuHelper.cpp" - "../../src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmTelnetServer.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmTelnetMenuHelper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" "*.cpp" ) -IF(WITH_DATABASE_STORAGE) - SET (TELNET_SRCS_CXX ${TELNET_SRCS_CXX} "../../src/CAmDatabaseHandlerSQLite.cpp") -ELSE(WITH_DATABASE_STORAGE) - SET (TELNET_SRCS_CXX ${TELNET_SRCS_CXX} "../../src/CAmDatabaseHandlerMap.cpp") -ENDIF(WITH_DATABASE_STORAGE) - -IF(WITH_NSM) - SET (DATABASE_SRCS_CXX - ${DATABASE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") -ENDIF(WITH_NSM) - ADD_EXECUTABLE(AmTelnetServerTest ${TELNET_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmTelnetServerTest - ${SQLITE_LIBRARIES} - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} + ${AM_LINK_LIBS} gtest - gmock -) + gmock) ADD_DEPENDENCIES(AmTelnetServerTest gtest gmock) INSTALL(TARGETS AmTelnetServerTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.cpp b/AudioManagerDaemon/test/CAmCommonFunctions.cpp index 5ab6aef..34012be 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.cpp +++ b/AudioManagerDaemon/test/CAmCommonFunctions.cpp @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.h b/AudioManagerDaemon/test/CAmCommonFunctions.h index ba152c3..1b25434 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.h +++ b/AudioManagerDaemon/test/CAmCommonFunctions.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/CMakeLists.txt b/AudioManagerDaemon/test/CMakeLists.txt index e0ae651..dceb22c 100644 --- a/AudioManagerDaemon/test/CMakeLists.txt +++ b/AudioManagerDaemon/test/CMakeLists.txt @@ -10,12 +10,12 @@ # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH}) diff --git a/AudioManagerDaemon/test/IAmCommandBackdoor.h b/AudioManagerDaemon/test/IAmCommandBackdoor.h index 5a01c06..33aef19 100644 --- a/AudioManagerDaemon/test/IAmCommandBackdoor.h +++ b/AudioManagerDaemon/test/IAmCommandBackdoor.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/IAmControlBackdoor.h b/AudioManagerDaemon/test/IAmControlBackdoor.h index 3a1edef..1c006f0 100644 --- a/AudioManagerDaemon/test/IAmControlBackdoor.h +++ b/AudioManagerDaemon/test/IAmControlBackdoor.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/IAmRoutingBackdoor.h b/AudioManagerDaemon/test/IAmRoutingBackdoor.h index 31cfded..f8bda2b 100644 --- a/AudioManagerDaemon/test/IAmRoutingBackdoor.h +++ b/AudioManagerDaemon/test/IAmRoutingBackdoor.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/MockIAmCommandSend.h b/AudioManagerDaemon/test/MockIAmCommandSend.h index 381f323..8d1c17f 100644 --- a/AudioManagerDaemon/test/MockIAmCommandSend.h +++ b/AudioManagerDaemon/test/MockIAmCommandSend.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/MockIAmControlSend.h b/AudioManagerDaemon/test/MockIAmControlSend.h index dc9bdc0..219a7f1 100644 --- a/AudioManagerDaemon/test/MockIAmControlSend.h +++ b/AudioManagerDaemon/test/MockIAmControlSend.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * diff --git a/AudioManagerDaemon/test/MockIAmRoutingSend.h b/AudioManagerDaemon/test/MockIAmRoutingSend.h index 6ebb94d..f995828 100644 --- a/AudioManagerDaemon/test/MockIAmRoutingSend.h +++ b/AudioManagerDaemon/test/MockIAmRoutingSend.h @@ -12,7 +12,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Christian Linke, christian.linke@bmw.de BMW 2011,2012 * * For further information see http://www.genivi.org/. * |