Bug 298 - Filtering of DLT messages are not working

Signed-off-by: Christian Linke <christian.linke@bmw.de>

2 files changed, 68 insertions, 35 deletions

diff --git a/AudioManagerDaemon/src/CAmDltWrapper.cpp b/AudioManagerDaemon/src/CAmDltWrapper.cpp
index d1bbab2..ef83738 100644
--- a/AudioManagerDaemon/src/CAmDltWrapper.cpp
+++ b/AudioManagerDaemon/src/CAmDltWrapper.cpp
@@ -108,19 +108,21 @@ void CAmDltWrapper::registerContext(DltContext& handle, const char *contextid, c
 #endif
 }
 
-void CAmDltWrapper::init(DltLogLevelType loglevel, DltContext* context)
+int CAmDltWrapper::init(DltLogLevelType loglevel, DltContext* context)
 {
     (void) loglevel;
     pthread_mutex_lock(&mMutex);
     if (!context)
         context = &mDltContext;
+    int result;
 #ifdef WITH_DLT
-    dlt_user_log_write_start(context, &mDltContextData, loglevel);
+    result = dlt_user_log_write_start(context, &mDltContextData, loglevel);
 #else
+    result = -1;
     if(mEnableNoDLTDebug)
         std::cout << "\e[0;34m[" << context->contextID << "]\e[0;30m\t";
 #endif
-
+    return result;
 }
 
 void CAmDltWrapper::send()
diff --git a/include/shared/CAmDltWrapper.h b/include/shared/CAmDltWrapper.h
index 177fd98..1de8bb0 100644
--- a/include/shared/CAmDltWrapper.h
+++ b/include/shared/CAmDltWrapper.h
@@ -95,7 +95,7 @@ public:
     void registerContext(DltContext& handle, const char *contextid, const char * description);
     void unregisterContext(DltContext& handle);
 
-    void init(DltLogLevelType loglevel, DltContext* context = NULL);
+    int init(DltLogLevelType loglevel, DltContext* context = NULL);
     void deinit();
     void send();
     void append(const int8_t value);
@@ -143,7 +143,8 @@ inline CAmDltWrapper* getWrapper()
 template<typename T> void logInfo(T value)
 {
     CAmDltWrapper* inst(getWrapper());
-    inst->init(DLT_LOG_INFO);
+    if (inst->init(DLT_LOG_INFO) < 0)
+        return;
     inst->append(value);
     inst->send();
 }
@@ -157,7 +158,8 @@ template<typename T, typename T1> void logInfo(T value, T1 value1)
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_INFO);
+    if (inst->init(DLT_LOG_INFO) < 0)
+        return;
     inst->append(value);
     inst->append(value1);
     inst->send();
@@ -174,7 +176,8 @@ template<typename T, typename T1, typename T2> void logInfo(T value, T1 value1,
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_INFO);
+    if (inst->init(DLT_LOG_INFO) < 0)
+        return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -193,7 +196,8 @@ template<typename T, typename T1, typename T2, typename T3> void logInfo(T value
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_INFO);
+    if (inst->init(DLT_LOG_INFO) < 0)
+        return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -214,7 +218,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4> void lo
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_INFO);
+    if (inst->init(DLT_LOG_INFO) < 0)
+        return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -237,7 +242,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_INFO);
+    if (inst->init(DLT_LOG_INFO) < 0)
+        return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -262,7 +268,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_INFO);
+    if (inst->init(DLT_LOG_INFO) < 0)
+        return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -289,7 +296,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_INFO);
+    if (inst->init(DLT_LOG_INFO) < 0)
+        return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -318,7 +326,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_INFO);
+    if (inst->init(DLT_LOG_INFO) < 0)
+        return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -349,7 +358,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_INFO);
+    if (inst->init(DLT_LOG_INFO) < 0)
+        return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -382,7 +392,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_INFO);
+    if (inst->init(DLT_LOG_INFO) < 0)
+        return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -406,7 +417,8 @@ template<typename T> void logError(T value)
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_ERROR);
+    if (inst->init(DLT_LOG_ERROR) < 0)
+       return;
     inst->append(value);
     inst->send();
 
@@ -421,7 +433,8 @@ template<typename T, typename T1> void logError(T value, T1 value1)
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_ERROR);
+    if (inst->init(DLT_LOG_ERROR) < 0)
+       return;
     inst->append(value);
     inst->append(value1);
     inst->send();
@@ -438,7 +451,8 @@ template<typename T, typename T1, typename T2> void logError(T value, T1 value1,
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_ERROR);
+    if (inst->init(DLT_LOG_ERROR) < 0)
+       return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -457,7 +471,8 @@ template<typename T, typename T1, typename T2, typename T3> void logError(T valu
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_ERROR);
+    if (inst->init(DLT_LOG_ERROR) < 0)
+       return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -478,7 +493,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4> void lo
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_ERROR);
+    if (inst->init(DLT_LOG_ERROR) < 0)
+       return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -501,7 +517,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_ERROR);
+    if (inst->init(DLT_LOG_ERROR) < 0)
+       return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -526,7 +543,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_ERROR);
+    if (inst->init(DLT_LOG_ERROR) < 0)
+       return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -553,7 +571,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_ERROR);
+    if (inst->init(DLT_LOG_ERROR) < 0)
+       return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -582,7 +601,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_ERROR);
+    if (inst->init(DLT_LOG_ERROR) < 0)
+       return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -613,7 +633,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_ERROR);
+    if (inst->init(DLT_LOG_ERROR) < 0)
+       return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -646,7 +667,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(DLT_LOG_ERROR);
+    if (inst->init(DLT_LOG_ERROR) < 0)
+       return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -672,7 +694,8 @@ template<typename T> void log(DltContext* const context, DltLogLevelType logleve
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(loglevel, context);
+    if(inst->init(loglevel, context) < 0)
+    	return;
     inst->append(value);
     inst->send();
 
@@ -689,7 +712,8 @@ template<typename T, typename T1> void log(DltContext* const context, DltLogLeve
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(loglevel, context);
+    if(inst->init(loglevel, context) < 0)
+    	return;
     inst->append(value);
     inst->append(value1);
     inst->send();
@@ -708,7 +732,8 @@ template<typename T, typename T1, typename T2> void log(DltContext* const contex
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(loglevel, context);
+    if(inst->init(loglevel, context) < 0)
+    	return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -729,7 +754,8 @@ template<typename T, typename T1, typename T2, typename T3> void log(DltContext*
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(loglevel, context);
+    if(inst->init(loglevel, context) < 0)
+    	return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -752,7 +778,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4> void lo
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(loglevel, context);
+    if(inst->init(loglevel, context) < 0)
+    	return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -777,7 +804,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(loglevel, context);
+    if(inst->init(loglevel, context) < 0)
+    	return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -804,7 +832,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(loglevel, context);
+    if(inst->init(loglevel, context) < 0)
+    	return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -833,7 +862,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(loglevel, context);
+    if(inst->init(loglevel, context) < 0)
+    	return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);
@@ -864,7 +894,8 @@ template<typename T, typename T1, typename T2, typename T3, typename T4, typenam
 {
     CAmDltWrapper* inst(getWrapper());
 
-    inst->init(loglevel, context);
+    if(inst->init(loglevel, context) < 0)
+    	return;
     inst->append(value);
     inst->append(value1);
     inst->append(value2);