diff options
author | Jeka <friedrix@gmail.com> | 2019-06-07 20:45:41 +0200 |
---|---|---|
committer | Eugen Friedrich <efriedrich@de.adit-jv.com> | 2021-01-03 21:37:07 +0100 |
commit | 7cd66a4e07a578a912bfacacd7973eae48d8dcc8 (patch) | |
tree | 7ffee180639e693e77e280731ab7135433457382 | |
parent | 0cc3904b8f27775cb1d0900c6355e0f5dbd06ec1 (diff) | |
download | wayland-ivi-extension-7cd66a4e07a578a912bfacacd7973eae48d8dcc8.tar.gz |
simple-weston-client: make dlt optional
if weston-debug protocol is available we should use dlt
if it is available so only optional otherwise we will just
output to stderr
Signed-off-by: Eugen Friedrich <efriedrich@de.adit-jv.com>
-rw-r--r-- | ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt | 7 | ||||
-rw-r--r-- | ivi-layermanagement-examples/simple-weston-client/src/simple-weston-client.c | 26 |
2 files changed, 23 insertions, 10 deletions
diff --git a/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt b/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt index b34633e..0c4f5df 100644 --- a/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt +++ b/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt @@ -26,7 +26,7 @@ pkg_check_modules(LIBWESTON_PROTOCOLS libweston-6-protocols QUIET) if(${LIBWESTON_PROTOCOLS_FOUND}) #check for DLT - pkg_check_modules(DLT automotive-dlt REQUIRED) + pkg_check_modules(DLT automotive-dlt QUIET) #import the pkgdatadir from libweston-protocols pkgconfig file execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir libweston-6-protocols @@ -118,8 +118,13 @@ add_dependencies(${PROJECT_NAME} ${LIBS}) add_definitions(${DLT_CFLAGS}) +if(${DLT_FOUND}) + add_definitions(-DDLT) +endif(${DLT_FOUND}) + if(${LIBWESTON_PROTOCOLS_FOUND}) add_definitions(-DLIBWESTON_DEBUG_PROTOCOL) + target_link_libraries(${PROJECT_NAME} pthread) endif(${LIBWESTON_PROTOCOLS_FOUND}) target_link_libraries(${PROJECT_NAME} ${LIBS}) diff --git a/ivi-layermanagement-examples/simple-weston-client/src/simple-weston-client.c b/ivi-layermanagement-examples/simple-weston-client/src/simple-weston-client.c index 4093cf2..de98f8b 100644 --- a/ivi-layermanagement-examples/simple-weston-client/src/simple-weston-client.c +++ b/ivi-layermanagement-examples/simple-weston-client/src/simple-weston-client.c @@ -36,17 +36,19 @@ #include <ivi-application-client-protocol.h> #ifdef LIBWESTON_DEBUG_PROTOCOL +#include "weston-debug-client-protocol.h" +#define MAXSTRLEN 1024 +#endif + +#ifdef DLT #include "dlt_common.h" #include "dlt_user.h" -#include "weston-debug-client-protocol.h" #define WESTON_DLT_APP_DESC "messages from weston debug protocol" #define WESTON_DLT_CONTEXT_DESC "weston debug context" #define WESTON_DLT_APP "WESN" #define WESTON_DLT_CONTEXT "WESC" - -#define MAXSTRLEN 1024 #endif #ifndef MIN @@ -691,20 +693,19 @@ static void * weston_dlt_thread_function(void *data) { WaylandContextStruct* wlcontext; + +#ifdef DLT + /*init dlt*/ char apid[DLT_ID_SIZE]; char ctid[DLT_ID_SIZE]; - char *temp; DLT_DECLARE_CONTEXT(weston_dlt_context) - - wlcontext = (WaylandContextStruct*)data; - - /*init dlt*/ dlt_set_id(apid, WESTON_DLT_APP); dlt_set_id(ctid, WESTON_DLT_CONTEXT); DLT_REGISTER_APP(apid, WESTON_DLT_APP_DESC); DLT_REGISTER_CONTEXT(weston_dlt_context, ctid, WESTON_DLT_CONTEXT_DESC); - +#endif + wlcontext = (WaylandContextStruct*)data; /*make the stdin as read end of the pipe*/ dup2(wlcontext->pipefd[0], STDIN_FILENO); @@ -721,12 +722,19 @@ weston_dlt_thread_function(void *data) if (strcmp(str,"")!=0) { +#ifdef DLT DLT_LOG(weston_dlt_context, DLT_LOG_INFO, DLT_STRING(str)); +#else + fprintf(stderr,"%s",str); +#endif } } +#ifdef DLT DLT_UNREGISTER_CONTEXT(weston_dlt_context); DLT_UNREGISTER_APP(); +#endif + pthread_exit(NULL); } #endif |