diff options
author | Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> | 2012-09-04 10:55:46 +0200 |
---|---|---|
committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2012-11-26 12:39:18 +0100 |
commit | 7ed880cac9a8e210f3ebd5397fc64b1a740f1d4b (patch) | |
tree | 1d6054542d0cc3c0dc256dace505585f1faec49c /src/tests | |
parent | 03f373682761f3e835157188c26b41c849c9fdd2 (diff) | |
download | DLT-daemon-7ed880cac9a8e210f3ebd5397fc64b1a740f1d4b.tar.gz |
[GDLT-120]: Improved Network trace. Rewrite to POSIX queue.
This is a squash of multiple commits. The original commit messages follow.
[GDLT-120]: Segmented network trace: Correct error condition checks.
[GDLT-120]: Add documentation for extended network trace
[GDLT-120]: Add dlt_queue. Linked list based dynamic queue.
[GDLT-120]: Recode to using queue for segmented messages
[GDLT-120]: Improved thread start handling. Add error handling.
Remove libm from linkage.
[GDLT-120]: Avoid sending an extraneous empty segment, when size is aligned
[GDLT-120]: More expansive return values from dlt_user_log_send_log
[GDLT-120]: Change default behaviour of dlt_user_trace_network to truncated, instead of discard.
[GDLT-120]: Convert to POSIX queue.
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Diffstat (limited to 'src/tests')
-rw-r--r-- | src/tests/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/tests/dlt-test-queue.c | 94 |
2 files changed, 99 insertions, 1 deletions
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 3d5ab91..e91ab58 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -13,6 +13,10 @@ # # @licence end@ ######## +set(dlt_test_queue_SRCS dlt-test-queue) +add_executable(dlt-test-queue ${dlt_test_queue_SRCS}) +target_link_libraries(dlt-test-queue dlt) +set_target_properties(dlt-test-queue PROPERTIES LINKER_LANGUAGE C) set(dlt_test_multi_process_SRCS dlt-test-multi-process) add_executable(dlt-test-multi-process ${dlt_test_multi_process_SRCS}) @@ -54,7 +58,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-queue 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-queue.c b/src/tests/dlt-test-queue.c new file mode 100644 index 0000000..774ea8f --- /dev/null +++ b/src/tests/dlt-test-queue.c @@ -0,0 +1,94 @@ +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * This Source Code Form is subject to the terms of the + * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with + * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * + * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> BMW 2012 + * + * \file dlt-test-queue.h + * For further information see http://www.genivi.org/. + * @licence end@ + */ + + +/******************************************************************************* +** ** +** SRC-MODULE: dlt_queue.h ** +** ** +** TARGET : linux ** +** ** +** PROJECT : DLT ** +** ** +** AUTHOR : Lassi Marttala <lassi.lm.marttala@partner.bmw.de> ** +** ** +** PURPOSE : Test for queue implementation ** +** ** +** REMARKS : ** +** ** +** PLATFORM DEPENDANT [yes/no]: no ** +** ** +** TO BE CHANGED BY USER [yes/no]: no ** +** ** +*******************************************************************************/ + +/******************************************************************************* +** Author Identity ** +******************************************************************************** +** ** +** Initials Name Company ** +** -------- ------------------------- ---------------------------------- ** +** lm Lassi Marttala Eureka GmbH ** +*******************************************************************************/ + +#include "dlt_queue.h" +#include <stdio.h> +#include <string.h> + +int main(void) +{ + char *item_content = "item_content\n"; + int item_len = strlen(item_content) + 1; + dlt_queue *queue = dlt_queue_create(); + printf("#1\tdlt_queue_is_empty returns\t%d\n", dlt_queue_is_empty(queue)); + + dlt_queue_item *first = dlt_queue_create_item(); + first->item = item_content; + first->item_size = item_len; + dlt_queue_push(first, queue); + + printf("#2\tdlt_queue_is_empty returns\t%d\n", dlt_queue_is_empty(queue)); + printf("#3\tdlt_queue_item_count returns\t%d\n", dlt_queue_item_count(queue)); + + dlt_queue_item *tret = dlt_queue_pop(queue); + printf("#4\tItem content after pop:\t%d:%s", tret->item_size, (char *)tret->item); + dlt_queue_free_item(tret); + + int i=0; + for(i=0;i<5;i++) + { + dlt_queue_item *newitem = dlt_queue_create_item(); + newitem->item = item_content; + newitem->item_size = i; + dlt_queue_push(newitem, queue); + } + printf("#5\tdlt_queue_item_count returns\t%d\n", dlt_queue_item_count(queue)); + while(!dlt_queue_is_empty(queue)) + { + dlt_queue_item *olditem = dlt_queue_pop(queue); + printf("#6\tItem size (item number):%d\n", olditem->item_size); + dlt_queue_free_item(olditem); + } + printf("#7\tdlt_queue_is_empty returns\t%d\n", dlt_queue_is_empty(queue)); + printf("#8\tdlt_queue_item_count returns\t%d\n", dlt_queue_item_count(queue)); + return 0; +} |