From 94c7cdfba0aab20254d37f765c7faea7f6c447f4 Mon Sep 17 00:00:00 2001 From: Lassi Marttala Date: Wed, 26 Sep 2012 09:35:52 +0200 Subject: [GDLT-120]: Segmented Network Trace: Prepare for rewrite. This is a combination of 2 commits. Original descriptions below. [GDLT-120]: Remove dlt_queue. Only usage replace with POSIX queue. [GDLT-120]: Improve documentation. Add a note about context having to be pesistent thorough application lifetime. [GDLT-120]: Add macro interface. Signed-off-by: Alexander Wenzel --- src/tests/CMakeLists.txt | 7 +--- src/tests/dlt-test-queue.c | 94 ---------------------------------------------- 2 files changed, 1 insertion(+), 100 deletions(-) delete mode 100644 src/tests/dlt-test-queue.c (limited to 'src/tests') diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index e91ab58..b84bec9 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -13,11 +13,6 @@ # # @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}) target_link_libraries(dlt-test-multi-process dlt) @@ -58,7 +53,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-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 +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-queue.c b/src/tests/dlt-test-queue.c deleted file mode 100644 index 774ea8f..0000000 --- a/src/tests/dlt-test-queue.c +++ /dev/null @@ -1,94 +0,0 @@ -/** - * @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 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 ** -** ** -** 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 -#include - -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; -} -- cgit v1.2.1