* [GAM-11] Merge branch 'dlt_dependency'

Conflicts:
	CMakeLists.txt
	cmake/config.cmake

2 files changed, 133 insertions, 17 deletions

diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt
index 8e5297c..beb1a74 100644
--- a/AudioManagerDaemon/CMakeLists.txt
+++ b/AudioManagerDaemon/CMakeLists.txt
@@ -70,12 +70,17 @@ ENDIF(WITH_SOCKETHANDLER_LOOP)
 
 INCLUDE_DIRECTORIES(	
 	${CMAKE_SOURCE_DIR} 
-	${CMAKE_CURRENT_BINARY_DIR}
-	${DLT_INCLUDE_DIRS}
+	${CMAKE_CURRENT_BINARY_DIR}	
 	${AUDIO_INCLUDES_FOLDER}
 	${INCLUDES_FOLDER}
 )
 
+IF(WITH_DLT)
+INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES}
+    ${DLT_INCLUDE_DIRS}
+)
+ENDIF(WITH_DLT)
+
 IF(WITH_DBUS_WRAPPER)
 INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES}
     ${DBUS_ARCH_INCLUDE_DIR}
@@ -86,18 +91,22 @@ ENDIF(WITH_DBUS_WRAPPER)
 ADD_EXECUTABLE(AudioManager ${AUDIOMAN_SRCS_CXX})
 
 IF(WITH_DBUS_WRAPPER)
-TARGET_LINK_LIBRARIES(AudioManager 
-	${SQLITE_LIBRARIES}
-	${DLT_LIBRARIES}
-	${DBUS_LIBRARY}
-)
+    TARGET_LINK_LIBRARIES(AudioManager 
+    	${SQLITE_LIBRARIES}
+    	${DBUS_LIBRARY}
+    )
 ELSE(WITH_DBUS_WRAPPER)
     TARGET_LINK_LIBRARIES(AudioManager 
         ${SQLITE_LIBRARIES}
-        ${DLT_LIBRARIES}
-)
+    )
 ENDIF(WITH_DBUS_WRAPPER)
 
+IF(WITH_DLT)
+    TARGET_LINK_LIBRARIES(AudioManager
+        ${DLT_LIBRARIES}
+    )
+ENDIF(WITH_DLT)  
+
 IF(WITH_TESTS)
 	add_subdirectory (test)
 ENDIF(WITH_TESTS)
@@ -123,9 +132,26 @@ INSTALL(DIRECTORY "${AUDIO_INCLUDES_FOLDER}/"
         COMPONENT dev
 )
 
-SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)")
-set_property(GLOBAL APPEND PROPERTY bin_prop "${ADD_DEPEND}")
+# General packet dependency
+SET(ADD_DEPEND_BIN_PROP "sqlite3(>=3.6.22)")
+
+# 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()
+
+# Additional Dev packet dependency
+SET(ADD_DEPEND_DEV_PROP "audiomanager-bin" ${ADD_DEPEND_BIN_PROP})
+
+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}")
+
 
-SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)")
-set_property(GLOBAL APPEND PROPERTY dev_prop "${ADD_DEPEND}")
 
diff --git a/AudioManagerDaemon/src/DLTWrapper.cpp b/AudioManagerDaemon/src/DLTWrapper.cpp
index 33a48e8..cdb1a1e 100644
--- a/AudioManagerDaemon/src/DLTWrapper.cpp
+++ b/AudioManagerDaemon/src/DLTWrapper.cpp
@@ -22,97 +22,187 @@
  *
  */
 
+
 #include "DLTWrapper.h"
-#include <cassert>
+#include <string.h>
+#include <sstream>
+#include <iostream>
 
 DLTWrapper* DLTWrapper::mDLTWrapper = NULL;
 
-DLTWrapper *DLTWrapper::instance()
+DLTWrapper *DLTWrapper::instance(const bool enableNoDLTDebug)
 {
     if (!mDLTWrapper)
-        mDLTWrapper = new DLTWrapper;
+        mDLTWrapper = new DLTWrapper(enableNoDLTDebug);
+    if(enableNoDLTDebug)
+        mDLTWrapper->enableNoDLTDebug(true);
     return mDLTWrapper;
 }
 
 void DLTWrapper::unregisterContext(DltContext & handle)
 {
+#ifdef WITH_DLT
     dlt_unregister_context(&handle);
+#endif
 }
 
