summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AudioManagerDaemon/src/CAmControlReceiver.cpp2
-rw-r--r--AudioManagerDaemon/src/CAmDltWrapper.cpp10
-rw-r--r--include/shared/CAmDltWrapper.h3
3 files changed, 14 insertions, 1 deletions
diff --git a/AudioManagerDaemon/src/CAmControlReceiver.cpp b/AudioManagerDaemon/src/CAmControlReceiver.cpp
index 583ad0d..6960fd0 100644
--- a/AudioManagerDaemon/src/CAmControlReceiver.cpp
+++ b/AudioManagerDaemon/src/CAmControlReceiver.cpp
@@ -485,6 +485,8 @@ void CAmControlReceiver::confirmControllerRundown()
{
logInfo ("CAmControlReceiver::confirmControllerRundown(), exiting regularly");
//once the controller is ready, it will exit.
+ CAmDltWrapper* inst(getWrapper());
+ inst->deinit();
exit (0);
//todo: one time implement here system interaction with NSM
}
diff --git a/AudioManagerDaemon/src/CAmDltWrapper.cpp b/AudioManagerDaemon/src/CAmDltWrapper.cpp
index 51ab7ce..c8fe8e1 100644
--- a/AudioManagerDaemon/src/CAmDltWrapper.cpp
+++ b/AudioManagerDaemon/src/CAmDltWrapper.cpp
@@ -52,6 +52,13 @@ void CAmDltWrapper::unregisterContext(DltContext & handle)
#endif
}
+void CAmDltWrapper::deinit()
+{
+#ifdef WITH_DLT
+ unregisterContext(mDltContext);
+#endif
+}
+
CAmDltWrapper::CAmDltWrapper(const bool enableNoDLTDebug) :
#ifndef WITH_DLT
mEnableNoDLTDebug(enableNoDLTDebug),
@@ -244,7 +251,10 @@ void CAmDltWrapper::enableNoDLTDebug(const bool enableNoDLTDebug)
CAmDltWrapper::~CAmDltWrapper()
{
if (mpDLTWrapper)
+ {
+ mpDLTWrapper->unregisterContext(mDltContext);
delete mpDLTWrapper;
+ }
}
}
diff --git a/include/shared/CAmDltWrapper.h b/include/shared/CAmDltWrapper.h
index a29bf2e..9eae51e 100644
--- a/include/shared/CAmDltWrapper.h
+++ b/include/shared/CAmDltWrapper.h
@@ -95,6 +95,7 @@ public:
void unregisterContext(DltContext& handle);
void init(DltLogLevelType loglevel, DltContext* context = NULL);
+ void deinit();
void send();
void append(const int8_t value);
void append(const uint8_t value);
@@ -148,7 +149,7 @@ template<typename T> void logInfo(T value)
/**
* logs a given value with infolevel with the default context
* @param value
- * @param value1
+ * @param value1mDltContext
*/
template<typename T, typename T1> void logInfo(T value, T1 value1)
{