diff options
67 files changed, 608 insertions, 609 deletions
@@ -7,10 +7,10 @@ notice and this notice are preserved. Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> Christian Muck <christian.muck@bmw.de> Mikko Rapeli <mikko.rapeli@bmw.de> -Jeremiah C. Foster <jeremiah.foster@pelagicore.com> +Jeremiah C. Foster <jeremiah.foster@pelagicore.com> Stefan Seefeld <stefan@codesourcery.com> Noor Ahsan <noor_ahsan@mentor.com> Eckhard Diezel <external.Eckhard.Diezel@de.bosch.com> -Mohammed AL Dardoun +Mohammed AL Dardoun Lassi Marttala Simon Brandner diff --git a/CMakeLists.txt b/CMakeLists.txt index e569f6b..ca24fda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,9 +30,9 @@ set( DLT_VERSION ${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_LEVEL}) set( DLT_VERSION_STATE STABLE ) set( DLT_REVISION "") -execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE DLT_REVISION - ERROR_VARIABLE GIT_ERROR + ERROR_VARIABLE GIT_ERROR OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE) if( DLT_REVISION MATCHES "^$") @@ -83,10 +83,10 @@ if(WITH_DLT_DBUS) pkg_check_modules(DBUS REQUIRED dbus-1) endif(WITH_DLT_DBUS) -include_directories( +include_directories( ${CMAKE_SOURCE_DIR}/ ${CMAKE_SOURCE_DIR}/include/dlt - ${CMAKE_SOURCE_DIR}/src/shared/ + ${CMAKE_SOURCE_DIR}/src/shared/ ${CMAKE_SOURCE_DIR}/src/lib/ ${CMAKE_SOURCE_DIR}/src/daemon/ ${CMAKE_SOURCE_DIR}/systemd/3rdparty/ @@ -101,11 +101,11 @@ endif(WITH_DLTTEST) if(WITH_DLT_SHM_ENABLE) add_definitions( -DDLT_SHM_ENABLE) endif(WITH_DLT_SHM_ENABLE) - + if(WITH_GPROF) SET(CMAKE_C_FLAGS "-pg") -endif(WITH_GPROF) - +endif(WITH_GPROF) + add_definitions( "-Wall" ) add_definitions( "-Wextra" ) @@ -133,7 +133,7 @@ if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD_JOURNAL) if(WITH_SYSTEMD) add_definitions( -DDLT_SYSTEMD_ENABLE) endif(WITH_SYSTEMD) - + if(WITH_SYSTEMD_WATCHDOG) add_definitions( -DDLT_SYSTEMD_WATCHDOG_ENABLE) endif(WITH_SYSTEMD_WATCHDOG) @@ -141,9 +141,9 @@ if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD_JOURNAL) if(WITH_SYSTEMD_JOURNAL) add_definitions( -DDLT_SYSTEMD_JOURNAL_ENABLE) endif(WITH_SYSTEMD_JOURNAL) - + set( systemd_SRCS ${CMAKE_SOURCE_DIR}/systemd/3rdparty/sd-daemon.c) - + add_subdirectory( systemd ) endif(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD_JOURNAL) @@ -33,12 +33,12 @@ Compile options with default values | WITH_GPROF | OFF | Set \-pg to compile flags | WITH_MAN | ON | Set to OFF to skip building of man pages | BUILD_SHARED_LIBS | ON | Set to OFF to build static libraries -| CMAKE_INSTALL_PREFIX | /usr/local | -| CMAKE_BUILD_TYPE | RelWithDebInfo | +| CMAKE_INSTALL_PREFIX | /usr/local | +| CMAKE_BUILD_TYPE | RelWithDebInfo | |============================================================================================== In order to change these options, you can modify this values -with ccmake, do the appropriate changes in CmakeList.txt or via +with ccmake, do the appropriate changes in CmakeList.txt or via the commandline for cmake - Change a value with: cmake -D<Variable>=<Value> @@ -35,7 +35,7 @@ Mozilla Public License Version 2.0 means any form of the work other than Source Code Form. 1.7. "Larger Work" - means a work that combines Covered Software with other material, in + means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software. 1.8. "License" @@ -15,12 +15,12 @@ logging facility providing - the DLT client console utilities - the DLT test applications -The DLT daemon is the central component in GENIVI, which gathers all -logs and traces from the DLT user applications. The logs and traces -are stored optionally directly in a file in the ECU. The DLT daemon +The DLT daemon is the central component in GENIVI, which gathers all +logs and traces from the DLT user applications. The logs and traces +are stored optionally directly in a file in the ECU. The DLT daemon forwards all logs and traces to a connected DLT client. -The DLT client can send control messages to the daemon, e.g. to set -individual log levels of applications and contexts or get the list of +The DLT client can send control messages to the daemon, e.g. to set +individual log levels of applications and contexts or get the list of applications and contexts registered in the DLT daemon. Documentation @@ -55,7 +55,7 @@ Developped and tested with Ubuntu Linux 12.04 32-bit / Intel PC License ------- -Full information on the license for this software is available in the "LICENSE" file. +Full information on the license for this software is available in the "LICENSE" file. Source Code ----------- diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 9283a33..6aad7d6 100755 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -38,14 +38,14 @@ Changes * Fix PREFIX. Works now with the default PREFIX (/usr/local/) and with the user PREFIX (e.g. /temp/test_with_pref). PREFIX Fix for filetransfer directory (PREFIX/share/) * Fixed typo in include guard * Resolves BUG-206: Install prefix should be configurable - * Adding support for new macros to the daemon. New macros: DLT_HEX8(VAR) 8bits variable displayed in hexadecimal with "0x" prefix DLT_HEX16(VAR) 16bits displayed - in hexadecimal with "0x" prefix DLT_HEX32(VAR) 32bits displayed in hexadecimal with "0x" prefix DLT_HEX64(VAR) 64bits displayed in hexadecimal with "0x" prefix DLT_BIN8(VAR) + * Adding support for new macros to the daemon. New macros: DLT_HEX8(VAR) 8bits variable displayed in hexadecimal with "0x" prefix DLT_HEX16(VAR) 16bits displayed + in hexadecimal with "0x" prefix DLT_HEX32(VAR) 32bits displayed in hexadecimal with "0x" prefix DLT_HEX64(VAR) 64bits displayed in hexadecimal with "0x" prefix DLT_BIN8(VAR) 8bits variable displayed in binary with "0b" prefix DLT_BIN16(VAR) 16bits variable displayed in binary with "0b" prefix * Fixed network trace test * Fix dlt_user_log_write_start_id return value * Added new API to send marker message from application. * New Callback function in DLT library, called when log level of context is changed - + 2.11.0 @@ -101,7 +101,7 @@ Changes * atexit handler fix. * Add threadnames to libdlt threads. * Security fix on DLT pipes. - * Reduce usage of SEM_LOCK in application library and reset pointers. + * Reduce usage of SEM_LOCK in application library and reset pointers. * Fix: Systemd Journal Adapter provides corrupted output. * Fix: Install Example service file only when example enabled @@ -119,7 +119,7 @@ Changes * systemd journal support added. * spec file does not package man files when cmake is run with -DWITH_DOC=OFF * added length check for paths of files to be transferred - * Semaphores and Pointer passing insteasd by value and otehr coverity issue fixes + * Semaphores and Pointer passing insteasd by value and otehr coverity issue fixes * Fixed several issues in DLT filetransfer. * added creation date and a simple hash on the file name for to improve the uniqueness of getFileSerialNumber * modified filetransfer to be more robust in restarting transfers @@ -138,7 +138,7 @@ Changes * [GDLT-120]: truncated and Segmented network tracing * [GDLT-137]: Automatically try resending of user buffer after FIFO full * [GSWD-85]: Added authors file - + 2.8.0 * [GDLT-115]: Encapsulate user macros @@ -175,9 +175,9 @@ Changes * [GDLT-70] Check for malloc failures and return errors where applicable * [GDLT-47] Avoid discarding old contexts if no new memory can be allocate * [GDLT-69] Fixed bug in dlt-test-multi-process shares context between threads - + 2.6.0 - + * [GDLT-75] Use old style directory check on startup * [GENDLT-21] Move mcnt from DltContextData to DltContext * [GENDLT-15] Fixes to previous integrations from review @@ -209,7 +209,7 @@ Changes 2.5.2 * Change to Mozilla Public License Version 2.0 - + 2.5.1 * Fixed bug with comparinson between signed and unsigned integer and protection for a buffer overflow. @@ -225,10 +225,10 @@ Changes * Update of doxygen documentation and generation * Rework of root CMake project file, e.g. structure and compile options * [GENDLT-16] Create variable in dlt-system.conf to configure the timeout of the filetransfer - * [GDLT-37] Extend automated test tools for parallel process/threads tests + * [GDLT-37] Extend automated test tools for parallel process/threads tests * [GSW-138] API Extension to resend the log messages in the user buffer * [GDLT-36] Prefixing of dlt_version.h fixed - * [GDLT-31] Tracefile content stored different under Ubuntu 64 bit version compared to Ubuntu/Win 32 Bit version fixed + * [GDLT-31] Tracefile content stored different under Ubuntu 64 bit version compared to Ubuntu/Win 32 Bit version fixed * [GDLT-35] Compile warnings fixed * [GSW-137] Wrong include gives error on compailing against dlt fixed @@ -242,7 +242,7 @@ Changes * Fixed buffer overflow problem in buffer library. * Disabled share memory by default - disabled completely shared memory if not enabled. -2.4.1 +2.4.1 * Added dynamic increasable ringbuffers to user lib and dlt-daemon. * Created abstraction of shm buffer management. @@ -250,7 +250,7 @@ Changes * Added check of file size when starting and deleting files during filetransfer. * Added check of shm buffer availability when push to shm. -2.4.1 +2.4.1 * Added internal logging facility to stdout, syslog or local file, configurable in configuration file. * Added deamonise and signal handlers to dlt-system. @@ -275,14 +275,14 @@ Changes * [GSW-61] Replace command line parameter by configuration file * [GSW-13] Support for keep-alive messages as configuration parameter * [GSW-60] Extended offline DLT Trace memory handling. - * Removed filter implementation + * Removed filter implementation 2.3.0 * [GSW-16] Systemd configuration for syslog to DLT dapater * [GSW-62] DLT Library version check - * [GSW-28] Directory where persistent data is stored is not configurable - * [GSW-59] Statically allocated large array + * [GSW-28] Directory where persistent data is stored is not configurable + * [GSW-59] Statically allocated large array * Added init script for Ubuntu * Optional adding of gprof compile flags * sprintf with float64 fails on ARM platform; disabled this function on QRM platform. @@ -293,7 +293,7 @@ Changes * Added commandline parameter -u to set ring buffer size * Reduced cpu consumption needed by applications using DLT library * Increased default ringbuffer size to 10024 bytes - * Changed delay in receiver routine to 100ms + * Changed delay in receiver routine to 100ms 2.1.0 @@ -347,7 +347,7 @@ Changes * DLT daemon: * Support for dlt_register_context_ll_ts() added * Enhanced support for get_log_info (all modes, 1 app all contexts, 1 app 1 context, all apps all contexts) - * Added -r option, for automatic sending context information to dlt client; if no client connection is available, + * Added -r option, for automatic sending context information to dlt client; if no client connection is available, this information is stored in history buffer in dlt daemon * Several internal performance optimizations: * dlt_daemon_context_find(), dlt_daemon_application_find(): Now O(log n) instead O(n) @@ -375,7 +375,7 @@ Changes * dlt_message_print_* functions added * Semaphore calls added to enable multi-threading * Changed injection interface from direct usage to callback - * Requested log level and trace status is set immediately + * Requested log level and trace status is set immediately in dlt_set_application_ll_ts_limit() * Implemented receiver thread in DLT library (used for setting of log level/trace status and for injection handling) @@ -388,11 +388,11 @@ Changes is now working (also in Windows) * DLT library: Fixed bug in dlt_print_mixed_string() * DLT library: Fixed bug in dlt_daemon_contexts_get_next_con_id() - * DLT daemon: dlt_daemon_process_user_message_unregister_application() also removes now + * DLT daemon: dlt_daemon_process_user_message_unregister_application() also removes now all corresponding contexts * DLT daemon: Added security check to dlt_daemon_control_get_log_info() in order to avoid crash which occured under special circumstances - * DLT daemon: Register app now opens the connection to the DLT library, + * DLT daemon: Register app now opens the connection to the DLT library, unregister app closes the connection (was before in register context) * Added -lrt to package config file * Resolved dependency from dlt_client.h to dlt_common.h -> dlt_common.h is now public @@ -407,7 +407,7 @@ Changes * DLT daemon: * Added several checks within code * DLT library: - * Added several checks within code + * Added several checks within code * Enhanced local print modes: a environment variable now can be used to control local print mode: Variable: DLT_LOCAL_PRINT_MODE @@ -436,17 +436,17 @@ Changes * DLT viewer: * Showing timestamp * Compiles now with MS Visual C++ - * Support for loading multiple descriptions + * Support for loading multiple descriptions of plugins is now possible (*) * Plugin description can be loaded individually - by Right-mouse-button (*) + by Right-mouse-button (*) * DLT daemon: * Overflow message is now stored in history buffer, - if necessary + if necessary * DLT library: * Ring-buffer for injection messages implemented * History Buffer for Startup + Overflow implemented - * Setting of maximum logged log level/trace status for + * Setting of maximum logged log level/trace status for application triggered by application is now possible * Optional local output of Log message is now possible * General: diff --git a/automotive-dlt.pc.in b/automotive-dlt.pc.in index b91e50a..7646f89 100755 --- a/automotive-dlt.pc.in +++ b/automotive-dlt.pc.in @@ -21,9 +21,9 @@ libdir=${exec_prefix}/lib includedir=${exec_prefix}/include Name: DLT -Description: Diagnostic Log and Trace +Description: Diagnostic Log and Trace Version: @DLT_VERSION@ -Requires: +Requires: Libs: -L${libdir} -ldlt -lrt -lpthread -lz Cflags: -I${includedir}/dlt -DDLT_@DLT_MAJOR_VERSION@_@DLT_MINOR_VERSION@ diff --git a/automotive-dlt.spec.in b/automotive-dlt.spec.in index aefcb93..eeb7221 100644 --- a/automotive-dlt.spec.in +++ b/automotive-dlt.spec.in @@ -116,14 +116,14 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/dlt-test-multi-process %{_bindir}/dlt-test-multi-process-client -%attr(0755,root,root) +%attr(0755,root,root) %{_bindir}/dlt-daemon %{_bindir}/dlt-example-user %{_bindir}/dlt-example-user-func %{_bindir}/dlt-example-filetransfer -%files doc +%files doc @PACKAGE_DOC@%{_mandir}/man1/dlt-convert.1.gz @PACKAGE_DOC@%{_mandir}/man1/dlt-daemon.1.gz diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index b757dcf..0182d2a 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -24,7 +24,7 @@ else ( DLT_BIGENDIAN ) add_definitions( -DBYTE_ORDER=LITTLE_ENDIAN ) endif ( DLT_BIGENDIAN ) -INCLUDE(CheckIncludeFiles) +INCLUDE(CheckIncludeFiles) CHECK_INCLUDE_FILES( arpa/inet.h HAVE_ARPAINET_H) CHECK_INCLUDE_FILES( fcntl.h HAVE_FCNTL_H) @@ -56,7 +56,7 @@ CHECK_INCLUDE_FILES( sys/uio.h HAVE_SYSUIO_H) CHECK_INCLUDE_FILES( termios.h HAVE_TERMIOS_H) CHECK_INCLUDE_FILES( unistd.h HAVE_UNISTD_H) -INCLUDE(CheckFunctionExists) +INCLUDE(CheckFunctionExists) CHECK_FUNCTION_EXISTS( bzero HAVE_FUNC_BZERO) CHECK_FUNCTION_EXISTS( clock_gettime HAVE_FUNC_CLOCKGETTIME) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index c001f66..b8f0ae8 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -17,34 +17,34 @@ if(WITH_DOC) find_package(Doxygen) - + configure_file(${CMAKE_SOURCE_DIR}/doc/doxygen.cfg.cmake ${CMAKE_BINARY_DIR}/doc/doxygen.cfg @ONLY) - add_custom_target (doc ALL - COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/doxygen.cfg + add_custom_target (doc ALL + COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/doxygen.cfg WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc ) add_custom_target (doc-manuals ALL - COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc/manuals - COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc/manuals/images - COMMAND cp ${CMAKE_SOURCE_DIR}/doc/images/* ${CMAKE_BINARY_DIR}/doc/manuals/images + COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc/manuals + COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc/manuals/images + COMMAND cp ${CMAKE_SOURCE_DIR}/doc/images/* ${CMAKE_BINARY_DIR}/doc/manuals/images COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/INSTALL.html ${CMAKE_SOURCE_DIR}/INSTALL COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/README.html ${CMAKE_SOURCE_DIR}/README - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/ReleaseNotes.html ${CMAKE_SOURCE_DIR}/ReleaseNotes.txt - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_user_manual.html ${CMAKE_SOURCE_DIR}/doc/dlt_user_manual.txt - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_cheatsheet.html ${CMAKE_SOURCE_DIR}/doc/dlt_cheatsheet.txt - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_design_specification.html ${CMAKE_SOURCE_DIR}/doc/dlt_design_specification.txt - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_filetransfer.html ${CMAKE_SOURCE_DIR}/doc/dlt_filetransfer.txt - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-daemon.1.html ${CMAKE_SOURCE_DIR}/doc/dlt-daemon.1.txt - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-system.1.html ${CMAKE_SOURCE_DIR}/doc/dlt-system.1.txt - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-receive.1.html ${CMAKE_SOURCE_DIR}/doc/dlt-receive.1.txt - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-convert.1.html ${CMAKE_SOURCE_DIR}/doc/dlt-convert.1.txt - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt.conf.5.html ${CMAKE_SOURCE_DIR}/doc/dlt.conf.5.txt - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-system.conf.5.html ${CMAKE_SOURCE_DIR}/doc/dlt-system.conf.5.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/ReleaseNotes.html ${CMAKE_SOURCE_DIR}/ReleaseNotes.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_user_manual.html ${CMAKE_SOURCE_DIR}/doc/dlt_user_manual.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_cheatsheet.html ${CMAKE_SOURCE_DIR}/doc/dlt_cheatsheet.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_design_specification.html ${CMAKE_SOURCE_DIR}/doc/dlt_design_specification.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_filetransfer.html ${CMAKE_SOURCE_DIR}/doc/dlt_filetransfer.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-daemon.1.html ${CMAKE_SOURCE_DIR}/doc/dlt-daemon.1.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-system.1.html ${CMAKE_SOURCE_DIR}/doc/dlt-system.1.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-receive.1.html ${CMAKE_SOURCE_DIR}/doc/dlt-receive.1.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-convert.1.html ${CMAKE_SOURCE_DIR}/doc/dlt-convert.1.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt.conf.5.html ${CMAKE_SOURCE_DIR}/doc/dlt.conf.5.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-system.conf.5.html ${CMAKE_SOURCE_DIR}/doc/dlt-system.conf.5.txt COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_book.html ${CMAKE_SOURCE_DIR}/doc/dlt_book.txt - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_extended_network_trace.html ${CMAKE_SOURCE_DIR}/doc/dlt_extended_network_trace.txt - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_howto_debug.html ${CMAKE_SOURCE_DIR}/doc/dlt_howto_debug.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_extended_network_trace.html ${CMAKE_SOURCE_DIR}/doc/dlt_extended_network_trace.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_howto_debug.html ${CMAKE_SOURCE_DIR}/doc/dlt_howto_debug.txt WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc ) @@ -53,7 +53,7 @@ if(WITH_DOC) COMMAND a2x --doctype manpage --format manpage ${CMAKE_SOURCE_DIR}/doc/dlt-daemon.1.txt COMMAND a2x --doctype manpage --format manpage ${CMAKE_SOURCE_DIR}/doc/dlt-system.1.txt COMMAND a2x --doctype manpage --format manpage ${CMAKE_SOURCE_DIR}/doc/dlt-receive.1.txt - COMMAND a2x --doctype manpage --format manpage ${CMAKE_SOURCE_DIR}/doc/dlt-convert.1.txt + COMMAND a2x --doctype manpage --format manpage ${CMAKE_SOURCE_DIR}/doc/dlt-convert.1.txt COMMAND a2x --doctype manpage --format manpage ${CMAKE_SOURCE_DIR}/doc/dlt.conf.5.txt COMMAND a2x --doctype manpage --format manpage ${CMAKE_SOURCE_DIR}/doc/dlt-system.conf.5.txt ) @@ -69,27 +69,27 @@ if(WITH_MAN) /usr/local/bin) if(NOT GZIP_TOOL) - MESSAGE(FATAL_ERROR "Could not find gzip for man page compression.") - endif(NOT GZIP_TOOL) + MESSAGE(FATAL_ERROR "Could not find gzip for man page compression.") + endif(NOT GZIP_TOOL) set(MAN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(MAN_BUILD_DIR ${CMAKE_BINARY_DIR}/doc) - set(MAN_SRC ${MAN_SRC_DIR}/dlt.conf.5 - ${MAN_SRC_DIR}/dlt-system.conf.5 - ${MAN_SRC_DIR}/dlt-convert.1 - ${MAN_SRC_DIR}/dlt-daemon.1 - ${MAN_SRC_DIR}/dlt-receive.1 + set(MAN_SRC ${MAN_SRC_DIR}/dlt.conf.5 + ${MAN_SRC_DIR}/dlt-system.conf.5 + ${MAN_SRC_DIR}/dlt-convert.1 + ${MAN_SRC_DIR}/dlt-daemon.1 + ${MAN_SRC_DIR}/dlt-receive.1 ${MAN_SRC_DIR}/dlt-system.1) - set(MAN_BUILD_SRC - ${MAN_BUILD_DIR}/dlt.conf.5 - ${MAN_BUILD_DIR}/dlt-system.conf.5 - ${MAN_BUILD_DIR}/dlt-convert.1 - ${MAN_BUILD_DIR}/dlt-daemon.1 - ${MAN_BUILD_DIR}/dlt-receive.1 + set(MAN_BUILD_SRC + ${MAN_BUILD_DIR}/dlt.conf.5 + ${MAN_BUILD_DIR}/dlt-system.conf.5 + ${MAN_BUILD_DIR}/dlt-convert.1 + ${MAN_BUILD_DIR}/dlt-daemon.1 + ${MAN_BUILD_DIR}/dlt-receive.1 ${MAN_BUILD_DIR}/dlt-system.1) - set(MAN_BUILD_GZ - ${MAN_BUILD_DIR}/dlt.conf.5.gz + set(MAN_BUILD_GZ + ${MAN_BUILD_DIR}/dlt.conf.5.gz ${MAN_BUILD_DIR}/dlt-system.conf.5.gz ${MAN_BUILD_DIR}/dlt-convert.1.gz ${MAN_BUILD_DIR}/dlt-daemon.1.gz @@ -97,10 +97,10 @@ if(WITH_MAN) ${MAN_BUILD_DIR}/dlt-system.1.gz) foreach(MAN ${MAN_SRC}) - execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${MAN} ${MAN_BUILD_DIR}) + execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${MAN} ${MAN_BUILD_DIR}) endforeach(MAN) - add_custom_target(compress_man ALL + add_custom_target(compress_man ALL COMMAND ${GZIP_TOOL} -c ${MAN_BUILD_DIR}/dlt.conf.5 > ${MAN_BUILD_DIR}/dlt.conf.5.gz COMMAND ${GZIP_TOOL} -c ${MAN_BUILD_DIR}/dlt-system.conf.5 > ${MAN_BUILD_DIR}/dlt-system.conf.5.gz COMMAND ${GZIP_TOOL} -c ${MAN_BUILD_DIR}/dlt-convert.1 > ${MAN_BUILD_DIR}/dlt-convert.1.gz diff --git a/doc/dlt-convert.1.txt b/doc/dlt-convert.1.txt index 17ff71e..ff2c3fa 100644 --- a/doc/dlt-convert.1.txt +++ b/doc/dlt-convert.1.txt @@ -14,7 +14,7 @@ DESCRIPTION ----------- Read DLT files, print DLT messages as ASCII and store the messages again. Use Ranges and Output file to cut DLT files. -Use two files and Output file to join DLT files. +Use two files and Output file to join DLT files. OPTIONS ------- @@ -26,7 +26,7 @@ OPTIONS *-x*:: Print DLT file; payload as hex. - + *-m*:: Print DLT file; payload as hex and ASCII. diff --git a/doc/dlt-receive.1.txt b/doc/dlt-receive.1.txt index 1c9e8be..4f1d933 100644 --- a/doc/dlt-receive.1.txt +++ b/doc/dlt-receive.1.txt @@ -12,7 +12,7 @@ SYNOPSIS DESCRIPTION ----------- -Receive DLT messages from DLT daemon and print or store the messages. +Receive DLT messages from DLT daemon and print or store the messages. OPTIONS ------- @@ -53,7 +53,7 @@ Print received message headers received from a dlt-daemon running on localhost:: Print received message headers received from a serila interface:: dlt-receive -s -y /dev/ttySO - + Store received message headers from a dlt-daemon to a log file called log.dlt and filter them for e.g. Application ID ABCD and Context ID EFGH (Write:ABCD EFGH as single line to a file claled filter.txt):: dlt-receive -s -o log.dlt -f filter.txt localhost diff --git a/doc/dlt-system.1.txt b/doc/dlt-system.1.txt index 6b26b6b..8ba573c 100644 --- a/doc/dlt-system.1.txt +++ b/doc/dlt-system.1.txt @@ -16,9 +16,9 @@ The DLT system logging process is the central application, which logs system information from the platform. It provides the features filetransfer, syslog adapater, logging of any kind of files and procfilesystem logger. The individual features can be enabled and -disabled in the configuration file. +disabled in the configuration file. -dlt-system loads by default the configuration file /etc/dlt-system.conf. +dlt-system loads by default the configuration file /etc/dlt-system.conf. See dlt-system.conf(1). OPTIONS diff --git a/doc/dlt-system.conf.5.txt b/doc/dlt-system.conf.5.txt index 60bed26..0b73481 100644 --- a/doc/dlt-system.conf.5.txt +++ b/doc/dlt-system.conf.5.txt @@ -12,7 +12,7 @@ The DLT system logging process is the central application, which logs system information from the platform. It provides the features filetransfer, syslog adapater, logging of any kind of files and procfilesystem logger. The individual features can be enabled and -disabled in the configuration file. +disabled in the configuration file. The configuration file dlt-system.conf allows to configure the different runtime behaviour of dlt-system. The configuration file is loaded @@ -38,7 +38,7 @@ SYSLOG ADAPTER OPTIONS Default: 0. *SyslogContextId*:: - This value defines context id of the syslog adapter. + This value defines context id of the syslog adapter. Default: SYSL @@ -107,7 +107,7 @@ FILETRANSFER OPTIONS Default: 10 *FiletransferTimeoutBetweenLogs*:: - This value defines the amount of time to wait between two file transfer + This value defines the amount of time to wait between two file transfer logs of a single file. Default: 10 @@ -121,7 +121,7 @@ LOG FILES OPTIONS Default: 0. *LogFileFilename*:: - This value sets the full filename path to the file, which should be logged. + This value sets the full filename path to the file, which should be logged. *LogFileMode*:: This value the defines in which operation mode this file is logged. @@ -151,13 +151,13 @@ LOG PROCESSES OPTIONS *LogProcessName*:: This value defines the name of the process to be logged, as used in the - file stat of each process. + file stat of each process. If the value is defined as *, all processes are logged. *LogProcessFilename*:: This value sets the relative filename path to the file, which should be logged. The path is relative to the procfilesystem folder of the - process. + process. *LogProcessMode*:: This value the defines in which operation mode this process file is diff --git a/doc/dlt.conf.5.txt b/doc/dlt.conf.5.txt index b21ab18..0ee3453 100644 --- a/doc/dlt.conf.5.txt +++ b/doc/dlt.conf.5.txt @@ -65,7 +65,7 @@ GENERAL OPTIONS *PersistanceStoragePath*:: This is the directory path, where the DLT daemon stores its runtime configuration. Runtime configuration includes stored log levels, trace - status and changed logging mode. + status and changed logging mode. Default: /tmp @@ -82,7 +82,7 @@ OFFLINE TRACE OPTIONS *OfflineTraceFileSize*:: This value defines the max size of a offline trace file, if offline trace is enabled. This value is defined in bytes. If the files size of the - current used log file is exceeded, a new log file is created. + current used log file is exceeded, a new log file is created. Default: 1000000 @@ -123,7 +123,7 @@ SERIAL CLIENT OPTIONS *RS232DeviceName*:: If this value is set to a serial device name, e.g. /dev/ttyS0, a serial - port is used for logging to a client. + port is used for logging to a client. Default: Serial port for logging is disabled diff --git a/doc/dlt_cheatsheet.txt b/doc/dlt_cheatsheet.txt index 2d52cac..2ca1586 100644 --- a/doc/dlt_cheatsheet.txt +++ b/doc/dlt_cheatsheet.txt @@ -49,10 +49,10 @@ pkg_check_modules(DLT REQUIRED automotive-dlt) ---- and use the variables $\{DLT_INCLUDE_DIRS\} and $\{DLT_LIBRARIES\} for the DLT include and library paths. - + Include the DLT Header ---------------------- -To use DLT you have to include the DLT header file in each file you want to use DLT. +To use DLT you have to include the DLT header file in each file you want to use DLT. ---- #include <dlt/dlt.h> @@ -74,7 +74,7 @@ int main(int argc, const char\* argv\[\]) } ---- -.Important notes: +.Important notes: * If your application uses fork(), you may not call DLT_REGISTER_APP before fork(). And fork() should never be called after DLT_REGISTER_APP. This is because of state information and inter process communication channel to daemon would be copied to new process, but threads would be not. If you are not sure where you are calling DLT_REGISTER_APP() the first time, you can initialise the DLT user library by calling the initialisation routine directly. ---- dlt_user_init(); @@ -141,7 +141,7 @@ The log level must be one of the following values: | Log level | Description | DLT_LOG_FATAL | fatal system error | DLT_LOG_ERROR | error with impact to correct functionality -| DLT_LOG_WARN | warning, correct behaviour could not be ensured +| DLT_LOG_WARN | warning, correct behaviour could not be ensured | DLT_LOG_INFO | informational (default) | DLT_LOG_DEBUG | debug | DLT_LOG_VERBOSE | highest grade of information @@ -166,11 +166,11 @@ The size of all logging parameters together should not exceed 2kBytes, including | DLT_STRING(TEXT) | String | DLT_RAW(BUF,LENGTH) | Raw buffer | DLT_INT(VAR) | Integer variable, dependent on platform -| DLT_INT16(VAR) | Integer 16 Bit variable +| DLT_INT16(VAR) | Integer 16 Bit variable | DLT_INT32(VAR) | Integer 32 Bit variable | DLT_INT64(VAR) | Integer 64 bit variable | DLT_UINT(VAR) | Unsigned integer variable -| DLT_UINT16(VAR) | Unsigned 16 Bit integer variable +| DLT_UINT16(VAR) | Unsigned 16 Bit integer variable | DLT_UINT32(VAR) | Unsigned 32 Bit integer variable | DLT_UINT64(VAR) | Unsigned 64 bit integer variable | DLT_BOOL(VAR) | Boolean variable @@ -202,7 +202,7 @@ int main(int argc, const char\* argv\[\]) DLT_REGISTER_CONTEXT(myContext2,"TES2","Test Context 2 for Logging"); DLT_REGISTER_CONTEXT(myContext3,"TES3","Test Context 3 for Logging"); - DLT_UNREGISTER_CONTEXT(myContext1); + DLT_UNREGISTER_CONTEXT(myContext1); DLT_UNREGISTER_CONTEXT(myContext2); DLT_UNREGISTER_CONTEXT(myContext3); @@ -240,12 +240,12 @@ int main() DLT_LOG(myContext2,DLT_LOG_INFO,DLT_INT(5),DLT_STRING("But this only information")); DLT_LOG(myContext3,DLT_LOG_DEBUG,DLT_INT(5),DLT_STRING("But this only information")); - /* Sleep some time to avoid a flaw in dlt-daemon that would eat your messages + /* Sleep some time to avoid a flaw in dlt-daemon that would eat your messages if you deregister while it still processes your registration */ sleep(3); /* unregister your contexts */ - DLT_UNREGISTER_CONTEXT(myContext1); + DLT_UNREGISTER_CONTEXT(myContext1); DLT_UNREGISTER_CONTEXT(myContext2); DLT_UNREGISTER_CONTEXT(myContext3); @@ -253,22 +253,22 @@ int main() DLT_UNREGISTER_APP(); return 0; - + } ---- .CMakeLists.txt ---- cmake_minimum_required(VERSION 2.6) - + find_package(PkgConfig) pkg_check_modules(DLT REQUIRED automotive-dlt) - + include_directories("${DLT_INCLUDE_DIRS}") - + project(DLTexample) add_executable(dlt_example dlt_example.c) - + target_link_libraries(dlt_example ${DLT_LIBRARIES}) ---- diff --git a/doc/dlt_design_specification.txt b/doc/dlt_design_specification.txt index 3e73af6..ce311d6 100644 --- a/doc/dlt_design_specification.txt +++ b/doc/dlt_design_specification.txt @@ -257,7 +257,7 @@ The following table shows, where the DLT messages are created. The message types [options="header"] |============================================================================================== | Type of message | DLT client | DLT daemon | DLT library -| Control request | X | X | +| Control request | X | X | | Control response | | X | | Log message | | | X | Trace message | | | X @@ -544,7 +544,7 @@ The DLT daemon implementation uses the following files, besides DLT functions fr [options="header"] |============================================================================================== -| File | Description +| File | Description | dlt-daemon.c | DLT daemon implementation | dlt-daemon.h | Header file for dlt-daemon.c | dlt-daemon_cfg.h | Compile time configuration for DLT daemon, Part1 @@ -570,18 +570,18 @@ The shared directory contains the following files: |============================================================================================== | File | Description | dlt_common.c | Common helper functions, such as: -- Print functions for DLT messages +- Print functions for DLT messages - Functions for handling DLT Ids - Filter functions - DLT message handling functions -- Functions for handling DLT files -- DLT receiver functions -- Log handling -- Ringbuffer functions +- Functions for handling DLT files +- DLT receiver functions +- Log handling +- Ringbuffer functions - Setting and checking of storage header | dlt_common_cfg.h | Compile time configuration for dlt_common.c | dlt_user_shared.c | Shared functions, required by the DLT daemon and the DLT user library, such as: -- Setting and checking the user header +- Setting and checking the user header - Sending DLT messages over named pipes (FIFOs) | dlt_user_shared.h | Header file for dlt_user_shared.c | dlt_user_shared_cfg.h | Compile time configuration for dlt_user_shared.c @@ -613,7 +613,7 @@ The following important structures are used in the DLT Daemon and DLT User Libra | DltDaemonApplication | Parameters of an application, used within DLT daemon | DltDaemonContext | Parameters of a context, used within DLT daemon | DltUserControlMsg... | User control messages -| DltContext | Each context is represented with this structure +| DltContext | Each context is represented with this structure | DltContextData | Temorary used structure for constructing a log message | DltUserInjectionCallback | One entry in dynamic callback table for callback function | dlt_ll_ts_type | Table managing all contexts (and loglevels and trce statuses) within DLT user library, contains dynamicly growing array with "DltUserInjectionCallback" entries diff --git a/doc/dlt_extended_network_trace.txt b/doc/dlt_extended_network_trace.txt index ec1c9b3..42cdf92 100644 --- a/doc/dlt_extended_network_trace.txt +++ b/doc/dlt_extended_network_trace.txt @@ -15,13 +15,13 @@ Extended Network Trace ====================== -Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> +Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> 0.0.1, 2012/10/11: Initial version image::images/genivi_chrome_1_transparent.png[width=128] == Introduction -The extended network trace allows the user to send or truncate network trace messages +The extended network trace allows the user to send or truncate network trace messages that are larger than the normal maximum size of a DLT message. == Protocol @@ -56,7 +56,7 @@ User can send a segmented network trace message asynchronously using: void dlt_user_trace_network_segmented(DltContext *handle, DltNetworkTraceType nw_trace_type, uint16_t header_len, void *header, uint16_t payload_len, void *payload) ---- -This will start a background thread and return immediately. +This will start a background thread and return immediately. User can also send all the required packages one by one using: diff --git a/doc/dlt_filetransfer.txt b/doc/dlt_filetransfer.txt index 564b12a..1298c0e 100644 --- a/doc/dlt_filetransfer.txt +++ b/doc/dlt_filetransfer.txt @@ -22,13 +22,13 @@ image::images/genivi_chrome_1_transparent.png[width=128] Overview -------- -DLT is a reusable open source software component for standardized logging and tracing in infotainment ECUs based on the AUTOSAR 4.0 standard. +DLT is a reusable open source software component for standardized logging and tracing in infotainment ECUs based on the AUTOSAR 4.0 standard. The goal of DLT is the consolidation of the existing variety of logging and tracing protocols on one format. Introduction to DLT Filetransfer --------------------------------- -With DLT Filetransfer it is possible store the binary data of a file to the automotive dlt log. +With DLT Filetransfer it is possible store the binary data of a file to the automotive dlt log. The file will be read in binary mode and put as several chunks to a DLT_INFO log. With a special plugin of the dlt viewer, you can extract the embedded files from the trace and save them. It can be used for smaller files, e.g. HMI screenshots or little coredumps. @@ -178,7 +178,7 @@ There are two ways to use the filetransfer * Automatic filetransfer in one step * Header, data and end package order handeld by the user -Automatic +Automatic ~~~~~~~~~ Call @@ -250,7 +250,7 @@ It's important that the dlt-filetransfer example files are installed in /usr/sha * testFile1Run1 Test the file transfer with the condition that the transferred file is smaller as the file transfer buffer using dlt_user_log_file_complete. * testFile1Run2 -Test the file transfer with the condition that the transferred file is smaller as the file transfer buffer using single package transfer +Test the file transfer with the condition that the transferred file is smaller as the file transfer buffer using single package transfer * testFile2Run1 Test the file transfer with the condition that the transferred file is bigger as the file transfer buffer using dlt_user_log_file_complete. * testFile2Run2 diff --git a/doc/dlt_howto_debug.txt b/doc/dlt_howto_debug.txt index 9ae9ed9..380f49b 100644 --- a/doc/dlt_howto_debug.txt +++ b/doc/dlt_howto_debug.txt @@ -15,7 +15,7 @@ How To - Debug DLT Daemon ========================= -Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> +Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> 0.0.1, 2013/03/18: Initial version image::images/genivi_chrome_1_transparent.png[width=128] @@ -32,7 +32,7 @@ The purpose is to provide the user with a clean working environment, where: * dlt-daemon, library and all tools can be compiled from Eclipse UI without command line * Debugger can be easily launched for any of the binaries in dlt-daemon project -Anything in +Anything in ---- code ---- @@ -72,7 +72,7 @@ Purpose: DLT utilizes cmake for build management. ---- sudo apt-get install git ---- -This will install git version control tool. +This will install git version control tool. Purpose: dlt-daemon version control is managed using git. Git is needed to clone the source code repository. @@ -91,7 +91,7 @@ At the time of writing, _"Eclipse CDT Juno"_ was the latest version. Extract the package to a directory. You should now have directory named "eclipse", which contains a binary called "eclipse". You should be able to start Eclipse by double clicking on the binary. In case there are problems, make sure you have proper permissions for the directory, sub-directories and that the binary has "executable"-flag set. ---- -chmod u+x eclipse +chmod u+x eclipse ---- if required. @@ -129,7 +129,7 @@ If these commands succeeded, you can continue. If there were errors, please reme Clean up the git directory. The following command will delete all files that are not part of the repository. Please use caution. ---- -git clean -fdx +git clean -fdx ---- Now you have a working source directory. We can proceed to setting up the Eclipse project. @@ -147,7 +147,7 @@ image:images/eclipse-create-c-project.png[] Name the project _"dlt-daemon"_. -Select: _"Makefile project -> Empty Project"_ from the left and _"-- Other Toolchain --"_ from the right. +Select: _"Makefile project -> Empty Project"_ from the left and _"-- Other Toolchain --"_ from the right. Make a note of the project location. This will be know *DLT_PROJECT_DIR* from now on in this document. @@ -229,11 +229,11 @@ In the following dialog, select _"General -> File system"_ and *click* _"Next"_ image:images/eclipse-import-links.png[] -*Click* _"Browse"_ and navigate to your DLT_GIT_DIR. +*Click* _"Browse"_ and navigate to your DLT_GIT_DIR. -*Check* _"dlt-daemon"_ root directory. +*Check* _"dlt-daemon"_ root directory. -*Click* _"Advanced"_ and *Check* _"Create links"_ and _"Create virtual folders"_. +*Click* _"Advanced"_ and *Check* _"Create links"_ and _"Create virtual folders"_. *Click* _"Filter types..."_ and only check the file types you want to see _"*.c, *.h"_ is sufficient for most cases. diff --git a/doc/dlt_user_manual.txt b/doc/dlt_user_manual.txt index 2d16509..f8938d0 100644 --- a/doc/dlt_user_manual.txt +++ b/doc/dlt_user_manual.txt @@ -219,12 +219,12 @@ DLT_REGISTER_CONTEXT(mycontext,"TEST","Test Context for Logging"); } ---- -.Important notes: +.Important notes: * If your application uses fork(), you may not call DLT_REGISTER_APP before fork(). And fork() should never be called after DLT_REGISTER_APP. This is because of state information and inter process communication channel to daemon would be copied to new process, but threads would be not. * DLT_REGISTER_APP is asynchronous. It may take some milliseconds to establish the IPC channel. Because of this, you might lose messages if you log immediately after registering. Typically this is not a problem, but may arise especially with simple examples. ==== Use one of the DLT macros or the DLT function interface: -Here we use the macro interface of DLT. +Here we use the macro interface of DLT. ---- DLT_LOG(mycontext,DLT_LOG_WARN,DLT_INT(5),DLT_STRING("This is a warning")); @@ -305,7 +305,7 @@ The DLT functional interface provides a very easy to use interface. The C interf [options="header"] |============================================================================================== | Command | Description -| #include <dlt/dlt.h> | The first thing to do is to include the standard header file of DLT: +| #include <dlt/dlt.h> | The first thing to do is to include the standard header file of DLT: | DltContext mycontext; | The next thing is to create an instance of each used context of an application. This has to be done outside of the source code before using any context. The name of the instance can be defined by the user. | DltContextData mycontextdata; | Additionally, a data buffer used to construct the DLT log messages must be created: | dlt_register_app("LOG","Test Application for Logging"); | In the next step in the initialization of the application the application must be registered in the DLT daemon. The identifier of the application, here "LOG", has a maximum of four characters. @@ -314,16 +314,16 @@ The DLT functional interface provides a very easy to use interface. The C interf | | Choose now between verbose mode and non-verbose mode: | dlt_verbose_mode(); | For verbose mode (default): Optionally switch to verbose mode by calling the function dlt_verbose_mode: | if (dlt_user_log_write_start(&mycontext,&mycontextdata,DLT_LOG_WARN)) -{ - dlt_user_log_write_int(&mycontextdata,num); +{ + dlt_user_log_write_int(&mycontextdata,num); dlt_user_log_write_string(&mycontextdata,text); - dlt_user_log_write_finish(&mycontextdata); + dlt_user_log_write_finish(&mycontextdata); } | After registration a context can be used to send log messages to the DLT daemon. The dlt_user_log_write function has to be called first with a pointer to the context, a pointer to the data buffer and the used log level of the log messages. For each parameter added to the DLT log message a call to dlt_user_log_write_xxx has to be done. A complete list of parameters you will find in the Addendum API specification. Sending of the DLT message is done by calling dlt_user_log_write_finish. | dlt_log_int(&mycontext, DLT_LOG_WARN, num); dlt_log_string_int(&mycontext, DLT_LOG_WARN, text, num); | As an alternative, the high level logging functions can be used which exists for special combination of parameters. A complete list you will find in the Addendum API specification. | dlt_nonverbose_mode(); | For non-verbose mode : Switch to non-verbose mode by calling the function dlt_nonverbose_mode: | if (dlt_user_log_write_start_id(&mycontext,&mycontextdata,DLT_LOG_WARN,msgid)) -{ - dlt_user_log_write_int(&mycontextdata,num); +{ + dlt_user_log_write_int(&mycontextdata,num); dlt_user_log_write_string(&mycontextdata,text); dlt_user_log_write_finish(&mycontextdata); } | After registration a context can be used to send log messages to the DLT daemon. The dlt_user_log_write_start_id function has to be called first with a pointer to the context, a pointer to the context data, the used log level of the log messages and the message id. For each parameter added to the DLT log message a call to dlt_user_log_write_xxx has to be done. A complete list of parameters you will find in the Addendum API specification. Sending of the DLT message is done by calling dlt_user_log_write_finish. diff --git a/doc/doxygen.cfg.cmake b/doc/doxygen.cfg.cmake index f14479c..5c17864 100755 --- a/doc/doxygen.cfg.cmake +++ b/doc/doxygen.cfg.cmake @@ -591,7 +591,7 @@ WARN_LOGFILE = # with spaces. INPUT = @CMAKE_SOURCE_DIR@/doc/mainpage.h \ - @CMAKE_SOURCE_DIR@/src/ \ + @CMAKE_SOURCE_DIR@/src/ \ @CMAKE_SOURCE_DIR@/include @@ -626,7 +626,7 @@ FILE_PATTERNS = *.c \ *.hh \ *.hxx \ *.hpp \ - *.h++ + *.h++ # The RECURSIVE tag can be used to turn specify whether or not subdirectories diff --git a/doc/extended_network_trace_doxygen.cfg.cmake b/doc/extended_network_trace_doxygen.cfg.cmake index 9cf51cc..adefc59 100755 --- a/doc/extended_network_trace_doxygen.cfg.cmake +++ b/doc/extended_network_trace_doxygen.cfg.cmake @@ -625,7 +625,7 @@ FILE_PATTERNS = *.c \ *.hh \ *.hxx \ *.hpp \ - *.h++ + *.h++ # The RECURSIVE tag can be used to turn specify whether or not subdirectories @@ -1378,7 +1378,7 @@ HIDE_UNDOC_RELATIONS = YES # toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) -HAVE_DOT = +HAVE_DOT = # By default doxygen will write a font called FreeSans.ttf to the output # directory and reference it in all dot files that doxygen generates. This diff --git a/doc/mainpage.h b/doc/mainpage.h index 34bc861..82648e3 100644 --- a/doc/mainpage.h +++ b/doc/mainpage.h @@ -26,7 +26,7 @@ License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. can be found at http://projects.genivi.org/diagnostic-log-trace/ \n \par About DLT -DLT is a reusable open source software component for standardized logging and tracing in infotainment ECUs based on the AUTOSAR 4.0 standard. +DLT is a reusable open source software component for standardized logging and tracing in infotainment ECUs based on the AUTOSAR 4.0 standard. The goal of DLT is the consolidation of the existing variety of logging and tracing protocols on one format. diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h index 467fa6e..0f8531c 100755 --- a/include/dlt/dlt_common.h +++ b/include/dlt/dlt_common.h @@ -1020,7 +1020,7 @@ extern "C" /** * Initialise static ringbuffer with a size of size. - * Initialise as server. Init counters. + * Initialise as server. Init counters. * Memory is already allocated. * @param buf Pointer to ringbuffer structure * @param ptr Ptr to ringbuffer memory diff --git a/include/dlt/dlt_filetransfer.h b/include/dlt/dlt_filetransfer.h index 43047f4..52ed5e5 100644 --- a/include/dlt/dlt_filetransfer.h +++ b/include/dlt/dlt_filetransfer.h @@ -58,7 +58,7 @@ * In the next step some generic informations about the file will be logged to dlt. * Now the header will be logged to dlt. See the method dlt_user_log_file_header for more informations. * Then the method dlt_user_log_data will be called with the parameter to log all packages in a loop with some timeout. - * At last dlt_user_log_end is called to signal that the complete file transfer was okey. This is important for the plugin of the dlt viewer. + * At last dlt_user_log_end is called to signal that the complete file transfer was okey. This is important for the plugin of the dlt viewer. * @param fileContext Specific context to log the file to dlt * @param filename Absolute file path * @param deleteFlag Flag if the file will be deleted after transfer. 1->delete, 0->notDelete diff --git a/include/dlt/dlt_offline_trace.h b/include/dlt/dlt_offline_trace.h index 64a0958..64a6afe 100644 --- a/include/dlt/dlt_offline_trace.h +++ b/include/dlt/dlt_offline_trace.h @@ -65,7 +65,6 @@ typedef struct char filename[NAME_MAX + 1]; /**< (String) Filename of currently used log file */ int fileSize; /**< (int) Maximum size in bytes of one trace file (Default: 1000000) */ int maxSize; /**< (int) Maximum size of all trace files (Default: 4000000) */ - int ohandle; } DltOfflineTrace; @@ -94,7 +93,7 @@ extern int dlt_offline_trace_free(DltOfflineTrace *buf); /** * Write data into offline trace - * If the current used log file exceeds the max file size, new log file is created. + * If the current used log file exceeds the max file size, new log file is created. * A check of the complete size of the offline trace is done before new file is created. * Old files are deleted, if there is not enough space left to create new file. * @param trace pointer to offline trace structure diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h index b6181bf..66a869b 100644 --- a/include/dlt/dlt_user.h +++ b/include/dlt/dlt_user.h @@ -272,9 +272,9 @@ typedef struct 0 not connected, -1 unknown */ - //DltRingBuffer rbuf; + //DltRingBuffer rbuf; DltBuffer startup_buffer; /**< Ring-buffer for buffering messages during startup and missing connection */ - + // Buffer used for resending, locked by DLT semaphore uint8_t resend_buffer[DLT_USER_RESENDBUF_MAX_SIZE]; @@ -575,7 +575,7 @@ int dlt_unregister_context(DltContext *handle); * Set the logging mode used by the daemon. * The logging mode is stored persistantly by the daemon. * @see DltUserLogMode - * @param mode the new logging mode used by the daemon: off, extern, internal, both. + * @param mode the new logging mode used by the daemon: off, extern, internal, both. * @return negative value if there was an error */ int dlt_set_log_mode(DltUserLogMode mode); diff --git a/include/dlt/dlt_user_macros.h b/include/dlt/dlt_user_macros.h index 2e2528c..3bb161f 100644 --- a/include/dlt/dlt_user_macros.h +++ b/include/dlt/dlt_user_macros.h @@ -200,7 +200,7 @@ * @param CONTEXT object containing information about one special logging context * @param LOGLEVEL the log level of the log message * @param MSGID the message id of log message - * @param ARGS variable list of arguments: + * @param ARGS variable list of arguments: calls to DLT_STRING(), DLT_BOOL(), DLT_FLOAT32(), DLT_FLOAT64(), DLT_INT(), DLT_UINT(), DLT_RAW() * @note To avoid the MISRA warning "The comma operator has been used outside a for statement" diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index 675d958..41cc807 100644 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -214,7 +214,7 @@ int option_file_parser(DltDaemonLocal *daemon_local) pch = strtok (line," =\r\n"); token[0]=0; value[0]=0; - + while (pch != NULL) { if(strcmp(pch,"#")==0) @@ -234,7 +234,7 @@ int option_file_parser(DltDaemonLocal *daemon_local) pch = strtok (NULL, " =\r\n"); } - + if(token[0] && value[0]) { /* parse arguments here */ @@ -393,7 +393,7 @@ int option_file_parser(DltDaemonLocal *daemon_local) else { fprintf(stderr, "Cannot open configuration file: %s\n",filename); - } + } return 0; } @@ -425,7 +425,7 @@ int main(int argc, char* argv[]) } return -1; } - + /* Initialize internal logging facility */ dlt_log_set_filename(daemon_local.flags.loggingFilename); dlt_log_set_level(daemon_local.flags.loggingLevel); @@ -489,8 +489,8 @@ int main(int argc, char* argv[]) create_timer_fd(&daemon_local, 60, 60, &daemon_local.timer_sixty_s, "ECU version"); } - // For offline tracing we still can use the same states - // as for socket sending. Using this trick we see the traces + // For offline tracing we still can use the same states + // as for socket sending. Using this trick we see the traces // In the offline trace AND in the socket stream. if(daemon_local.flags.yvalue[0]) dlt_daemon_change_state(&daemon,DLT_DAEMON_STATE_SEND_DIRECT); @@ -705,7 +705,7 @@ int dlt_daemon_local_init_p1(DltDaemon *daemon, DltDaemonLocal *daemon_local, in signal(SIGHUP, dlt_daemon_signal_handler); /* hangup signal */ signal(SIGQUIT, dlt_daemon_signal_handler); signal(SIGINT, dlt_daemon_signal_handler); - + return 0; } @@ -757,7 +757,7 @@ int dlt_daemon_local_init_p2(DltDaemon *daemon, DltDaemonLocal *daemon_local, in return -1; } #endif - + /* prepare main loop */ if (dlt_message_init(&(daemon_local->msg),daemon_local->flags.vflag)==-1) { @@ -783,13 +783,13 @@ int dlt_daemon_local_init_p2(DltDaemon *daemon, DltDaemonLocal *daemon_local, in return -1; } } - + /* configure sending timing packets */ - if (daemon_local->flags.sendMessageTime) + if (daemon_local->flags.sendMessageTime) { daemon->timingpackets = 1; } - + /* Binary semaphore for thread */ if (sem_init(&dlt_daemon_mutex, 0, 1)==-1) { @@ -1152,10 +1152,10 @@ void dlt_daemon_daemonize(int verbose) } /* dlt_daemon_daemonize() */ /* This function logs str to the configured output sink (socket, serial, offline trace). - To avoid recursion this function must be called only from DLT highlevel functions. + To avoid recursion this function must be called only from DLT highlevel functions. E. g. calling it to output a failure when the open of the offline trace file fails would cause an endless loop because dlt_daemon_log_internal() would itself again try - to open the offline trace file. + to open the offline trace file. This is a dlt-daemon only function. The libdlt has no equivalent function available. */ int dlt_daemon_log_internal(DltDaemon *daemon, DltDaemonLocal *daemon_local, char *str, int verbose) { @@ -1166,18 +1166,18 @@ int dlt_daemon_log_internal(DltDaemon *daemon, DltDaemonLocal *daemon_local, cha uint16_t uiSize; uint32_t uiExtraSize; int ret; - + PRINT_FUNCTION_VERBOSE(verbose); // Set storageheader msg.storageheader = (DltStorageHeader *)(msg.headerbuffer); dlt_set_storageheader(msg.storageheader, daemon->ecuid); - // Set standardheader + // Set standardheader msg.standardheader = (DltStandardHeader *)(msg.headerbuffer + sizeof(DltStorageHeader)); msg.standardheader->htyp = DLT_HTYP_UEH | DLT_HTYP_WEID | DLT_HTYP_WSID | DLT_HTYP_WTMS | DLT_HTYP_PROTOCOL_VERSION1; msg.standardheader->mcnt = uiMsgCount++; - + uiExtraSize = DLT_STANDARD_HEADER_EXTRA_SIZE(msg.standardheader->htyp)+(DLT_IS_HTYP_UEH(msg.standardheader->htyp) ? sizeof(DltExtendedHeader) : 0); msg.headersize = sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + uiExtraSize; @@ -1247,7 +1247,7 @@ int dlt_daemon_log_internal(DltDaemon *daemon, DltDaemonLocal *daemon_local, cha } free(msg.databuffer); - + return 0; } @@ -1333,7 +1333,7 @@ int dlt_daemon_process_client_connect(DltDaemon *daemon, DltDaemonLocal *daemon_ dlt_log(LOG_WARNING,"Can't send contents of ringbuffer to clients\n"); return -1; } - + /* send new log state to all applications */ daemon->connectionState = 1; dlt_daemon_user_send_all_log_state(daemon,verbose); @@ -2104,12 +2104,12 @@ int dlt_daemon_process_user_message_log(DltDaemon *daemon, DltDaemonLocal *daemo { if(ret!=DLT_MESSAGE_ERROR_SIZE) { - /* This is a normal usecase: The daemon reads the data in 10kb chunks. + /* This is a normal usecase: The daemon reads the data in 10kb chunks. Thus the last trace in this chunk is probably not complete and will be completed with the next chunk read. This happens always when the FIFO is filled with more than 10kb before - the daemon is able to read from the FIFO. - Thus the loglevel of this message is set to DEBUG. - A cleaner solution would be to check more in detail whether the message is not complete (normal usecase) + the daemon is able to read from the FIFO. + Thus the loglevel of this message is set to DEBUG. + A cleaner solution would be to check more in detail whether the message is not complete (normal usecase) or the headers are corrupted (error case). */ dlt_log(LOG_DEBUG,"Can't read messages from receiver\n"); } @@ -2235,10 +2235,10 @@ int dlt_daemon_process_user_message_log_shm(DltDaemon *daemon, DltDaemonLocal *d } userheader = (DltUserHeader*) (daemon_local->receiver.buf); - + //dlt_shm_status(&(daemon_local->dlt_shm)); while (1) - { + { /* log message in SHM */ if((size = dlt_shm_copy(&(daemon_local->dlt_shm),rcv_buffer,10000)) <= 0) break; @@ -2246,13 +2246,13 @@ int dlt_daemon_process_user_message_log_shm(DltDaemon *daemon, DltDaemonLocal *d break; dlt_log(LOG_WARNING,"Can't read messages from shm\n"); return -1; - } + } bytes_to_be_removed = daemon_local->msg.headersize+daemon_local->msg.datasize-sizeof(DltStorageHeader)+sizeof(DltUserHeader); if (daemon_local->msg.found_serialheader) { bytes_to_be_removed += sizeof(dltSerialHeader); } - + /* set overwrite ecu id */ if (daemon_local->flags.evalue[0]) { @@ -2381,14 +2381,14 @@ int dlt_daemon_process_user_message_log_shm(DltDaemon *daemon, DltDaemonLocal *d if(userheader->message == DLT_USER_MESSAGE_LOG_SHM) { /* dlt message was sent, remove from buffer if log message from shm */ dlt_shm_remove(&(daemon_local->dlt_shm)); - } + } } else { /* dlt message was not sent, keep in buffer */ break; } - + } /* keep not read data in buffer */ @@ -2397,7 +2397,7 @@ int dlt_daemon_process_user_message_log_shm(DltDaemon *daemon, DltDaemonLocal *d dlt_log(LOG_WARNING,"Can't remove bytes from receiver for user message overflow\n"); return -1; } - + return 0; } #endif @@ -2680,8 +2680,8 @@ int dlt_daemon_close_socket(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_ daemon->connectionState = 0; dlt_daemon_user_send_all_log_state(daemon,verbose); - // For offline tracing we still can use the same states - // as for socket sending. Using this trick we see the traces + // For offline tracing we still can use the same states + // as for socket sending. Using this trick we see the traces // In the offline trace AND in the socket stream. if(daemon_local->flags.yvalue[0] == 0) dlt_daemon_change_state(daemon,DLT_DAEMON_STATE_BUFFER); diff --git a/src/daemon/dlt-daemon_cfg.h b/src/daemon/dlt-daemon_cfg.h index b92c595..8870217 100755 --- a/src/daemon/dlt-daemon_cfg.h +++ b/src/daemon/dlt-daemon_cfg.h @@ -79,11 +79,11 @@ #define DLT_DAEMON_ECU_VERSION_THREAD_STACKSIZE 100000 /* Size of receive buffer for fifo connection (from user application) */ -#define DLT_DAEMON_RCVBUFSIZE 10024 +#define DLT_DAEMON_RCVBUFSIZE 10024 /* Size of receive buffer for socket connection (from dlt client) */ -#define DLT_DAEMON_RCVBUFSIZESOCK 10024 +#define DLT_DAEMON_RCVBUFSIZESOCK 10024 /* Size of receive buffer for serial connection (from dlt client) */ -#define DLT_DAEMON_RCVBUFSIZESERIAL 10024 +#define DLT_DAEMON_RCVBUFSIZESERIAL 10024 /* Size of buffer for text output */ #define DLT_DAEMON_TEXTSIZE 10024 @@ -95,15 +95,15 @@ #define DLT_DAEMON_DESCSIZE 256 /* Name of daemon lock file, contain process id of dlt daemon instance */ -#define DLT_DAEMON_LOCK_FILE "dltd.lock" +#define DLT_DAEMON_LOCK_FILE "dltd.lock" /* Umask of daemon, creates files with permission 750 */ -#define DLT_DAEMON_UMASK 027 +#define DLT_DAEMON_UMASK 027 /* Permissions of daemon lock file */ #define DLT_DAEMON_LOCK_FILE_PERM 0640 /* Default ECU ID, used in storage header and transmitted to client*/ -#define DLT_DAEMON_ECU_ID "ECU1" +#define DLT_DAEMON_ECU_ID "ECU1" /* Default baudrate for serial interface */ #define DLT_DAEMON_SERIAL_DEFAULT_BAUDRATE 115200 diff --git a/src/daemon/dlt.conf b/src/daemon/dlt.conf index 1032a9a..d3ba7f3 100644 --- a/src/daemon/dlt.conf +++ b/src/daemon/dlt.conf @@ -41,7 +41,7 @@ LoggingLevel = 6 # The logging filename if internal logging mode is log to file (Default: /tmp/dlt.log) LoggingFilename = /tmp/dlt.log -# Timeout on send to client (sec) +# Timeout on send to client (sec) TimeOutOnSend = 4 # The minimum size of the Ringbuffer, used for storing temporary DLT messages, until client is connected (Default: 500000) diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c index a41dba7..c28f098 100644 --- a/src/daemon/dlt_daemon_client.c +++ b/src/daemon/dlt_daemon_client.c @@ -101,8 +101,8 @@ int dlt_daemon_client_send(int sock,DltDaemon *daemon,DltDaemonLocal *daemon_loc } /* write message to offline trace */ - // In the SEND_BUFFER state we must skip offline tracing because the offline traces - // are going without buffering directly to the offline trace. Thus we have to filter out + // In the SEND_BUFFER state we must skip offline tracing because the offline traces + // are going without buffering directly to the offline trace. Thus we have to filter out // the traces that are coming from the buffer. if ((sock!=DLT_DAEMON_SEND_FORCE) && (daemon->state != DLT_DAEMON_STATE_SEND_BUFFER)) { diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c index 8cb97a4..ad1256e 100644 --- a/src/daemon/dlt_daemon_common.c +++ b/src/daemon/dlt_daemon_common.c @@ -146,7 +146,7 @@ int dlt_daemon_init(DltDaemon *daemon,unsigned long RingbufferMinSize,unsigned l daemon->overflow_counter = 0; daemon->runtime_context_cfg_loaded = 0; - + daemon->mode = DLT_USER_MODE_EXTERNAL; daemon->connectionState = 0; /* no logger connected */ @@ -200,10 +200,10 @@ int dlt_daemon_init(DltDaemon *daemon,unsigned long RingbufferMinSize,unsigned l { daemon->runtime_context_cfg_loaded = 1; } - + /* load configuration if available */ dlt_daemon_configuration_load(daemon,daemon->runtime_configuration, verbose); - + daemon->sendserialheader = 0; daemon->timingpackets = 0; @@ -1061,7 +1061,7 @@ int dlt_daemon_configuration_load(DltDaemon *daemon,const char *filename, int ve pch = strtok (line," =\r\n"); token[0]=0; value[0]=0; - + while (pch != NULL) { if(strcmp(pch,"#")==0) @@ -1081,7 +1081,7 @@ int dlt_daemon_configuration_load(DltDaemon *daemon,const char *filename, int ve pch = strtok (NULL, " =\r\n"); } - + if(token[0] && value[0]) { /* parse arguments here */ @@ -1109,8 +1109,8 @@ int dlt_daemon_configuration_load(DltDaemon *daemon,const char *filename, int ve { snprintf(str,DLT_DAEMON_COMMON_TEXTBUFSIZE,"Cannot open configuration file: %s\n",filename); dlt_log(LOG_WARNING, str); - } - + } + return 0; } diff --git a/src/daemon/dlt_daemon_common_cfg.h b/src/daemon/dlt_daemon_common_cfg.h index f7718ef..e0f99da 100755 --- a/src/daemon/dlt_daemon_common_cfg.h +++ b/src/daemon/dlt_daemon_common_cfg.h @@ -96,14 +96,14 @@ /* Context ID used when the dlt daemon creates a control message */ #define DLT_DAEMON_CTRL_CTID "DC1" -/* Number of entries to be allocated at one in application table, +/* Number of entries to be allocated at one in application table, when no more entries are available */ #define DLT_DAEMON_APPL_ALLOC_SIZE 500 -/* Number of entries to be allocated at one in context table, +/* Number of entries to be allocated at one in context table, when no more entries are available */ #define DLT_DAEMON_CONTEXT_ALLOC_SIZE 1000 -/* Debug get log info function, +/* Debug get log info function, set to 1 to enable, 0 to disable debugging */ #define DLT_DEBUG_GETLOGINFO 0 diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index d44baab..b91496e 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -15,7 +15,7 @@ # @licence end@ ####### -include_directories( +include_directories( ${CMAKE_SOURCE_DIR}/ ${CMAKE_SOURCE_DIR}/include/dlt ${DBUS_INCLUDE_DIRS} @@ -24,7 +24,7 @@ include_directories( set(dlt_dbus_SRCS dlt-dbus.c dlt-dbus-options.c) add_executable(dlt-dbus ${dlt_dbus_SRCS}) target_link_libraries(dlt-dbus dlt ${DBUS_LIBRARIES}) - + set_target_properties(dlt-dbus PROPERTIES LINKER_LANGUAGE C) install(TARGETS dlt-dbus diff --git a/src/dbus/dlt-dbus.conf b/src/dbus/dlt-dbus.conf index 67223f5..1c00880 100644 --- a/src/dbus/dlt-dbus.conf +++ b/src/dbus/dlt-dbus.conf @@ -2,7 +2,7 @@ # ######################################################################## -# General configuration +# General configuration ######################################################################## # The application Id used for DBus Trace (Default: DBUS) diff --git a/src/examples/dlt-example-filetransfer.c b/src/examples/dlt-example-filetransfer.c index 23499ce..a56e09d 100644 --- a/src/examples/dlt-example-filetransfer.c +++ b/src/examples/dlt-example-filetransfer.c @@ -92,8 +92,8 @@ void usage() printf("-a apid - Set application id to apid (default: FLTR)\n"); printf("-c ctid - Set context id to ctid (default: FLTR)\n"); printf("-t ms - Timeout between file packages in ms (minimum 1 ms)\n"); - printf("-d - Flag to delete the file after the transfer (default: false)\n"); - printf("-i - Flag to log file infos to DLT before transfer file (default: false)\n"); + printf("-d - Flag to delete the file after the transfer (default: false)\n"); + printf("-i - Flag to log file infos to DLT before transfer file (default: false)\n"); printf("-h - This help\n"); } @@ -101,13 +101,13 @@ void usage() //!Main program dlt-test-filestransfer starts here int main(int argc, char* argv[]) -{ +{ //char str[MAXSTRLEN]; int opt, timeout; char apid[DLT_ID_SIZE]; char ctid[DLT_ID_SIZE]; - + //char version[255]; int index; int dflag = 0; @@ -172,7 +172,7 @@ int main(int argc, char* argv[]) } } } - + for (index = optind; index < argc; index++) { file = argv[index]; @@ -198,11 +198,11 @@ int main(int argc, char* argv[]) //Register the application at the dlt-daemon DLT_REGISTER_APP(apid,FLTR_APP_DESC); - + //Register the context of the main program at the dlt-daemon DLT_REGISTER_CONTEXT(fileContext,ctid,FLTR_CONTEXT_DESC); - - //More details in corresponding methods + + //More details in corresponding methods if( iflag ) { dlt_user_log_file_infoAbout(&fileContext,file); @@ -212,11 +212,11 @@ int main(int argc, char* argv[]) { printf("File couldn't be transferred. Please check the dlt log messages.\n"); } - + //Unregister the context in which the file transfer happened from the dlt-daemon DLT_UNREGISTER_CONTEXT(fileContext); //Unregister the context of the main program from the dlt-daemon DLT_UNREGISTER_APP(); - + return 0; } diff --git a/src/examples/dlt-example-non-verbose-1.xml b/src/examples/dlt-example-non-verbose-1.xml index 0a49302..e1c34e2 100755 --- a/src/examples/dlt-example-non-verbose-1.xml +++ b/src/examples/dlt-example-non-verbose-1.xml @@ -313,7 +313,7 @@ </fx:MANUFACTURER-EXTENSION> </fx:FRAME> </fx:FRAMES> - + <!--*************************** signals **************************--> <fx:SIGNALS> <!--======================= BOOL =====================--> @@ -388,9 +388,9 @@ </fx:SIGNAL> </fx:SIGNALS> </fx:ELEMENTS> - + <!--********************* PROCESSING INFORMATION *********************--> - + <fx:PROCESSING-INFORMATION> <!--*************************** codings ****************************--> <fx:CODINGS> diff --git a/src/examples/dlt-example-user-common-api.c b/src/examples/dlt-example-user-common-api.c index 061c948..dba4897 100644 --- a/src/examples/dlt-example-user-common-api.c +++ b/src/examples/dlt-example-user-common-api.c @@ -97,7 +97,7 @@ void usage() int main(int argc, char* argv[]) { #ifdef DLT_TEST_ENABLE - int cflag = 0; + int cflag = 0; char *svalue = 0; char *zvalue = 0; #endif /* DLT_TEST_ENABLE */ @@ -112,7 +112,7 @@ int main(int argc, char* argv[]) char *text; int num,maxnum; int delay; - + int state=-1,newstate; opterr = 0; @@ -200,7 +200,7 @@ int main(int argc, char* argv[]) DLT_REGISTER_CONTEXT_APP(mycontext,"TEST","LOG","Test Context for Logging"); text = message; - + if (nvalue) { maxnum = atoi(nvalue); @@ -270,7 +270,7 @@ int main(int argc, char* argv[]) printf("Client connected!\n"); } } - + if (gflag) { /* Non-verbose mode */ diff --git a/src/examples/dlt-example-user.c b/src/examples/dlt-example-user.c index 6d041c3..e428047 100755 --- a/src/examples/dlt-example-user.c +++ b/src/examples/dlt-example-user.c @@ -117,7 +117,7 @@ int main(int argc, char* argv[]) int aflag = 0; int kflag = 0; #ifdef DLT_TEST_ENABLE - int cflag = 0; + int cflag = 0; char *svalue = 0; char *zvalue = 0; #endif /* DLT_TEST_ENABLE */ @@ -133,7 +133,7 @@ int main(int argc, char* argv[]) char *text; int num,maxnum; int delay; - + int state=-1,newstate; opterr = 0; @@ -262,9 +262,9 @@ int main(int argc, char* argv[]) if(mvalue) { printf("Set log mode to %d\n",atoi(mvalue)); - dlt_set_log_mode(atoi(mvalue)); + dlt_set_log_mode(atoi(mvalue)); } - + if (gflag) { @@ -350,7 +350,7 @@ int main(int argc, char* argv[]) printf("Client connected!\n"); } } - + if (gflag) { /* Non-verbose mode */ diff --git a/src/lib/dlt_client_cfg.h b/src/lib/dlt_client_cfg.h index b611681..c2592e6 100755 --- a/src/lib/dlt_client_cfg.h +++ b/src/lib/dlt_client_cfg.h @@ -80,10 +80,10 @@ #define DLT_CLIENT_DUMMY_CON_ID "CC1" /* Size of buffer */ -#define DLT_CLIENT_TEXTBUFSIZE 512 +#define DLT_CLIENT_TEXTBUFSIZE 512 /* Size of receive buffer */ -#define DLT_CLIENT_RCVBUFSIZE 10024 +#define DLT_CLIENT_RCVBUFSIZE 10024 /* Initial baudrate */ #if !defined (__WIN32__) && !defined(_MSC_VER) diff --git a/src/lib/dlt_filetransfer.c b/src/lib/dlt_filetransfer.c index 9b1996f..8dc6e8f 100644 --- a/src/lib/dlt_filetransfer.c +++ b/src/lib/dlt_filetransfer.c @@ -180,7 +180,7 @@ char* getFileCreationDate2(const char* file,int *ok){ */ int isFile (const char* file) { - struct stat st; + struct stat st; return (stat (file, &st) == 0); } @@ -216,7 +216,7 @@ int checkUserBufferForFreeSpace() * @return If the file is successfully deleted, a zero value is returned.If the file can not be deleted a nonzero value is returned. */ int doRemoveFile(const char*filename){ - return remove( filename); + return remove( filename); } void dlt_user_log_file_errorMessage(DltContext *fileContext, const char *filename, int errorCode){ @@ -247,7 +247,7 @@ void dlt_user_log_file_errorMessage(DltContext *fileContext, const char *filenam DLT_INT(package_count), DLT_UINT(BUFFER_SIZE), DLT_STRING("FLER") - ); + ); } else { DLT_LOG(*fileContext,DLT_LOG_ERROR, DLT_STRING("FLER"), @@ -268,7 +268,7 @@ void dlt_user_log_file_errorMessage(DltContext *fileContext, const char *filenam * @return Returns 0 if everything was okey.If there was a failure a value < 0 will be returned. */ int dlt_user_log_file_infoAbout(DltContext *fileContext, const char *filename){ - + if(isFile(filename)) { int ok; @@ -307,7 +307,7 @@ int dlt_user_log_file_infoAbout(DltContext *fileContext, const char *filename){ * In the next step some generic informations about the file will be logged to dlt. * Now the header will be logged to dlt. See the method dlt_user_log_file_header for more informations. * Then the method dlt_user_log_data will be called with the parameter to log all packages in a loop with some timeout. - * At last dlt_user_log_end is called to signal that the complete file transfer was okey. This is important for the plugin of the dlt viewer. + * At last dlt_user_log_end is called to signal that the complete file transfer was okey. This is important for the plugin of the dlt viewer. * @param fileContext Specific context to log the file to dlt * @param filename Absolute file path * @param deleteFlag Flag if the file will be deleted after transfer. 1->delete, 0->notDelete @@ -315,28 +315,28 @@ int dlt_user_log_file_infoAbout(DltContext *fileContext, const char *filename){ * @return Returns 0 if everything was okey. If there was a failure a value < 0 will be returned. */ int dlt_user_log_file_complete(DltContext *fileContext, const char *filename, int deleteFlag, int timeout) -{ +{ if(!isFile(filename)) { dlt_user_log_file_errorMessage(fileContext,filename, DLT_FILETRANSFER_ERROR_FILE_COMPLETE); return DLT_FILETRANSFER_ERROR_FILE_COMPLETE; } - + if(dlt_user_log_file_header(fileContext,filename) != 0) { return DLT_FILETRANSFER_ERROR_FILE_COMPLETE1; } - + if(dlt_user_log_file_data(fileContext, filename,DLT_FILETRANSFER_TRANSFER_ALL_PACKAGES,timeout) != 0) { return DLT_FILETRANSFER_ERROR_FILE_COMPLETE2; } - + if(dlt_user_log_file_end(fileContext,filename, deleteFlag) != 0) { return DLT_FILETRANSFER_ERROR_FILE_COMPLETE3; - } - + } + return 0; } @@ -352,7 +352,7 @@ int dlt_user_log_file_complete(DltContext *fileContext, const char *filename, in int dlt_user_log_file_packagesCount(DltContext *fileContext, const char *filename){ int packages; long filesize; - + if(isFile(filename)) { packages = 1; @@ -363,15 +363,15 @@ int dlt_user_log_file_packagesCount(DltContext *fileContext, const char *filenam return -1; } if(filesize < BUFFER_SIZE) - { + { return packages; - } - else + } + else { packages = filesize/BUFFER_SIZE; - + if(filesize%BUFFER_SIZE == 0) - { + { return packages; } else @@ -473,7 +473,7 @@ int dlt_user_log_file_header(DltContext *fileContext,const char *filename){ DLT_STRING(fcreationdate); DLT_UINT(dlt_user_log_file_packagesCount(fileContext,filename)), DLT_UINT(BUFFER_SIZE), - DLT_STRING("FLST") + DLT_STRING("FLST") ); return 0; @@ -497,17 +497,17 @@ int dlt_user_log_file_data(DltContext *fileContext,const char *filename, int pac FILE *file; int pkgNumber; long readBytes; - + if(isFile(filename)) { - + file = fopen (filename,"rb"); if (file == NULL) { dlt_user_log_file_errorMessage(fileContext,filename,DLT_FILETRANSFER_ERROR_FILE_DATA); return DLT_FILETRANSFER_ERROR_FILE_DATA; } - + if( (packageToTransfer != DLT_FILETRANSFER_TRANSFER_ALL_PACKAGES && packageToTransfer > dlt_user_log_file_packagesCount(fileContext,filename)) || packageToTransfer <= 0) { DLT_LOG(*fileContext,DLT_LOG_ERROR, @@ -524,7 +524,7 @@ int dlt_user_log_file_data(DltContext *fileContext,const char *filename, int pac } readBytes = 0; - + if(packageToTransfer != DLT_FILETRANSFER_TRANSFER_ALL_PACKAGES) { // If a single package should be transferred. The user has to check that the free space in the user buffer > 50% @@ -598,16 +598,16 @@ int dlt_user_log_file_data(DltContext *fileContext,const char *filename, int pac doTimeout(timeout); } } - + fclose(file); - + return 0; - + } else { dlt_user_log_file_errorMessage(fileContext,filename,DLT_FILETRANSFER_ERROR_FILE_DATA); return DLT_FILETRANSFER_ERROR_FILE_DATA; } - + } //!Transfer the end of the file as a dlt logs. /**The end of the file must be logged to dlt because the end contains inforamtion about the file serial number. @@ -638,14 +638,14 @@ int dlt_user_log_file_end(DltContext *fileContext,const char *filename,int delet DLT_UINT(fserial), DLT_STRING("FLFI") ); - + if(deleteFlag){ if( doRemoveFile(filename) != 0 ){ dlt_user_log_file_errorMessage(fileContext,filename,DLT_FILETRANSFER_ERROR_FILE_END); return -1; } } - + return 0; }else{ dlt_user_log_file_errorMessage(fileContext,filename,DLT_FILETRANSFER_ERROR_FILE_END); diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index 1a8f274..28c7381 100644 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -185,10 +185,10 @@ int dlt_init(void) /* create and open DLT user FIFO */ snprintf(filename,DLT_USER_MAX_FILENAME_LENGTH,"%s/dlt%d",DLT_USER_DIR,getpid()); - + /* Try to delete existing pipe, ignore result of unlink */ unlink(filename); - + ret=mkfifo(filename, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP ); if (ret==-1) { @@ -219,8 +219,8 @@ int dlt_init(void) dlt_user.dlt_log_handle = open(DLT_USER_FIFO, O_WRONLY | O_NONBLOCK | O_CLOEXEC ); if (dlt_user.dlt_log_handle==-1) { - /* This is a normal usecase. It is OK that the daemon (and thus the FIFO /tmp/dlt) - starts later and some DLT users have already been started before. + /* This is a normal usecase. It is OK that the daemon (and thus the FIFO /tmp/dlt) + starts later and some DLT users have already been started before. Thus it is OK if the FIFO can't be opened. */ snprintf(str,DLT_USER_BUFFER_LENGTH,"FIFO %s cannot be opened. Retrying later...\n",DLT_USER_FIFO); dlt_log(LOG_INFO, str); @@ -232,16 +232,16 @@ int dlt_init(void) /* init shared memory */ if (dlt_shm_init_client(&(dlt_user.dlt_shm),DLT_SHM_KEY) < 0) { - /* This is a normal usecase. It is OK that the daemon (and thus the FIFO /tmp/dlt) - starts later and some DLT users have already been started before. + /* This is a normal usecase. It is OK that the daemon (and thus the FIFO /tmp/dlt) + starts later and some DLT users have already been started before. Thus it is OK if the FIFO can't be opened. */ snprintf(str,DLT_USER_BUFFER_LENGTH,"Shared memory %d cannot be created. Retrying later...\n",DLT_SHM_KEY); dlt_log(LOG_INFO, str); - //return 0; - } + //return 0; + } #endif } - + if (dlt_receiver_init(&(dlt_user.receiver),dlt_user.dlt_user_handle, DLT_USER_RCVBUF_MAX_SIZE)==-1) { @@ -509,7 +509,7 @@ int dlt_user_atexit_blow_out_user_buffer(void){ DLT_SEM_LOCK(); count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer)); DLT_SEM_FREE(); - + if (count > 0) { while(dlt_uptime() < exitTime ) @@ -528,8 +528,8 @@ int dlt_user_atexit_blow_out_user_buffer(void){ dlt_user.overflow_counter=0; } } - } - + } + if (dlt_user.dlt_log_handle != -1) { ret = dlt_user_log_resend_buffer(); @@ -1212,7 +1212,7 @@ int dlt_forward_msg(void *msgdata,size_t size) { snprintf(str,DLT_USER_BUFFER_LENGTH,"Buffer full! %u messages discarded!\n",dlt_user.overflow_counter); dlt_log(LOG_WARNING, str); - dlt_user.overflow_counter=0; + dlt_user.overflow_counter=0; } } @@ -2698,7 +2698,7 @@ int dlt_user_trace_network_segmented(DltContext *handle, DltNetworkTraceType nw_ } free(thread_data->header); free(thread_data->payload); - free(thread_data); + free(thread_data); char str[256]; snprintf(str,255,"NWTSegmented: Could not write into queue: %s \n",strerror(errno)); dlt_log(LOG_WARNING, str); @@ -3440,7 +3440,7 @@ DltReturnValue dlt_user_log_send_log(DltContextData *log, int mtype) #ifdef DLT_SHM_ENABLE if(dlt_user.dlt_log_handle!=-1) dlt_shm_push(&dlt_user.dlt_shm,msg.headerbuffer+sizeof(DltStorageHeader), msg.headersize-sizeof(DltStorageHeader), - log->buffer, log->size,0,0); + log->buffer, log->size,0,0); /* log to FIFO */ ret = dlt_user_log_out3(dlt_user.dlt_log_handle, @@ -3463,10 +3463,10 @@ DltReturnValue dlt_user_log_send_log(DltContextData *log, int mtype) ret = dlt_user_log_out3(dlt_user.dlt_log_handle, &(userheader), sizeof(DltUserHeader), msg.headerbuffer+sizeof(DltStorageHeader), msg.headersize-sizeof(DltStorageHeader), - log->buffer, log->size); -#endif + log->buffer, log->size); +#endif } - + /* store message in ringbuffer, if an error has occured */ if (ret!=DLT_RETURN_OK) { @@ -4146,7 +4146,7 @@ int dlt_user_log_resend_buffer(void) int num,count; int size; DltReturnValue ret; - + /* Send content of ringbuffer */ DLT_SEM_LOCK(); count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer)); @@ -4160,7 +4160,7 @@ int dlt_user_log_resend_buffer(void) if (size>0) { -#ifdef DLT_SHM_ENABLE +#ifdef DLT_SHM_ENABLE dlt_shm_push(&dlt_user.dlt_shm,dlt_user.resend_buffer+sizeof(DltUserHeader),size-sizeof(DltUserHeader),0,0,0,0); /* log to FIFO */ @@ -4170,21 +4170,21 @@ int dlt_user_log_resend_buffer(void) ret = dlt_user_log_out3(dlt_user.dlt_log_handle, dlt_user.resend_buffer,size,0,0,0,0); #endif - /* in case of error, keep message in ringbuffer */ + /* in case of error, keep message in ringbuffer */ if (ret==DLT_RETURN_OK) { dlt_buffer_remove(&(dlt_user.startup_buffer)); } else { - /* keep message in ringbuffer */ + /* keep message in ringbuffer */ DLT_SEM_FREE(); return -1; } } DLT_SEM_FREE(); } - + return 0; } @@ -4214,8 +4214,8 @@ void dlt_user_log_reattach_to_daemon(void) { snprintf(str,DLT_USER_BUFFER_LENGTH,"Loging disabled, Shared memory %d cannot be created!\n",DLT_SHM_KEY); dlt_log(LOG_WARNING, str); - //return 0; - } + //return 0; + } #endif dlt_log(LOG_NOTICE, "Logging (re-)enabled!\n"); @@ -4306,7 +4306,7 @@ int dlt_user_check_buffer(int *total_size, int *used_size) *total_size = dlt_buffer_get_total_size(&(dlt_user.startup_buffer)); *used_size = dlt_buffer_get_used_size(&(dlt_user.startup_buffer)); #endif - + return 0; /* ok */ } diff --git a/src/lib/dlt_user_cfg.h b/src/lib/dlt_user_cfg.h index 850429e..a8f9d8d 100755 --- a/src/lib/dlt_user_cfg.h +++ b/src/lib/dlt_user_cfg.h @@ -73,9 +73,9 @@ /*************/ /* Size of receive buffer */ -#define DLT_USER_RCVBUF_MAX_SIZE 10024 +#define DLT_USER_RCVBUF_MAX_SIZE 10024 -/* Size of ring buffer */ +/* Size of ring buffer */ #define DLT_USER_RINGBUFFER_MIN_SIZE 50000 #define DLT_USER_RINGBUFFER_MAX_SIZE 500000 #define DLT_USER_RINGBUFFER_STEP_SIZE 50000 @@ -83,7 +83,7 @@ /* Temporary buffer length */ #define DLT_USER_BUFFER_LENGTH 255 -/* Number of context entries, which will be allocated, +/* Number of context entries, which will be allocated, if no more context entries are available */ #define DLT_USER_CONTEXT_ALLOC_SIZE 500 @@ -124,7 +124,7 @@ #define DLT_USER_DEFAULT_MSGID 0xffff /* delay in receiver routine in usec (100000 usec = 100ms) */ -#define DLT_USER_RECEIVE_DELAY 100000 +#define DLT_USER_RECEIVE_DELAY 100000 /* Name of environment variable for local print mode */ #define DLT_USER_ENV_LOCAL_PRINT_MODE "DLT_LOCAL_PRINT_MODE" diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c index 1fa2766..98852fd 100755 --- a/src/shared/dlt_common.c +++ b/src/shared/dlt_common.c @@ -89,7 +89,7 @@ int dlt_buffer_reset(DltBuffer *buf); int dlt_buffer_increase_size(DltBuffer *buf); int dlt_buffer_minimize_size(DltBuffer *buf); void dlt_buffer_write_block(DltBuffer *buf,int *write, const unsigned char *data,unsigned int size); -void dlt_buffer_read_block(DltBuffer *buf,int *read,unsigned char *data,unsigned int size); +void dlt_buffer_read_block(DltBuffer *buf,int *read,unsigned char *data,unsigned int size); void dlt_print_hex(uint8_t *ptr,int size) { @@ -561,7 +561,7 @@ int dlt_filter_find(DltFilter *filter,const char *apid,const char *ctid, int ver /* apid matches, now check for ctid */ if (ctid==0) { - /* check if empty ctid matches */ + /* check if empty ctid matches */ //if (memcmp(filter->ctid[num],"",DLT_ID_SIZE)==0)//coverity complains here about Out-of-bounds access. char empty_ctid[DLT_ID_SIZE]=""; if (memcmp(filter->ctid[num],empty_ctid,DLT_ID_SIZE)==0) @@ -1986,7 +1986,7 @@ void dlt_log_set_filename(const char *filename) void dlt_log_init(int mode) { logging_mode = mode; - + if(logging_mode == DLT_LOG_TO_FILE) { /* internal logging to file */ @@ -2278,7 +2278,7 @@ int dlt_buffer_init_static_server(DltBuffer *buf, const unsigned char *ptr, uint buf->min_size = size; buf->max_size = size; buf->step_size = 0; - + // Init pointers head = (DltBufferHead*)buf->shm; head->read = 0; @@ -2289,7 +2289,7 @@ int dlt_buffer_init_static_server(DltBuffer *buf, const unsigned char *ptr, uint // clear memory memset(buf->mem,0,buf->size); - + snprintf(str,sizeof(str),"Buffer: Size %d\n",buf->size); dlt_log(LOG_DEBUG, str); @@ -2305,7 +2305,7 @@ int dlt_buffer_init_static_client(DltBuffer *buf, const unsigned char *ptr, uint buf->min_size = size; buf->max_size = size; buf->step_size = 0; - + // Init pointers buf->mem = (unsigned char *)(buf->shm + sizeof(DltBufferHead)); buf->size = buf->min_size - sizeof(DltBufferHead); @@ -2341,7 +2341,7 @@ int dlt_buffer_init_dynamic(DltBuffer *buf, uint32_t min_size, uint32_t max_size dlt_log(LOG_EMERG, str); return -1; } - + // Init pointers head = (DltBufferHead*)buf->shm; head->read = 0; @@ -2352,7 +2352,7 @@ int dlt_buffer_init_dynamic(DltBuffer *buf, uint32_t min_size, uint32_t max_size // clear memory memset(buf->mem,0,buf->size); - + //snprintf(str,sizeof(str),"Buffer: Size %d bytes\n",buf->size); //dlt_log(LOG_INFO, str); @@ -2509,14 +2509,14 @@ int dlt_buffer_minimize_size(DltBuffer *buf) /* free old data */ free(buf->shm); - + /* update data */ buf->shm = new_ptr; buf->mem = new_ptr+sizeof(DltBufferHead); buf->size = buf->min_size - sizeof(DltBufferHead); - /* reset pointers and counters */ - ((int*)(buf->shm))[0] = 0; // pointer to write memory + /* reset pointers and counters */ + ((int*)(buf->shm))[0] = 0; // pointer to write memory ((int*)(buf->shm))[1] = 0; // pointer to read memory ((int*)(buf->shm))[2] = 0; // number of packets @@ -2537,7 +2537,7 @@ int dlt_buffer_reset(DltBuffer *buf) dlt_log(LOG_WARNING,"Buffer: Buffer reset triggered.\n"); /* reset pointers and counters */ - ((int*)(buf->shm))[0] = 0; // pointer to write memory + ((int*)(buf->shm))[0] = 0; // pointer to write memory ((int*)(buf->shm))[1] = 0; // pointer to read memory ((int*)(buf->shm))[2] = 0; // number of packets @@ -2578,17 +2578,17 @@ int dlt_buffer_push3(DltBuffer *buf,const unsigned char *data1,unsigned int size { dlt_log(LOG_ERR,"Buffer: Pointer out of range\n"); dlt_buffer_reset(buf); - return -1; // ERROR + return -1; // ERROR } // calculate free size if(read>write) free_size = read - write; else if(count && (write == read)) - free_size = 0; + free_size = 0; else free_size = buf->size - write + read; - + // check size if(free_size < (int)(sizeof(DltBufferBlockHead)+size1+size2+size3)) { // try to increase size if possible @@ -2649,7 +2649,7 @@ int dlt_buffer_get(DltBuffer *buf,unsigned char *data, int max_size,int delete) { dlt_log(LOG_ERR,"Buffer: Pointer out of range\n"); dlt_buffer_reset(buf); - return -1; // ERROR + return -1; // ERROR } // check if data is in there @@ -2659,13 +2659,13 @@ int dlt_buffer_get(DltBuffer *buf,unsigned char *data, int max_size,int delete) dlt_log(LOG_ERR,"Buffer: SHM should be empty, but is not\n"); dlt_buffer_reset(buf); } - return -1; // ERROR + return -1; // ERROR } // calculate used size if(write>read) used_size = write - read; - else + else used_size = buf->size - read + write; // first check size @@ -2713,29 +2713,29 @@ int dlt_buffer_get(DltBuffer *buf,unsigned char *data, int max_size,int delete) if(delete) { // update buffer pointers - ((int*)(buf->shm))[1] = read; // set new read pointer + ((int*)(buf->shm))[1] = read; // set new read pointer } } else { if(delete) { if( (read+head.size) <= buf->size) - ((int*)(buf->shm))[1] = read+head.size; // set new read pointer + ((int*)(buf->shm))[1] = read+head.size; // set new read pointer else - ((int*)(buf->shm))[1] = read+head.size-buf->size; // set new read pointer + ((int*)(buf->shm))[1] = read+head.size-buf->size; // set new read pointer } } if(delete) { ((int*)(buf->shm))[2] -= 1; // decrease counter - + if(((int*)(buf->shm))[2] == 0) { // try to minimize size dlt_buffer_minimize_size(buf); } } - - return head.size; // OK + + return head.size; // OK } int dlt_buffer_pull(DltBuffer *buf,unsigned char *data, int max_size) @@ -2767,7 +2767,7 @@ void dlt_buffer_info(DltBuffer *buf) dlt_log(LOG_DEBUG, str); snprintf(str,sizeof(str),"Buffer: Buffer start address: %lX\n",(unsigned long)buf->mem); dlt_log(LOG_DEBUG, str); - + } void dlt_buffer_status(DltBuffer *buf) @@ -2822,11 +2822,11 @@ int dlt_buffer_get_used_size(DltBuffer *buf) if(count == 0) return 0; - + if(write>read) return (write - read); - - return (buf->size - read + write); + + return (buf->size - read + write); } int dlt_buffer_get_message_count(DltBuffer *buf) @@ -3119,7 +3119,7 @@ uint32_t dlt_uptime(void) struct timespec ts; if (clock_gettime(CLOCK_MONOTONIC,&ts)==0) - { + { return ( (uint32_t)ts.tv_sec*10000 + (uint32_t)ts.tv_nsec/100000 );// in 0.1 ms = 100 us } else diff --git a/src/shared/dlt_common_cfg.h b/src/shared/dlt_common_cfg.h index 7a34850..2278049 100755 --- a/src/shared/dlt_common_cfg.h +++ b/src/shared/dlt_common_cfg.h @@ -88,7 +88,7 @@ /* Number of indices to be allocated at one, if no more indeces are left */ #define DLT_COMMON_INDEX_ALLOC 1000 -/* If limited output is called, +/* If limited output is called, this is the maximum number of characters to be printed out */ #define DLT_COMMON_ASCII_LIMIT_MAX_CHARS 20 diff --git a/src/shared/dlt_offline_trace.c b/src/shared/dlt_offline_trace.c index 404b4f1..9925a7a 100644 --- a/src/shared/dlt_offline_trace.c +++ b/src/shared/dlt_offline_trace.c @@ -62,7 +62,7 @@ #include <fcntl.h> #include <unistd.h> #include <dirent.h> - + #include <dlt_offline_trace.h> int dlt_offline_trace_create_new_file(DltOfflineTrace *trace) { @@ -90,7 +90,7 @@ int dlt_offline_trace_create_new_file(DltOfflineTrace *trace) { return -1; } /* if */ - return 0; /* OK */ + return 0; /* OK */ } unsigned long dlt_offline_trace_get_total_size(DltOfflineTrace *trace) { @@ -125,9 +125,9 @@ unsigned long dlt_offline_trace_get_total_size(DltOfflineTrace *trace) { } closedir(dir); - + /* return size */ - return size; + return size; } int dlt_offline_trace_delete_oldest_file(DltOfflineTrace *trace) { @@ -164,9 +164,9 @@ int dlt_offline_trace_delete_oldest_file(DltOfflineTrace *trace) { printf("Old offline trace file %s cannot be stat-ed",filename); } } - } + } closedir(dir); - + /* delete file */ if(filename_oldest[0]) { if(remove(filename_oldest)) { @@ -178,13 +178,13 @@ int dlt_offline_trace_delete_oldest_file(DltOfflineTrace *trace) { printf("No file to be removed!\n"); return -1; /* ERROR */ } - + /* return size of deleted file*/ - return size_oldest; + return size_oldest; } int dlt_offline_trace_check_size(DltOfflineTrace *trace) { - + /* check size of complete offline trace */ while((int)dlt_offline_trace_get_total_size(trace) > (trace->maxSize-trace->fileSize)) { @@ -193,10 +193,10 @@ int dlt_offline_trace_check_size(DltOfflineTrace *trace) { return -1; } } - - return 0; /* OK */ + + return 0; /* OK */ } - + int dlt_offline_trace_init(DltOfflineTrace *trace,const char *directory,int fileSize,int maxSize) { /* init parameters */ @@ -222,31 +222,31 @@ int dlt_offline_trace_write(DltOfflineTrace *trace,unsigned char *data1,int size /* close old file */ close(trace->ohandle); trace->ohandle = -1; - + /* check complete offline trace size, remove old logs if needed */ dlt_offline_trace_check_size(trace); - + /* create new file */ dlt_offline_trace_create_new_file(trace); } - + /* write data into log file */ if(data1 && (trace->ohandle >= 0)) { if(write(trace->ohandle,data1,size1)!=size1) { printf("Offline trace write failed!\n"); - return -1; + return -1; } } if(data2 && (trace->ohandle >= 0)) { if(write(trace->ohandle,data2,size2)!=size2) { printf("Offline trace write failed!\n"); - return -1; + return -1; } } if(data3 && (trace->ohandle >= 0)) { if(write(trace->ohandle,data3,size3)!=size3) { printf("Offline trace write failed!\n"); - return -1; + return -1; } } @@ -257,7 +257,7 @@ int dlt_offline_trace_free(DltOfflineTrace *trace) { if(trace->ohandle <= 0) return -1; - + /* close last used log file */ close(trace->ohandle); diff --git a/src/shared/dlt_shm.c b/src/shared/dlt_shm.c index 3286057..d188e2d 100644 --- a/src/shared/dlt_shm.c +++ b/src/shared/dlt_shm.c @@ -87,10 +87,10 @@ void dlt_shm_print_hex(char *ptr,int size) void dlt_shm_pv(int id,int operation) { static struct sembuf semaphor; - + semaphor.sem_op = operation; semaphor.sem_flg = SEM_UNDO; - + if(semop(id, &semaphor,1) == -1) { dlt_log(LOG_WARNING,"SHM: semop() failed"); } @@ -115,14 +115,14 @@ int dlt_shm_init_server(DltShm *buf,int key,int size) { { dlt_log(LOG_WARNING,"SHM: shmctl() failed"); return -1; /* ERROR */ - } + } // Now we attach the segment to our data space. if ((ptr = shmat(buf->shmid, NULL, 0)) == (unsigned char *) -1) { dlt_log(LOG_WARNING,"SHM: shmat() failed"); return -1; /* ERROR */ } - + // Init semaphore if( (buf->semid = semget(DLT_SHM_SEM,1,S_IRWXU|S_IRWXG|S_IRWXO|IPC_CREAT|IPC_EXCL)) == -1 ) { if( (buf->semid = semget(DLT_SHM_SEM,1,S_IRWXU|S_IRWXG|S_IRWXO|IPC_EXCL)) == -1 ) { @@ -134,7 +134,7 @@ int dlt_shm_init_server(DltShm *buf,int key,int size) { dlt_log(LOG_WARNING,"SHM: semctl() failed"); return -1; /* ERROR */ } - + // init buffer dlt_buffer_init_static_server(&(buf->buffer),ptr,shm_buf.shm_segsz); @@ -160,14 +160,14 @@ int dlt_shm_init_client(DltShm *buf,int key) { { dlt_log(LOG_WARNING,"SHM: shmctl() failed"); return -1; /* ERROR */ - } + } // Now we attach the segment to our data space. if ((ptr = shmat(buf->shmid, NULL, 0)) == (unsigned char *) -1) { dlt_log(LOG_WARNING,"shmat() failed"); return -1; /* ERROR */ } - + // Init semaphore if( (buf->semid = semget(DLT_SHM_SEM,0,0)) == -1 ) { dlt_log(LOG_WARNING,"SHM: semget() failed"); @@ -176,7 +176,7 @@ int dlt_shm_init_client(DltShm *buf,int key) { // init buffer dlt_buffer_init_static_client(&(buf->buffer),ptr,shm_buf.shm_segsz); - + return 0; /* OK */ } @@ -276,7 +276,7 @@ int dlt_shm_remove(DltShm *buf) } int dlt_shm_free_server(DltShm *buf) { - + if(shmdt(buf->buffer.shm)) { dlt_log(LOG_WARNING,"SHM: shmdt() failed"); return -1; /* ERROR */ @@ -297,7 +297,7 @@ int dlt_shm_free_server(DltShm *buf) { buf->semid = 0; return dlt_buffer_free_static(&(buf->buffer)); - + } int dlt_shm_free_client(DltShm *buf) { @@ -310,6 +310,6 @@ int dlt_shm_free_client(DltShm *buf) { // Reset parameters buf->shmid = 0; buf->semid = 0; - + return dlt_buffer_free_static(&(buf->buffer)); } diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt index fb11624..2213867 100644 --- a/src/system/CMakeLists.txt +++ b/src/system/CMakeLists.txt @@ -19,7 +19,7 @@ if(WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD OR WITH_SYSTEMD_JOURNAL) message( STATUS "Added ${systemd_SRCS} to dlt-system") endif(WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD OR WITH_SYSTEMD_JOURNAL) -set(dlt_system_SRCS dlt-system.c dlt-system-options.c dlt-system-process-handling.c +set(dlt_system_SRCS dlt-system.c dlt-system-options.c dlt-system-process-handling.c dlt-system-filetransfer.c dlt-system-logfile.c dlt-system-processes.c dlt-system-shell.c dlt-system-syslog.c dlt-system-watchdog.c dlt-system-journal.c) add_executable(dlt-system ${dlt_system_SRCS} ${systemd_SRCS}) @@ -28,7 +28,7 @@ if(WITH_SYSTEMD_JOURNAL) else(WITH_SYSTEMD_JOURNAL) target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES}) endif(WITH_SYSTEMD_JOURNAL) - + set_target_properties(dlt-system PROPERTIES LINKER_LANGUAGE C) diff --git a/src/system/dlt-system-journal.c b/src/system/dlt-system-journal.c index 7cccb4b..03c785c 100644 --- a/src/system/dlt-system-journal.c +++ b/src/system/dlt-system-journal.c @@ -150,7 +150,7 @@ void journal_thread(void *v_conf) buffer_transport[DLT_SYSTEM_JOURNAL_BUFFER_SIZE]; int loglevel,systemd_loglevel; char* systemd_log_levels[] = { "Emergency","Alert","Critical","Error","Warning","Notice","Informational","Debug" }; - + DLT_LOG(dltsystem, DLT_LOG_DEBUG, DLT_STRING("dlt-system-journal, in thread.")); @@ -158,14 +158,14 @@ void journal_thread(void *v_conf) DLT_REGISTER_CONTEXT(journalContext, conf->Journal.ContextId, "Journal Adapter"); r = sd_journal_open(&j, SD_JOURNAL_LOCAL_ONLY/*SD_JOURNAL_LOCAL_ONLY|SD_JOURNAL_RUNTIME_ONLY*/); - printf("journal open return %d\n", r); + printf("journal open return %d\n", r); if (r < 0) { DLT_LOG(dltsystem, DLT_LOG_ERROR, DLT_STRING("dlt-system-journal, cannot open journal:"),DLT_STRING(strerror(-r))); printf("journal open failed: %s\n", strerror(-r)); return; } - + if(conf->Journal.CurrentBoot) { /* show only current boot entries */ @@ -176,7 +176,7 @@ void journal_thread(void *v_conf) DLT_STRING("dlt-system-journal failed to get boot id:"),DLT_STRING(strerror(-r))); sd_journal_close(j); return; - + } sd_id128_to_string(boot_id, match + 9); r = sd_journal_add_match(j,match,strlen(match)); @@ -186,9 +186,9 @@ void journal_thread(void *v_conf) DLT_STRING("dlt-system-journal failed to get match:"),DLT_STRING(strerror(-r))); sd_journal_close(j); return; - + } - } + } if(conf->Journal.Follow) { @@ -200,7 +200,7 @@ void journal_thread(void *v_conf) DLT_STRING("dlt-system-journal failed to seek to tail:"),DLT_STRING(strerror(-r))); sd_journal_close(j); return; - + } r = sd_journal_previous_skip(j, 10); if(r<0) @@ -209,13 +209,13 @@ void journal_thread(void *v_conf) DLT_STRING("dlt-system-journal failed to seek back 10 entries:"),DLT_STRING(strerror(-r))); sd_journal_close(j); return; - + } - + } - + while(!threads.shutdown) - { + { r = sd_journal_next(j); if(r<0) @@ -224,7 +224,7 @@ void journal_thread(void *v_conf) DLT_STRING("dlt-system-journal failed to get next entry:"),DLT_STRING(strerror(-r))); sd_journal_close(j); return; - + } else if(r>0) { @@ -236,7 +236,7 @@ void journal_thread(void *v_conf) DLT_STRING("dlt-system-journal failed to call sd_journal_get_realtime_usec(): "),DLT_STRING(strerror(-r))); sd_journal_close(j); return; - + } /* get data from journal entry, empty string if invalid fields */ @@ -287,12 +287,12 @@ void journal_thread(void *v_conf) loglevel = DLT_LOG_INFO; break; } - } + } if(systemd_loglevel>=0 && systemd_loglevel<=7) snprintf(buffer_priority,DLT_SYSTEM_JOURNAL_BUFFER_SIZE,"%s:",systemd_log_levels[systemd_loglevel]); else snprintf(buffer_priority,DLT_SYSTEM_JOURNAL_BUFFER_SIZE,"prio_unknown:"); - + /* write log entry */ DLT_LOG(journalContext, loglevel, DLT_STRING(buffer_time),DLT_STRING(buffer_process),DLT_STRING(buffer_priority),DLT_STRING(buffer_message)); @@ -300,17 +300,17 @@ void journal_thread(void *v_conf) } else { - r = sd_journal_wait(j,1000000); + r = sd_journal_wait(j,1000000); if(r<0) { DLT_LOG(dltsystem, DLT_LOG_ERROR, DLT_STRING("dlt-system-journal failed to call sd_journal_get_realtime_usec(): "),DLT_STRING(strerror(-r))); sd_journal_close(j); return; - + } } - + if(journal_checkUserBufferForFreeSpace()==-1) { // buffer is nearly full diff --git a/src/system/dlt-system-shell.c b/src/system/dlt-system-shell.c index a235fde..8dce12e 100644 --- a/src/system/dlt-system-shell.c +++ b/src/system/dlt-system-shell.c @@ -67,7 +67,7 @@ DLT_DECLARE_CONTEXT(shellContext) int dlt_shell_injection_callback(uint32_t service_id, void *data, uint32_t length) { (void) length; - + DLT_LOG(shellContext,DLT_LOG_DEBUG, DLT_STRING("dlt-system-shell, injection callback")); char text[DLT_SHELL_COMMAND_MAX_LENGTH]; @@ -76,14 +76,14 @@ int dlt_shell_injection_callback(uint32_t service_id, void *data, uint32_t lengt if(length<=DLT_SHELL_COMMAND_MAX_LENGTH-1) { strncpy(text,data,length); - text[length] = 0; + text[length] = 0; } else { strncpy(text,data,DLT_SHELL_COMMAND_MAX_LENGTH-1); - text[DLT_SHELL_COMMAND_MAX_LENGTH-1] = 0; + text[DLT_SHELL_COMMAND_MAX_LENGTH-1] = 0; } - + DLT_LOG(shellContext,DLT_LOG_DEBUG, DLT_STRING("dlt-system-shell, injection injection id:"), DLT_UINT32(service_id)); @@ -105,7 +105,7 @@ int dlt_shell_injection_callback(uint32_t service_id, void *data, uint32_t lengt { DLT_LOG(shellContext,DLT_LOG_INFO, DLT_STRING("Shell command executed:"), - DLT_STRING(text)); + DLT_STRING(text)); } break; default: diff --git a/src/system/dlt-system.conf b/src/system/dlt-system.conf index 7d5b0c0..1097b2c 100644 --- a/src/system/dlt-system.conf +++ b/src/system/dlt-system.conf @@ -2,14 +2,14 @@ # ######################################################################## -# General configuration +# General configuration ######################################################################## # The application Id used for the System manager (Default: SYS) ApplicationId = SYS ######################################################################## -# Shell configuration +# Shell configuration ######################################################################## # Be careful when you enable this feature. The user can send any kind of @@ -20,7 +20,7 @@ ApplicationId = SYS ShellEnable = 0 ######################################################################## -# Syslog Adapter configuration +# Syslog Adapter configuration ######################################################################## # Enable the Syslog Adapter (Default: 0) @@ -33,7 +33,7 @@ SyslogContextId = SYSL SyslogPort = 47111 ######################################################################## -# Systemd Journal Adapter configuration +# Systemd Journal Adapter configuration ######################################################################## # This feature is only available, when dlt is compiled with @@ -70,7 +70,7 @@ JournalFollow = 0 JournalMapLogLevels = 1 ######################################################################## -# Filetransfer Manager +# Filetransfer Manager ######################################################################## # Enable the Filetransfer (Default: 0) @@ -111,7 +111,7 @@ FiletransferCompressionLevel = 5 ######################################################################## -# Log short files, especially from proc filesystem +# Log short files, especially from proc filesystem ######################################################################## # Enable the logging of files (Default: 0) @@ -170,7 +170,7 @@ LogFileContextId = STAT # LogFileContextId = IOM ######################################################################## -# Log Processes +# Log Processes ######################################################################## # Enable the logging of processes (Default: 0) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index b1052ca..557e403 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -55,7 +55,7 @@ add_executable(dlt-test-filetransfer ${dlt_test_filetransfer_SRCS}) target_link_libraries(dlt-test-filetransfer dlt) set_target_properties(dlt-test-filetransfer PROPERTIES LINKER_LANGUAGE C) -install(TARGETS dlt-test-multi-process dlt-test-multi-process-client dlt-test-user dlt-test-client dlt-test-stress-user dlt-test-stress-client dlt-test-stress dlt-test-filetransfer +install(TARGETS dlt-test-multi-process dlt-test-multi-process-client dlt-test-user dlt-test-client dlt-test-stress-user dlt-test-stress-client dlt-test-stress dlt-test-filetransfer RUNTIME DESTINATION bin COMPONENT base) diff --git a/src/tests/dlt-test-filetransfer-image.png b/src/tests/dlt-test-filetransfer-image.png Binary files differindex dbc570e..dac59d3 100755 --- a/src/tests/dlt-test-filetransfer-image.png +++ b/src/tests/dlt-test-filetransfer-image.png diff --git a/src/tests/dlt-test-filetransfer.c b/src/tests/dlt-test-filetransfer.c index 6374b2d..46a6845 100644 --- a/src/tests/dlt-test-filetransfer.c +++ b/src/tests/dlt-test-filetransfer.c @@ -108,7 +108,7 @@ int testFile1Run1(){ //Just some log to the main context DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Started testF1P1 - dlt_user_log_file_complete"),DLT_STRING(file1)); - //Here's the line where the dlt file transfer is called. The method call needs a context, the absolute file path, will the file be deleted after transfer and the timeout between the packages + //Here's the line where the dlt file transfer is called. The method call needs a context, the absolute file path, will the file be deleted after transfer and the timeout between the packages transferResult = dlt_user_log_file_complete(&fileContext,file1,0,20); if(transferResult < 0 ) { @@ -117,16 +117,16 @@ int testFile1Run1(){ } //Just some log to the main context DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Finished testF1P1"),DLT_STRING(file1)); - + printTestResultPositiveExpected(__FUNCTION__,transferResult); return transferResult; } -//!Test the file transfer with the condition that the transferred file is smaller as the file transfer buffer using single package transfer +//!Test the file transfer with the condition that the transferred file is smaller as the file transfer buffer using single package transfer int testFile1Run2(){ int total_size, used_size; - + //Get the information how many packages have the file countPackages = dlt_user_log_file_packagesCount(&fileContext,file1); if(countPackages < 0 ) @@ -137,8 +137,8 @@ int testFile1Run2(){ } //Just some log to the main context DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Started testF1P2 - transfer single package"),DLT_STRING(file1)); - - //Logs the header of the file transfer. For more details see Mainpage.c. + + //Logs the header of the file transfer. For more details see Mainpage.c. //The header gives information about the file serial number, filename (with absolute path), filesize, packages of file, buffer size transferResult = dlt_user_log_file_header(&fileContext,file1); if(transferResult >= 0) @@ -154,7 +154,7 @@ int testFile1Run2(){ break; } - //Logs one single package to the file context + //Logs one single package to the file context transferResult = dlt_user_log_file_data(&fileContext,file1,i,20); if(transferResult < 0) { @@ -165,7 +165,7 @@ int testFile1Run2(){ } //Logs the end of the file transfer. For more details see Mainpage.c - //The end gives just information about the file serial number but is needed to signal that the file transfer has correctly finished and needed for the file transfer plugin of the dlt viewer. + //The end gives just information about the file serial number but is needed to signal that the file transfer has correctly finished and needed for the file transfer plugin of the dlt viewer. transferResult = dlt_user_log_file_end(&fileContext,file1,0); if(transferResult < 0) { @@ -180,7 +180,7 @@ int testFile1Run2(){ printTestResultPositiveExpected(__FUNCTION__,transferResult); return transferResult; } - + //Just some log to main context DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Finished testF1P2 - transfer single package"),DLT_STRING(file1)); printTestResultPositiveExpected(__FUNCTION__,transferResult); @@ -208,7 +208,7 @@ int testFile2Run1(){ //!Test the file transfer with the condition that the transferred file is bigger as the file transfer buffer using single package transfer int testFile2Run2(){ int total_size, used_size; - + //Get the information how many packages have the file countPackages = dlt_user_log_file_packagesCount(&fileContext,file2); if(countPackages < 0 ) @@ -217,16 +217,16 @@ int testFile2Run2(){ printTestResultPositiveExpected(__FUNCTION__,countPackages); return -1; } - + //Just some log to the main context DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Started testF2P2 - transfer single package"),DLT_STRING(file2)); - - //Logs the header of the file transfer. For more details see Mainpage.c. + + //Logs the header of the file transfer. For more details see Mainpage.c. //The header gives information about the file serial number, filename (with absolute path), filesize, packages of file, buffer size transferResult = dlt_user_log_file_header(&fileContext,file2); if( transferResult >= 0){ - - //Loop to log all packages + + //Loop to log all packages for(i=1;i<=countPackages;i++) { dlt_user_check_buffer(&total_size, &used_size); @@ -271,7 +271,7 @@ int testFile2Run2(){ //!Test the file transfer with the condition that the transferred file does not exist using dlt_user_log_file_complete. int testFile3Run1(){ - + //Just some log to the main context DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Started testF3P1"),DLT_STRING(file3_1)); @@ -307,13 +307,13 @@ int testFile3Run2(){ } //Just some log to the main context DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Started testF3P1"),DLT_STRING(file3_2)); - - //Logs the header of the file transfer. For more details see Mainpage.c. + + //Logs the header of the file transfer. For more details see Mainpage.c. //The header gives information about the file serial number, filename (with absolute path), filesize, packages of file, buffer size transferResult = dlt_user_log_file_header(&fileContext,file3_2); if( transferResult >= 0){ - - //Loop to log all packages + + //Loop to log all packages for(i=1;i<=countPackages;i++) { //Logs one single package to the file context @@ -343,10 +343,10 @@ int testFile3Run2(){ //!Logs some information about the file. int testFile3Run3(){ - + //Just some log to the main context DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Started testF3P2"),DLT_STRING(file3_3)); - + //Here's the line where the dlt file file info is called. The method call logs some information to dlt about the file, filesize, file serial number and number of packages transferResult = dlt_user_log_file_infoAbout(&fileContext,file3_3); if(transferResult < 0) diff --git a/src/tests/dlt-test-multi-process.c b/src/tests/dlt-test-multi-process.c index 53dbffb..93fd069 100755 --- a/src/tests/dlt-test-multi-process.c +++ b/src/tests/dlt-test-multi-process.c @@ -207,7 +207,7 @@ int main(int argc, char **argv) if(signal(SIGTERM, quit_handler) == SIG_IGN) signal(SIGTERM, SIG_IGN); // kill (nice) - printf("Setup done. Listening. My pid: %d\n", getpid()); + printf("Setup done. Listening. My pid: %d\n", getpid()); fflush(stdout); int err = wait_for_death(); diff --git a/src/tests/dlt-test-stress-client.c b/src/tests/dlt-test-stress-client.c index 36044d0..28c2c9e 100644 --- a/src/tests/dlt-test-stress-client.c +++ b/src/tests/dlt-test-stress-client.c @@ -116,14 +116,14 @@ typedef struct int tests_failed; int sock; - + // test values unsigned long bytes_received; unsigned long time_elapsed; int last_value; int count_received_messages; int count_not_received_messages; - + } DltTestclientData; /** @@ -489,14 +489,14 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) DLT_MSG_READ_VALUE(value_tmp,ptr,datalength,int32_t); value=DLT_ENDIAN_GET_32(message->standardheader->htyp, value_tmp); //printf("%d\n",value); - + if(value < dltdata->last_value) { - if(dltdata->nvalue == dltdata->count_received_messages) - printf("PASSED: %d Msg received, %d not received\n",dltdata->count_received_messages,dltdata->count_not_received_messages); + if(dltdata->nvalue == dltdata->count_received_messages) + printf("PASSED: %d Msg received, %d not received\n",dltdata->count_received_messages,dltdata->count_not_received_messages); else printf("FAILED: %d Msg received, %d not received\n",dltdata->count_received_messages,dltdata->count_not_received_messages); - + dltdata->last_value = 0; dltdata->count_received_messages = 0; dltdata->count_not_received_messages = value -1; diff --git a/src/tests/dlt-test-stress-user.c b/src/tests/dlt-test-stress-user.c index 6a6f4a6..355f510 100644 --- a/src/tests/dlt-test-stress-user.c +++ b/src/tests/dlt-test-stress-user.c @@ -245,7 +245,7 @@ int testall(int count,int repeat,int delay,int size) { buffer[num] = num; } - + /* Test All: Test all start */ //printf("Test1: Test all\n"); //DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test1: Test all")); @@ -258,11 +258,11 @@ int testall(int count,int repeat,int delay,int size) usleep(delay); } } - + /* wait 5 seconds after test */ //sleep(5); //DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test1: finished")); - + return 0; } diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt index 98e8b65..d37880d 100644 --- a/systemd/CMakeLists.txt +++ b/systemd/CMakeLists.txt @@ -18,40 +18,40 @@ if(WITH_SYSTEMD) set(SYSTEMD_CONFIGURATIONS_FILES_DIR ${CMAKE_INSTALL_PREFIX}/lib/systemd/system ) - + if(WITH_SYSTEMD_WATCHDOG) set( DLT_WatchdogSec 2 ) message( STATUS "The systemd watchdog is enabled - timeout is set to ${DLT_WatchdogSec} seconds") - else(WITH_SYSTEMD_WATCHDOG) + else(WITH_SYSTEMD_WATCHDOG) set( DLT_WatchdogSec 0 ) message( STATUS "The systemd watchdog is disabled") endif(WITH_SYSTEMD_WATCHDOG) - + configure_file(${CMAKE_SOURCE_DIR}/systemd/dlt.service.cmake ${PROJECT_BINARY_DIR}/systemd/dlt.service) message( STATUS "Configured systemd unit file:dlt.service" ) - + configure_file(${CMAKE_SOURCE_DIR}/systemd/dlt-system.service.cmake ${PROJECT_BINARY_DIR}/systemd/dlt-system.service) message( STATUS "Configured systemd unit file:dlt-system.service" ) - + if(WITH_DLT_DBUS) configure_file(${CMAKE_SOURCE_DIR}/systemd/dlt-dbus.service.cmake ${PROJECT_BINARY_DIR}/systemd/dlt-dbus.service) message( STATUS "Configured systemd unit file:dlt-dbus.service" ) endif(WITH_DLT_DBUS) - + configure_file(${CMAKE_SOURCE_DIR}/systemd/dlt-receive.service.cmake ${PROJECT_BINARY_DIR}/systemd/dlt-receive.service) message( STATUS "Configured systemd unit file:dlt-receive.service" ) - + configure_file(${CMAKE_SOURCE_DIR}/systemd/dlt-example-user.service.cmake ${PROJECT_BINARY_DIR}/systemd/dlt-example-user.service) message( STATUS "Configured systemd unit file:dlt-example-user.service" ) - + set( DLT_ADAPTOR_UDP_APPID "DUDP" ) set( DLT_ADAPTOR_UDP_CTID "DCTI" ) set( DLT_ADAPTOR_UDP_PORT 4712 ) configure_file(${CMAKE_SOURCE_DIR}/systemd/dlt-adaptor-udp.service.cmake ${PROJECT_BINARY_DIR}/systemd/dlt-adaptor-udp.service) message( STATUS "Configured systemd unit file:dlt-adaptor-udp.service" ) message(STATUS "DLT adaptor udp configuration: APPID=${DLT_ADAPTOR_UDP_APPID} CTID=${DLT_ADAPTOR_UDP_CTID} PORT=${DLT_ADAPTOR_UDP_PORT}" ) - - + + install(FILES ${PROJECT_BINARY_DIR}/systemd/dlt.service DESTINATION ${SYSTEMD_CONFIGURATIONS_FILES_DIR} ) install(FILES ${PROJECT_BINARY_DIR}/systemd/dlt-system.service DESTINATION ${SYSTEMD_CONFIGURATIONS_FILES_DIR} ) install(FILES ${PROJECT_BINARY_DIR}/systemd/dlt-receive.service DESTINATION ${SYSTEMD_CONFIGURATIONS_FILES_DIR} ) @@ -66,5 +66,5 @@ if(WITH_SYSTEMD) install(FILES ${PROJECT_BINARY_DIR}/systemd/dlt-adaptor-udp.service DESTINATION ${SYSTEMD_CONFIGURATIONS_FILES_DIR} ) message(STATUS "Unit files will be installed to ${SYSTEMD_CONFIGURATIONS_FILES_DIR} after make install" ) - + endif(WITH_SYSTEMD) diff --git a/tests/dlt_test_receiver.c b/tests/dlt_test_receiver.c index c17716a..1eda31b 100644 --- a/tests/dlt_test_receiver.c +++ b/tests/dlt_test_receiver.c @@ -337,7 +337,7 @@ int dlt_receive_filetransfer_callback(DltMessage *message, void *data) } dltdata = (DltReceiveData*)data; - + if(dltdata->filetransfervalue) { dlt_message_print_ascii(message, text, DLT_RECEIVE_TEXTBUFSIZE, dltdata->vflag); diff --git a/tests/gtest_dlt_user.cpp b/tests/gtest_dlt_user.cpp index d75de62..d55b751 100644 --- a/tests/gtest_dlt_user.cpp +++ b/tests/gtest_dlt_user.cpp @@ -205,11 +205,11 @@ TEST(t_dlt_user_log_write_start, normal) { DltContext context; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start normal")); - + // the defined enum values for log level EXPECT_LE(0,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT)); EXPECT_LE(0,dlt_user_log_write_finish(&contextData)); @@ -227,7 +227,7 @@ TEST(t_dlt_user_log_write_start, normal) EXPECT_LE(0,dlt_user_log_write_finish(&contextData)); EXPECT_LE(0,dlt_user_log_write_start(&context, &contextData, DLT_LOG_VERBOSE)); EXPECT_LE(0,dlt_user_log_write_finish(&contextData)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -236,19 +236,19 @@ TEST(t_dlt_user_log_write_start, abnormal) { DltContext context; // TODO: DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start abnormal")); - + // undefined values for DltLogLevelType // shouldn't it return -1? // TODO: EXPECT_GE(-1,dlt_user_log_write_start(&context, &contextData, (DltLogLevelType)-100)); // TODO: EXPECT_GE(-1,dlt_user_log_write_start(&context, &contextData, (DltLogLevelType)-10)); // TODO: EXPECT_GE(-1,dlt_user_log_write_start(&context, &contextData, (DltLogLevelType)10)); // TODO: EXPECT_GE(-1,dlt_user_log_write_start(&context, &contextData, (DltLogLevelType)100)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -257,7 +257,7 @@ TEST(t_dlt_user_log_write_start, startstartfinish) { DltContext context; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -266,7 +266,7 @@ TEST(t_dlt_user_log_write_start, startstartfinish) // shouldn't it return -1, because it is already started? // TODO: EXPECT_GE(-1,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT)); EXPECT_LE(0,dlt_user_log_write_finish(&contextData)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -285,7 +285,7 @@ TEST(t_dlt_user_log_write_start, nullpointer) EXPECT_GE(-1,dlt_user_log_write_start(NULL, NULL, DLT_LOG_DEFAULT)); EXPECT_GE(-1,dlt_user_log_write_start(&context, NULL, DLT_LOG_DEFAULT)); //EXPECT_GE(-1,dlt_user_log_write_finish(&contextData)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -297,12 +297,12 @@ TEST(t_dlt_user_log_write_start_id, normal) DltContext context; DltContextData contextData; uint32_t messageid; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start_id normal")); - + // the defined enum values for log level messageid = UINT32_MIN; EXPECT_LE(0,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid)); @@ -354,7 +354,7 @@ TEST(t_dlt_user_log_write_start_id, abnormal) EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start_id abnormal")); - + // undefined values for DltLogLevelType // shouldn't it return -1? // TODO: messageid = UINT32_MIN; @@ -372,18 +372,18 @@ TEST(t_dlt_user_log_write_start_id, startstartfinish) DltContext context; DltContextData contextData; uint32_t messageid; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start_id startstartfinish")); - + messageid = UINT32_MIN; EXPECT_LE(0,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid)); // shouldn't it return -1, because it is already started? // TODO: EXPECT_GE(-1,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid)); EXPECT_LE(0,dlt_user_log_write_finish(&contextData)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -393,7 +393,7 @@ TEST(t_dlt_user_log_write_start_id, nullpointer) DltContext context; uint32_t messageid; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -405,7 +405,7 @@ TEST(t_dlt_user_log_write_start_id, nullpointer) //EXPECT_GE(-1,dlt_user_log_write_finish(&contextData)); EXPECT_GE(-1,dlt_user_log_write_start_id(NULL, NULL, DLT_LOG_DEFAULT, messageid)); EXPECT_GE(-1,dlt_user_log_write_start_id(&context, NULL, DLT_LOG_DEFAULT, messageid)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -416,29 +416,29 @@ TEST(t_dlt_user_log_write_finish, finish) { DltContext context; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start finish")); - + // finish without start // TODO: EXPECT_GE(-1,dlt_user_log_write_finish(NULL)); // TODO: EXPECT_GE(-1,dlt_user_log_write_finish(&contextData)); - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_finish finish")); // TODO: EXPECT_GE(-1,dlt_user_log_write_finish(&contextData)); - + // finish with start and initialized context EXPECT_LE(0,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT)); EXPECT_LE(0,dlt_user_log_write_finish(&contextData)); // 2nd finish // TODO: EXPECT_GE(-1,dlt_user_log_write_finish(&contextData)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -450,7 +450,7 @@ TEST(t_dlt_user_log_write_bool, normal) DltContext context; DltContextData contextData; uint8_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -473,7 +473,7 @@ TEST(t_dlt_user_log_write_bool, abnormal) DltContext context; DltContextData contextData; // TODO: uint8_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -497,7 +497,7 @@ TEST(t_dlt_user_log_write_bool, nullpointer) { DltContext context; uint8_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -506,7 +506,7 @@ TEST(t_dlt_user_log_write_bool, nullpointer) // NULL data = true; EXPECT_GE(-1,dlt_user_log_write_bool(NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -518,7 +518,7 @@ TEST(t_dlt_user_log_write_float32, normal) DltContext context; DltContextData contextData; float32_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -548,7 +548,7 @@ TEST(t_dlt_user_log_write_float32, nullpointer) { DltContext context; float32_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -557,7 +557,7 @@ TEST(t_dlt_user_log_write_float32, nullpointer) // NULL data = 1.; EXPECT_GE(-1,dlt_user_log_write_float32(NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -569,7 +569,7 @@ TEST(t_dlt_user_log_write_float64, normal) DltContext context; DltContextData contextData; double data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -599,7 +599,7 @@ TEST(t_dlt_user_log_write_float64, nullpointer) { DltContext context; double data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -608,7 +608,7 @@ TEST(t_dlt_user_log_write_float64, nullpointer) // NULL data = 1.; EXPECT_GE(-1,dlt_user_log_write_float64(NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -620,7 +620,7 @@ TEST(t_dlt_user_log_write_uint, normal) DltContext context; DltContextData contextData; unsigned int data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -645,7 +645,7 @@ TEST(t_dlt_user_log_write_uint, abnormal) DltContext context; DltContextData contextData; // TODO: unsigned int data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -665,7 +665,7 @@ TEST(t_dlt_user_log_write_uint, nullpointer) { DltContext context; unsigned int data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -674,7 +674,7 @@ TEST(t_dlt_user_log_write_uint, nullpointer) // NULL data = 1; EXPECT_GE(-1,dlt_user_log_write_uint(NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -686,7 +686,7 @@ TEST(t_dlt_user_log_write_uint8, normal) DltContext context; DltContextData contextData; uint8_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -710,7 +710,7 @@ TEST(t_dlt_user_log_write_uint8, nullpointer) { DltContext context; uint8_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -719,7 +719,7 @@ TEST(t_dlt_user_log_write_uint8, nullpointer) // NULL data = 1; EXPECT_GE(-1,dlt_user_log_write_uint8(NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -731,7 +731,7 @@ TEST(t_dlt_user_log_write_uint16, normal) DltContext context; DltContextData contextData; uint16_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -755,7 +755,7 @@ TEST(t_dlt_user_log_write_uint16, nullpointer) { DltContext context; uint16_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -764,7 +764,7 @@ TEST(t_dlt_user_log_write_uint16, nullpointer) // NULL data = 1; EXPECT_GE(-1,dlt_user_log_write_uint16(NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -776,7 +776,7 @@ TEST(t_dlt_user_log_write_uint32, normal) DltContext context; DltContextData contextData; uint32_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -800,7 +800,7 @@ TEST(t_dlt_user_log_write_uint32, nullpointer) { DltContext context; uint32_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -809,7 +809,7 @@ TEST(t_dlt_user_log_write_uint32, nullpointer) // NULL data = 1; EXPECT_GE(-1,dlt_user_log_write_uint32(NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -821,7 +821,7 @@ TEST(t_dlt_user_log_write_uint64, normal) DltContext context; DltContextData contextData; uint64_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -845,7 +845,7 @@ TEST(t_dlt_user_log_write_uint64, nullpointer) { DltContext context; uint64_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -854,7 +854,7 @@ TEST(t_dlt_user_log_write_uint64, nullpointer) // NULL data = 1; EXPECT_GE(-1,dlt_user_log_write_uint64(NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -866,7 +866,7 @@ TEST(t_dlt_user_log_write_uint8_formatted, normal) DltContext context; DltContextData contextData; uint8_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -909,7 +909,7 @@ TEST(t_dlt_user_log_write_uint8_formatted, abnormal) DltContext context; DltContextData contextData; // TODO: uint8_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -932,7 +932,7 @@ TEST(t_dlt_user_log_write_uint8_formatted, nullpointer) { DltContext context; uint8_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -947,7 +947,7 @@ TEST(t_dlt_user_log_write_uint8_formatted, nullpointer) EXPECT_GE(-1,dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_HEX64)); EXPECT_GE(-1,dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_BIN8)); EXPECT_GE(-1,dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_BIN16)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -959,7 +959,7 @@ TEST(t_dlt_user_log_write_uint16_formatted, normal) DltContext context; DltContextData contextData; uint16_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1002,7 +1002,7 @@ TEST(t_dlt_user_log_write_uint16_formatted, abnormal) DltContext context; DltContextData contextData; // TODO: uint16_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1025,7 +1025,7 @@ TEST(t_dlt_user_log_write_uint16_formatted, nullpointer) { DltContext context; uint16_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1040,7 +1040,7 @@ TEST(t_dlt_user_log_write_uint16_formatted, nullpointer) EXPECT_GE(-1,dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_HEX64)); EXPECT_GE(-1,dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_BIN8)); EXPECT_GE(-1,dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_BIN16)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1052,7 +1052,7 @@ TEST(t_dlt_user_log_write_uint32_formatted, normal) DltContext context; DltContextData contextData; uint32_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1095,7 +1095,7 @@ TEST(t_dlt_user_log_write_uint32_formatted, abnormal) DltContext context; DltContextData contextData; // TODO: uint32_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1118,7 +1118,7 @@ TEST(t_dlt_user_log_write_uint32_formatted, nullpointer) { DltContext context; uint32_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1133,7 +1133,7 @@ TEST(t_dlt_user_log_write_uint32_formatted, nullpointer) EXPECT_GE(-1,dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_HEX64)); EXPECT_GE(-1,dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_BIN8)); EXPECT_GE(-1,dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_BIN16)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1145,7 +1145,7 @@ TEST(t_dlt_user_log_write_uint64_formatted, normal) DltContext context; DltContextData contextData; uint64_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1188,7 +1188,7 @@ TEST(t_dlt_user_log_write_uint64_formatted, abnormal) DltContext context; DltContextData contextData; // TODO: uint64_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1211,7 +1211,7 @@ TEST(t_dlt_user_log_write_uint64_formatted, nullpointer) { DltContext context; uint64_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1226,7 +1226,7 @@ TEST(t_dlt_user_log_write_uint64_formatted, nullpointer) EXPECT_GE(-1,dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_HEX64)); EXPECT_GE(-1,dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_BIN8)); EXPECT_GE(-1,dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_BIN16)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1238,7 +1238,7 @@ TEST(t_dlt_user_log_write_int, normal) DltContext context; DltContextData contextData; int data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1266,7 +1266,7 @@ TEST(t_dlt_user_log_write_int, nullpointer) { DltContext context; int data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1275,7 +1275,7 @@ TEST(t_dlt_user_log_write_int, nullpointer) // NULL data = 1; EXPECT_GE(-1,dlt_user_log_write_int(NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1287,7 +1287,7 @@ TEST(t_dlt_user_log_write_int8, normal) DltContext context; DltContextData contextData; int8_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1315,7 +1315,7 @@ TEST(t_dlt_user_log_write_int8, nullpointer) { DltContext context; int8_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1324,7 +1324,7 @@ TEST(t_dlt_user_log_write_int8, nullpointer) // NULL data = 1; EXPECT_GE(-1,dlt_user_log_write_int8(NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1336,7 +1336,7 @@ TEST(t_dlt_user_log_write_int16, normal) DltContext context; DltContextData contextData; int16_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1364,7 +1364,7 @@ TEST(t_dlt_user_log_write_int16, nullpointer) { DltContext context; int16_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1373,7 +1373,7 @@ TEST(t_dlt_user_log_write_int16, nullpointer) // NULL data = 1; EXPECT_GE(-1,dlt_user_log_write_int16(NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1385,7 +1385,7 @@ TEST(t_dlt_user_log_write_int32, normal) DltContext context; DltContextData contextData; int32_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1413,7 +1413,7 @@ TEST(t_dlt_user_log_write_int32, nullpointer) { DltContext context; int32_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1422,7 +1422,7 @@ TEST(t_dlt_user_log_write_int32, nullpointer) // NULL data = 1; EXPECT_GE(-1,dlt_user_log_write_int32(NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1434,7 +1434,7 @@ TEST(t_dlt_user_log_write_int64, normal) DltContext context; DltContextData contextData; int64_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1462,7 +1462,7 @@ TEST(t_dlt_user_log_write_int64, nullpointer) { DltContext context; int64_t data; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1471,7 +1471,7 @@ TEST(t_dlt_user_log_write_int64, nullpointer) // NULL data = 1; EXPECT_GE(-1,dlt_user_log_write_int64(NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1482,7 +1482,7 @@ TEST(t_dlt_user_log_write_string, normal) { DltContext context; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1504,7 +1504,7 @@ TEST(t_dlt_user_log_write_string, nullpointer) { DltContext context; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1517,7 +1517,7 @@ TEST(t_dlt_user_log_write_string, nullpointer) EXPECT_GE(-1,dlt_user_log_write_string(NULL, NULL)); EXPECT_GE(-1,dlt_user_log_write_string(&contextData, NULL)); EXPECT_LE(0,dlt_user_log_write_finish(&contextData)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1528,7 +1528,7 @@ TEST(t_dlt_user_log_write_constant_string, normal) { DltContext context; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1550,7 +1550,7 @@ TEST(t_dlt_user_log_write_constant_string, nullpointer) { DltContext context; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1563,7 +1563,7 @@ TEST(t_dlt_user_log_write_constant_string, nullpointer) EXPECT_GE(-1,dlt_user_log_write_constant_string(NULL, NULL)); EXPECT_GE(-1,dlt_user_log_write_constant_string(&contextData, NULL)); EXPECT_LE(0,dlt_user_log_write_finish(&contextData)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1574,7 +1574,7 @@ TEST(t_dlt_user_log_write_utf8_string, normal) { DltContext context; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1596,7 +1596,7 @@ TEST(t_dlt_user_log_write_utf8_string, nullpointer) { DltContext context; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1609,7 +1609,7 @@ TEST(t_dlt_user_log_write_utf8_string, nullpointer) EXPECT_GE(-1,dlt_user_log_write_utf8_string(NULL, NULL)); EXPECT_GE(-1,dlt_user_log_write_utf8_string(&contextData, NULL)); EXPECT_LE(0,dlt_user_log_write_finish(&contextData)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1620,7 +1620,7 @@ TEST(t_dlt_user_log_write_raw, normal) { DltContext context; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1642,7 +1642,7 @@ TEST(t_dlt_user_log_write_raw, nullpointer) { DltContext context; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1656,7 +1656,7 @@ TEST(t_dlt_user_log_write_raw, nullpointer) EXPECT_GE(-1,dlt_user_log_write_raw(&contextData, NULL, 0)); EXPECT_GE(-1,dlt_user_log_write_raw(&contextData, NULL, 1)); EXPECT_LE(0,dlt_user_log_write_finish(&contextData)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1667,7 +1667,7 @@ TEST(t_dlt_user_log_write_raw_formatted, normal) { DltContext context; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1706,7 +1706,7 @@ TEST(t_dlt_user_log_write_raw_formatted, abnormal) // // EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); // EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_raw_formatted abnormal")); - + // undefined values for DltFormatType // shouldn't it return -1? // char text1[6] = "test1"; @@ -1723,7 +1723,7 @@ TEST(t_dlt_user_log_write_raw_formatted, nullpointer) { DltContext context; DltContextData contextData; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1737,7 +1737,7 @@ TEST(t_dlt_user_log_write_raw_formatted, nullpointer) EXPECT_GE(-1,dlt_user_log_write_raw_formatted(&contextData, NULL, 0, DLT_FORMAT_DEFAULT)); EXPECT_GE(-1,dlt_user_log_write_raw_formatted(&contextData, NULL, 1, DLT_FORMAT_DEFAULT)); EXPECT_LE(0,dlt_user_log_write_finish(&contextData)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1757,7 +1757,7 @@ int dlt_log_marker(); TEST(t_dlt_log_string, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1788,12 +1788,12 @@ TEST(t_dlt_log_string, normal) TEST(t_dlt_log_string, abnormal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string abnormal")); - + // undefined values for DltLogLevelType // shouldn't it return -1? // TODO: const char text1[6] = "test1"; @@ -1801,7 +1801,7 @@ TEST(t_dlt_log_string, abnormal) // TODO: EXPECT_GE(-1,dlt_log_string(&context, (DltLogLevelType)-10, text1)); // TODO: EXPECT_GE(-1,dlt_log_string(&context, (DltLogLevelType)10, text1)); // TODO: EXPECT_GE(-1,dlt_log_string(&context, (DltLogLevelType)100, text1)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1809,7 +1809,7 @@ TEST(t_dlt_log_string, abnormal) TEST(t_dlt_log_string, nullpointer) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1820,7 +1820,7 @@ TEST(t_dlt_log_string, nullpointer) EXPECT_GE(-1,dlt_log_string(NULL, DLT_LOG_DEFAULT, text1)); EXPECT_GE(-1,dlt_log_string(NULL, DLT_LOG_DEFAULT, NULL)); EXPECT_GE(-1,dlt_log_string(&context, DLT_LOG_DEFAULT, NULL)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1830,7 +1830,7 @@ TEST(t_dlt_log_string, nullpointer) TEST(t_dlt_log_string_int, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1871,12 +1871,12 @@ TEST(t_dlt_log_string_int, normal) TEST(t_dlt_log_string_int, abnormal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_int abnormal")); - + // undefined values for DltLogLevelType // shouldn't it return -1? // TODO: const char text1[6] = "test1"; @@ -1885,7 +1885,7 @@ TEST(t_dlt_log_string_int, abnormal) // TODO: EXPECT_GE(-1,dlt_log_string_int(&context, (DltLogLevelType)-10, text1, data)); // TODO: EXPECT_GE(-1,dlt_log_string_int(&context, (DltLogLevelType)10, text1, data)); // TODO: EXPECT_GE(-1,dlt_log_string_int(&context, (DltLogLevelType)100, text1, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1893,7 +1893,7 @@ TEST(t_dlt_log_string_int, abnormal) TEST(t_dlt_log_string_int, nullpointer) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1905,7 +1905,7 @@ TEST(t_dlt_log_string_int, nullpointer) EXPECT_GE(-1,dlt_log_string_int(NULL, DLT_LOG_DEFAULT, text1, data)); EXPECT_GE(-1,dlt_log_string_int(NULL, DLT_LOG_DEFAULT, NULL, data)); EXPECT_GE(-1,dlt_log_string_int(&context, DLT_LOG_DEFAULT, NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1915,7 +1915,7 @@ TEST(t_dlt_log_string_int, nullpointer) TEST(t_dlt_log_string_uint, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1956,12 +1956,12 @@ TEST(t_dlt_log_string_uint, normal) TEST(t_dlt_log_string_uint, abnormal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_uint abnormal")); - + // undefined values for DltLogLevelType // shouldn't it return -1? // TODO: const char text1[6] = "test1"; @@ -1970,7 +1970,7 @@ TEST(t_dlt_log_string_uint, abnormal) // TODO: EXPECT_GE(-1,dlt_log_string_uint(&context, (DltLogLevelType)-10, text1, data)); // TODO: EXPECT_GE(-1,dlt_log_string_uint(&context, (DltLogLevelType)10, text1, data)); // TODO: EXPECT_GE(-1,dlt_log_string_uint(&context, (DltLogLevelType)100, text1, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -1978,7 +1978,7 @@ TEST(t_dlt_log_string_uint, abnormal) TEST(t_dlt_log_string_uint, nullpointer) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -1990,7 +1990,7 @@ TEST(t_dlt_log_string_uint, nullpointer) EXPECT_GE(-1,dlt_log_string_uint(NULL, DLT_LOG_DEFAULT, text1, data)); EXPECT_GE(-1,dlt_log_string_uint(NULL, DLT_LOG_DEFAULT, NULL, data)); EXPECT_GE(-1,dlt_log_string_uint(&context, DLT_LOG_DEFAULT, NULL, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -2000,7 +2000,7 @@ TEST(t_dlt_log_string_uint, nullpointer) TEST(t_dlt_log_int, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2039,12 +2039,12 @@ TEST(t_dlt_log_int, normal) TEST(t_dlt_log_int, abnormal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_int abnormal")); - + // undefined values for DltLogLevelType // shouldn't it return -1? // TODO: int data = 1; @@ -2052,7 +2052,7 @@ TEST(t_dlt_log_int, abnormal) // TODO: EXPECT_GE(-1,dlt_log_int(&context, (DltLogLevelType)-10, data)); // TODO: EXPECT_GE(-1,dlt_log_int(&context, (DltLogLevelType)10, data)); // TODO: EXPECT_GE(-1,dlt_log_int(&context, (DltLogLevelType)100, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -2060,7 +2060,7 @@ TEST(t_dlt_log_int, abnormal) TEST(t_dlt_log_int, nullpointer) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2069,7 +2069,7 @@ TEST(t_dlt_log_int, nullpointer) // NULL int data = 0; EXPECT_GE(-1,dlt_log_int(NULL, DLT_LOG_DEFAULT, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -2079,7 +2079,7 @@ TEST(t_dlt_log_int, nullpointer) TEST(t_dlt_log_uint, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2118,12 +2118,12 @@ TEST(t_dlt_log_uint, normal) TEST(t_dlt_log_uint, abnormal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_uint abnormal")); - + // undefined values for DltLogLevelType // shouldn't it return -1? // TODO: unsigned int data = 1; @@ -2131,7 +2131,7 @@ TEST(t_dlt_log_uint, abnormal) // TODO: EXPECT_GE(-1,dlt_log_uint(&context, (DltLogLevelType)-10, data)); // TODO: EXPECT_GE(-1,dlt_log_uint(&context, (DltLogLevelType)10, data)); // TODO: EXPECT_GE(-1,dlt_log_uint(&context, (DltLogLevelType)100, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -2139,7 +2139,7 @@ TEST(t_dlt_log_uint, abnormal) TEST(t_dlt_log_uint, nullpointer) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2148,7 +2148,7 @@ TEST(t_dlt_log_uint, nullpointer) // NULL unsigned int data = 0; EXPECT_GE(-1,dlt_log_uint(NULL, DLT_LOG_DEFAULT, data)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -2158,7 +2158,7 @@ TEST(t_dlt_log_uint, nullpointer) TEST(t_dlt_log_raw, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2182,12 +2182,12 @@ TEST(t_dlt_log_raw, normal) TEST(t_dlt_log_raw, abnormal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_raw abnormal")); - + // undefined values for DltLogLevelType // shouldn't it return -1? char data[5] = "test"; @@ -2199,11 +2199,11 @@ TEST(t_dlt_log_raw, abnormal) // zero length // TODO: EXPECT_GE(-1,dlt_log_raw(&context, DLT_LOG_DEFAULT, data, 0)); - + // negative length EXPECT_GE(-1,dlt_log_raw(&context, DLT_LOG_DEFAULT, data, -1)); EXPECT_GE(-1,dlt_log_raw(&context, DLT_LOG_DEFAULT, data, -100)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -2211,7 +2211,7 @@ TEST(t_dlt_log_raw, abnormal) TEST(t_dlt_log_raw, nullpointer) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2223,7 +2223,7 @@ TEST(t_dlt_log_raw, nullpointer) EXPECT_GE(-1,dlt_log_raw(NULL, DLT_LOG_DEFAULT, data, length)); EXPECT_GE(-1,dlt_log_raw(NULL, DLT_LOG_DEFAULT, NULL, length)); EXPECT_GE(-1,dlt_log_raw(&context, DLT_LOG_DEFAULT, NULL, length)); - + EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); } @@ -2233,7 +2233,7 @@ TEST(t_dlt_log_raw, nullpointer) TEST(t_dlt_log_marker, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2322,7 +2322,7 @@ TEST(t_dlt_unregister_app, abnormal) TEST(t_dlt_register_context, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2336,7 +2336,7 @@ TEST(t_dlt_register_context, normal) TEST(t_dlt_register_context, abnormal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2354,7 +2354,7 @@ TEST(t_dlt_register_context, abnormal) // TODO: EXPECT_GE(-1,dlt_register_context(&context, "TEST1234567890", "")); // TODO: EXPECT_GE(-1,dlt_unregister_context(&context)); // TODO: EXPECT_GE(-1,dlt_register_context(&context, "TEST1234567890", "1")); - + EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal")); // TODO: EXPECT_GE(-1,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal")); // TODO: EXPECT_GE(-1,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal")); @@ -2369,7 +2369,7 @@ TEST(t_dlt_register_context, abnormal) TEST(t_dlt_register_context, nullpointer) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2388,7 +2388,7 @@ TEST(t_dlt_register_context, nullpointer) TEST(t_dlt_register_context_ll_ts, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2428,7 +2428,7 @@ TEST(t_dlt_register_context_ll_ts, normal) TEST(t_dlt_register_context_ll_ts, abnormal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2446,7 +2446,7 @@ TEST(t_dlt_register_context_ll_ts, abnormal) // TODO: EXPECT_GE(-1,dlt_register_context_ll_ts(&context, "TEST1234567890", "", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); // TODO: EXPECT_GE(-1,dlt_unregister_context(&context)); // TODO: EXPECT_GE(-1,dlt_register_context_ll_ts(&context, "TEST1234567890", "1", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); - + EXPECT_LE(0,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); // TODO: EXPECT_GE(-1,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); // TODO: EXPECT_GE(-1,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); @@ -2461,7 +2461,7 @@ TEST(t_dlt_register_context_ll_ts, abnormal) // TODO: EXPECT_GE(-1,dlt_unregister_context(&context)); EXPECT_GE(-1,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_DEFAULT)); // TODO: EXPECT_GE(-1,dlt_unregister_context(&context)); - + // abnormal values for loglevel and tracestatus EXPECT_GE(-1,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", -1, DLT_TRACE_STATUS_OFF)); // TODO: EXPECT_GE(-1,dlt_unregister_context(&context)); @@ -2479,7 +2479,7 @@ TEST(t_dlt_register_context_ll_ts, abnormal) TEST(t_dlt_register_context_ll_ts, nullpointer) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2498,7 +2498,7 @@ TEST(t_dlt_register_context_ll_ts, nullpointer) TEST(t_dlt_unregister_context, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2512,7 +2512,7 @@ TEST(t_dlt_unregister_context, normal) TEST(t_dlt_unregister_context, abnormal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2530,7 +2530,7 @@ TEST(t_dlt_unregister_context, abnormal) // TODO: EXPECT_GE(-1,dlt_register_context(&context, "TEST1234567890", "")); // TODO: EXPECT_GE(-1,dlt_unregister_context(&context)); // TODO: EXPECT_GE(-1,dlt_register_context(&context, "TEST1234567890", "1")); - + EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal")); // TODO: EXPECT_GE(-1,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal")); // TODO: EXPECT_GE(-1,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal")); @@ -2545,7 +2545,7 @@ TEST(t_dlt_unregister_context, abnormal) TEST(t_dlt_unregister_context, nullpointer) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2571,14 +2571,14 @@ TEST(t_dlt_register_injection_callback, normal) { DltContext context; // TODO: uint32_t service_id; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_injection_callback normal")); // TODO: service_id = 0x123; - // TODO: EXPECT_LE(0,dlt_register_injection_callback(&context, service_id, dlt_user_injection_callback)); + // TODO: EXPECT_LE(0,dlt_register_injection_callback(&context, service_id, dlt_user_injection_callback)); EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); @@ -2590,19 +2590,19 @@ TEST(t_dlt_register_injection_callback, normal) // t_dlt_register_log_level_changed_callback void dlt_user_log_level_changed_callback(char /*context_id*/[DLT_ID_SIZE], uint8_t /*log_level*/, uint8_t /*trace_status*/) { - + } TEST(t_dlt_register_log_level_changed_callback, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); EXPECT_LE(0,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_log_level_changed_callback normal")); - EXPECT_LE(0,dlt_register_log_level_changed_callback(&context, dlt_user_log_level_changed_callback)); + EXPECT_LE(0,dlt_register_log_level_changed_callback(&context, dlt_user_log_level_changed_callback)); EXPECT_LE(0,dlt_unregister_context(&context)); EXPECT_LE(0,dlt_unregister_app()); @@ -2615,7 +2615,7 @@ TEST(t_dlt_register_log_level_changed_callback, normal) TEST(t_dlt_user_trace_network, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2644,7 +2644,7 @@ TEST(t_dlt_user_trace_network, normal) TEST(t_dlt_user_trace_network, abnormal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2679,7 +2679,7 @@ TEST(t_dlt_user_trace_network, abnormal) TEST(t_dlt_user_trace_network, nullpointer) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2711,7 +2711,7 @@ TEST(t_dlt_user_trace_network, nullpointer) TEST(t_dlt_user_trace_network_truncated, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2740,7 +2740,7 @@ TEST(t_dlt_user_trace_network_truncated, normal) TEST(t_dlt_user_trace_network_truncated, abnormal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2775,7 +2775,7 @@ TEST(t_dlt_user_trace_network_truncated, abnormal) TEST(t_dlt_user_trace_network_truncated, nullpointer) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2807,7 +2807,7 @@ TEST(t_dlt_user_trace_network_truncated, nullpointer) TEST(t_dlt_user_trace_network_segmented, normal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2836,7 +2836,7 @@ TEST(t_dlt_user_trace_network_segmented, normal) TEST(t_dlt_user_trace_network_segmented, abnormal) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); @@ -2871,7 +2871,7 @@ TEST(t_dlt_user_trace_network_segmented, abnormal) TEST(t_dlt_user_trace_network_segmented, nullpointer) { DltContext context; - + EXPECT_LE(0,dlt_register_app("TUSR", "dlt_user.c tests")); diff --git a/tests/start_filetransfer_test.sh b/tests/start_filetransfer_test.sh index cafc705..9a1e19c 100755 --- a/tests/start_filetransfer_test.sh +++ b/tests/start_filetransfer_test.sh @@ -19,7 +19,7 @@ echo $md5_2 #verify the sums tput setaf 1 if [ $md5_1 == $md5_2 ] -then +then echo "Files are equal. Transfer succuess." else echo "File not equal. Error on transmission" diff --git a/tests/start_system_logger_test.sh b/tests/start_system_logger_test.sh index 39e89d9..b0c5a6a 100755 --- a/tests/start_system_logger_test.sh +++ b/tests/start_system_logger_test.sh @@ -9,7 +9,7 @@ echo "LogFileTimeDelay = 3" | sudo tee -a /usr/local/etc/dlt-system.conf echo "LogFileContextId = PROC" | sudo tee -a /usr/local/etc/dlt-system.conf #comile the kernel module for system logging cd mod_system_logger -make +make cd .. #enable mod sudo insmod mod_system_logger/mod_system_logger.ko @@ -21,7 +21,7 @@ dlt-system & sleep 1 #start dlt-receiver ../build/tests/dlt_test_receiver -l localhost & -sleep 1 +sleep 1 pid=$! wait $pid exitcode=$? diff --git a/tests/testfile_filetransfer.txt b/tests/testfile_filetransfer.txt index 4850be0..a033e3f 100644 --- a/tests/testfile_filetransfer.txt +++ b/tests/testfile_filetransfer.txt @@ -1,4 +1,4 @@ -TEST DATEI. +TEST DATEI. 123. qwertzuiopü+ asdfghjklöä# diff --git a/testscripts/Meego/dlt-daemon.cmake b/testscripts/Meego/dlt-daemon.cmake index 3ef0744..08bbf1b 100755 --- a/testscripts/Meego/dlt-daemon.cmake +++ b/testscripts/Meego/dlt-daemon.cmake @@ -20,7 +20,7 @@ # Starts the DLT Daemon # # chkconfig: 2345 21 87 -# description: Provides DLT Debug Logging & Trace functionality +# description: Provides DLT Debug Logging & Trace functionality # processname: dlt-daemon # Source function library. @@ -79,13 +79,13 @@ case "$1" in echo "DLT Daemon is NOT running" fi - if [ -f /var/log/messages ] + if [ -f /var/log/messages ] then echo "------- messages ----------------" cat /var/log/messages | grep -a DLT | tail fi - if [ -f /var/log/syslog ] + if [ -f /var/log/syslog ] then echo "------- SYSLOG -------------------" cat /var/log/syslog | grep -a DLT | tail diff --git a/testscripts/Ubuntu/dlt-daemon.cmake b/testscripts/Ubuntu/dlt-daemon.cmake index 88c9acc..c8e06c1 100755 --- a/testscripts/Ubuntu/dlt-daemon.cmake +++ b/testscripts/Ubuntu/dlt-daemon.cmake @@ -131,24 +131,24 @@ case "$1" in esac ;; status) - if [ -f /var/log/messages ] + if [ -f /var/log/messages ] then log_daemon_msg "------- messages ----------------" cat /var/log/messages | grep -a DLT | tail fi - if [ -f /var/log/syslog ] + if [ -f /var/log/syslog ] then log_daemon_msg "------- SYSLOG -------------------" cat /var/log/syslog | grep -a DLT | tail fi - + pidofdlt=`pidof $DESC` if [ $pidofdlt ] then log_daemon_msg "$NAME has the PID:$pidofdlt" fi - + status_of_proc "$DAEMON" "$NAME" || exit $? ;; #reload|force-reload) |