-DLTWrapper::DLTWrapper() :
+DLTWrapper::DLTWrapper(const bool enableNoDLTDebug) :
+#ifndef WITH_DLT
+        mEnableNoDLTDebug(enableNoDLTDebug),
+#endif
         mDltContext(), //
         mDltContextData()
 {
+#ifndef WITH_DLT
+    std::cout << "[DLT] Running without DLT-support" << std::endl;
+#endif
 }
 
 void DLTWrapper::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");
+#endif
 }
 
 void DLTWrapper::registerContext(DltContext& handle, const char *contextid, const char *description)
 {
+#ifdef WITH_DLT
     dlt_register_context(&handle, contextid, description);
+#else
+    memcpy(&mDltContext.contextID,contextid,4);
+    strlen(description);
+    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);
+    }
+#endif
 }
 
 void DLTWrapper::init(DltLogLevelType loglevel, DltContext* context)
 {
     if (!context)
         context = &mDltContext;
+#ifdef WITH_DLT
     dlt_user_log_write_start(context, &mDltContextData, loglevel);
+#endif
+
 }
 
 void DLTWrapper::send()
 {
+#ifdef WITH_DLT
     dlt_user_log_write_finish(&mDltContextData);
+#else
+    if(mEnableNoDLTDebug)
+        std::cout << "[" << mDltContext.contextID << "] " << std::string(mDltContextData.buffer) << std::endl;
+
+    mDltContextData.size = 0;
+#endif
 }
 
 void DLTWrapper::append(const int8_t value)
 {
+#ifdef WITH_DLT
     dlt_user_log_write_int8(&mDltContextData, value);
+#else
+    appendNoDLT(value);
+#endif
 }
 
 void DLTWrapper::append(const uint8_t value)
 {
+#ifdef WITH_DLT
     dlt_user_log_write_uint8(&mDltContextData, value);
+#else
+    appendNoDLT(value);
+#endif
 }
 
 void DLTWrapper::append(const int16_t value)
 {
+#ifdef WITH_DLT
     dlt_user_log_write_int16(&mDltContextData, value);
+#else
+    appendNoDLT(value);
+#endif
 }
 
 void DLTWrapper::append(const uint16_t value)
 {
+#ifdef WITH_DLT
     dlt_user_log_write_uint16(&mDltContextData, value);
+#else
+    appendNoDLT(value);
+#endif
 }
 
 void DLTWrapper::append(const int32_t value)
 {
+#ifdef WITH_DLT
     dlt_user_log_write_int32(&mDltContextData, value);
+#else
+    appendNoDLT(value);
+#endif
 }
 
 void DLTWrapper::append(const uint32_t value)
 {
+#ifdef WITH_DLT
     dlt_user_log_write_uint32(&mDltContextData, value);
+#else
+    appendNoDLT(value);
+#endif
 }
 
 void DLTWrapper::append(const char*& value)
 {
+#ifdef WITH_DLT
     dlt_user_log_write_string(&mDltContextData, value);
+#else
+    memcpy((mDltContextData.buffer+mDltContextData.size),value,strlen(value));
+    mDltContextData.size += strlen(value);
+#endif
 }
 
 void DLTWrapper::append(const std::string& value)
 {
+#ifdef WITH_DLT
     dlt_user_log_write_string(&mDltContextData, value.c_str());
+#else
+    memcpy((mDltContextData.buffer+mDltContextData.size),value.c_str(),value.size());
+    mDltContextData.size += value.size();
+#endif
 }
 
 void DLTWrapper::append(const bool value)
 {
+#ifdef WITH_DLT
     dlt_user_log_write_bool(&mDltContextData, static_cast<uint8_t>(value));
+#else
+    appendNoDLT(value);
+#endif
+}
+
+#ifndef WITH_DLT
+template<class T> void DLTWrapper::appendNoDLT(T value)
+{
+    if((mDltContextData.size + sizeof(value)) < DLT_USER_BUF_MAX_SIZE)
+    {
+        memcpy((mDltContextData.buffer+mDltContextData.size),&(value),sizeof(value));
+        mDltContextData.size += sizeof(value);
+    }
+}
+
+void DLTWrapper::enableNoDLTDebug(const bool enableNoDLTDebug)
+{
+    mEnableNoDLTDebug = enableNoDLTDebug;
 }
+#endif
 
 DLTWrapper::~DLTWrapper()
 {