diff options
author | Martin Koch <mkoch@de.adit-jv.com> | 2020-01-14 14:48:54 +0100 |
---|---|---|
committer | Martin Koch <mkoch@de.adit-jv.com> | 2020-01-14 15:27:26 +0100 |
commit | 56b7b1883c354b78ab6cff5739ddd2f170603324 (patch) | |
tree | 6f95ae6a3cc298633b9af7e5a7d3febbba5dbd35 /AudioManagerUtilities | |
parent | e0c47ec1fd95abbc5f8f32f9d9968dfbd02b0999 (diff) | |
download | audiomanager-56b7b1883c354b78ab6cff5739ddd2f170603324.tar.gz |
AM: Reorganize daemon, core, utilities and tests to make use of the new logging architecture.
- Known side-effect: CAmSerializer.h and TAmPluginTemplate.h no longer indirectly include
dlt_user.h. Thus macros like DLT_DECLARE_CONTEXT and DLT_IMPORT_CONTEXT
may be undefined in application code unless CAmDltWrapper.h or dlt_user.h is included explicitly.
- Since the DLT functionality is now encapsulated inside a dedicated class, such declaration is
usually superfluous and can be dropped.
Signed-off-by: Martin Koch <mkoch@de.adit-jv.com>
Diffstat (limited to 'AudioManagerUtilities')
7 files changed, 8 insertions, 7 deletions
diff --git a/AudioManagerUtilities/include/CAmSerializer.h b/AudioManagerUtilities/include/CAmSerializer.h index 5fd1977..1c86942 100644 --- a/AudioManagerUtilities/include/CAmSerializer.h +++ b/AudioManagerUtilities/include/CAmSerializer.h @@ -23,7 +23,7 @@ #include <memory> #include <stdexcept> #include <unistd.h> -#include "CAmDltWrapper.h" +#include "CAmLogWrapper.h" #include "CAmSocketHandler.h" /*! diff --git a/AudioManagerUtilities/include/TAmPluginTemplate.h b/AudioManagerUtilities/include/TAmPluginTemplate.h index b030123..f386cc2 100644 --- a/AudioManagerUtilities/include/TAmPluginTemplate.h +++ b/AudioManagerUtilities/include/TAmPluginTemplate.h @@ -26,7 +26,7 @@ #include <dlfcn.h> #include <libgen.h> -#include "CAmDltWrapper.h" +#include "CAmLogWrapper.h" namespace am { diff --git a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp index e22dcd6..d110293 100644 --- a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp +++ b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp @@ -27,7 +27,7 @@ #include <vector> #include "audiomanagertypes.h" #include "CAmSocketHandler.h" -#include "CAmDltWrapper.h" +#include "CAmLogWrapper.h" #include "CAmCommonAPIWrapper.h" namespace am diff --git a/AudioManagerUtilities/src/CAmDbusWrapper.cpp b/AudioManagerUtilities/src/CAmDbusWrapper.cpp index 504bf38..99a4eb2 100644 --- a/AudioManagerUtilities/src/CAmDbusWrapper.cpp +++ b/AudioManagerUtilities/src/CAmDbusWrapper.cpp @@ -29,7 +29,7 @@ #include <cassert> #include <cstdlib> #include <stdexcept> -#include "CAmDltWrapper.h" +#include "CAmLogWrapper.h" #include "CAmSocketHandler.h" namespace am diff --git a/AudioManagerUtilities/src/CAmSocketHandler.cpp b/AudioManagerUtilities/src/CAmSocketHandler.cpp index 8f0cdb0..d657c7c 100644 --- a/AudioManagerUtilities/src/CAmSocketHandler.cpp +++ b/AudioManagerUtilities/src/CAmSocketHandler.cpp @@ -33,7 +33,7 @@ #include <csignal> #include <cstring> -#include "CAmDltWrapper.h" +#include "CAmLogWrapper.h" #include "CAmSocketHandler.h" #ifdef WITH_TIMERFD diff --git a/AudioManagerUtilities/src/CAmWatchdog.cpp b/AudioManagerUtilities/src/CAmWatchdog.cpp index 3bac79c..5c64713 100644 --- a/AudioManagerUtilities/src/CAmWatchdog.cpp +++ b/AudioManagerUtilities/src/CAmWatchdog.cpp @@ -26,7 +26,7 @@ #include <cstdlib> #include <stdexcept> #include "audiomanagerconfig.h" -#include "CAmDltWrapper.h" +#include "CAmLogWrapper.h" #include <systemd/sd-daemon.h> namespace am diff --git a/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp b/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp index 3fde011..9914955 100644 --- a/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp +++ b/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp @@ -32,7 +32,7 @@ #include <sys/un.h> #include <sys/poll.h> #include <sys/eventfd.h> -#include "CAmDltWrapper.h" +#include "CAmLogWrapper.h" #include "CAmSocketHandler.h" @@ -771,6 +771,7 @@ TEST(CAmSocketHandlerTest,playWithSockets) int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); + CAmLogWrapper::instantiateOnce("GTST", "GTEST for Socket Handler", LS_ON, LOG_SERVICE_DLT); return RUN_ALL_TESTS(); } |