summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/dlt_queue.c172
-rw-r--r--src/shared/dlt_queue.h142
-rwxr-xr-xsrc/shared/dlt_user_shared.h11
3 files changed, 320 insertions, 5 deletions
diff --git a/src/shared/dlt_queue.c b/src/shared/dlt_queue.c
new file mode 100644
index 0000000..b9b4855
--- /dev/null
+++ b/src/shared/dlt_queue.c
@@ -0,0 +1,172 @@
+/**
+ * @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_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 : Linked list based dynamic queue **
+** **
+** 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 <stdlib.h>
+#include <semaphore.h>
+
+#include "dlt_queue.h"
+
+// Thread safety
+static sem_t dlt_queue_mutex;
+#define DLT_QUEUE_SEM_LOCK() { sem_wait(&dlt_queue_mutex); }
+#define DLT_QUEUE_SEM_FREE() { sem_post(&dlt_queue_mutex); }
+
+dlt_queue_item *dlt_queue_create_item()
+{
+ dlt_queue_item *item = malloc(sizeof(dlt_queue_item));
+ item->item = NULL;
+ item->item_size = 0;
+ item->next_item = NULL;
+ return item;
+}
+
+void dlt_queue_free_item(dlt_queue_item *item)
+{
+ if(item != NULL)
+ {
+ free(item);
+ item = NULL;
+ }
+}
+
+dlt_queue *dlt_queue_create()
+{
+ static int init_done = 0;
+ if(!init_done)
+ {
+ init_done = 1;
+ sem_init(&dlt_queue_mutex, 0, 1);
+ }
+ return (dlt_queue *)malloc(sizeof(dlt_queue));
+}
+
+void dlt_queue_free(dlt_queue *queue)
+{
+ if(queue != NULL)
+ {
+ free(queue);
+ queue = NULL;
+ }
+}
+
+void dlt_queue_push(dlt_queue_item *item, dlt_queue *queue)
+{
+ DLT_QUEUE_SEM_LOCK()
+ item->next_item = NULL;
+ // Empty queue
+ if(dlt_queue_is_empty(queue))
+ {
+ queue->head = item;
+ queue->tail = item;
+ }
+ // Exactly one item
+ else if(queue->head == queue->tail)
+ {
+ queue->head->next_item = (struct dlt_queue_item *)item;
+ queue->tail = item;
+ }
+ // Default case
+ else
+ {
+ queue->tail->next_item = (struct dlt_queue_item *)item;
+ queue->tail = item;
+ }
+ DLT_QUEUE_SEM_FREE()
+}
+
+dlt_queue_item *dlt_queue_pop(dlt_queue *queue)
+{
+ DLT_QUEUE_SEM_LOCK()
+ dlt_queue_item *retval = NULL;
+ // Empty queue
+ if(dlt_queue_is_empty(queue))
+ {
+ retval = NULL;
+ }
+ // Exactly one item
+ else if(queue->head == queue->tail)
+ {
+ retval = queue->head;
+ retval->next_item = NULL;
+ queue->head = NULL;
+ queue->tail = NULL;
+ }
+ // Default case
+ else
+ {
+ retval = queue->head;
+ queue->head = (dlt_queue_item *)retval->next_item;
+ retval->next_item = NULL;
+ }
+ DLT_QUEUE_SEM_FREE()
+ return retval;
+}
+
+int dlt_queue_is_empty(dlt_queue *queue)
+{
+ if(queue->head == NULL && queue->tail == NULL)
+ return 1;
+ return 0;
+}
+
+int dlt_queue_item_count(dlt_queue *queue)
+{
+ DLT_QUEUE_SEM_LOCK()
+ int retval = 0;
+ dlt_queue_item *ptr = queue->head;
+ while(ptr != NULL)
+ {
+ ptr = (dlt_queue_item *) ptr->next_item;
+ retval++;
+ }
+ DLT_QUEUE_SEM_FREE()
+ return retval;
+}
diff --git a/src/shared/dlt_queue.h b/src/shared/dlt_queue.h
new file mode 100644
index 0000000..40eda03
--- /dev/null
+++ b/src/shared/dlt_queue.h
@@ -0,0 +1,142 @@
+/**
+ * @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_common_cfg.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 : Linked list based dynamic queue **
+** **
+** REMARKS : **
+** **
+** PLATFORM DEPENDANT [yes/no]: no **
+** **
+** TO BE CHANGED BY USER [yes/no]: no **
+** **
+*******************************************************************************/
+
+/*******************************************************************************
+** Author Identity **
+********************************************************************************
+** **
+** Initials Name Company **
+** -------- ------------------------- ---------------------------------- **
+** lm Lassi Marttala Eureka GmbH **
+*******************************************************************************/
+#ifndef __DLT_QUEUE_H_
+#define __DLT_QUEUE_H_
+#include <stdint.h>
+
+/**
+ * \brief One item in the linked list
+ */
+typedef struct {
+ void *item;
+ uint16_t item_size;
+ struct dlt_queue_item *next_item;
+}dlt_queue_item;
+
+/**
+ * \brief Linked list of items
+ */
+typedef struct {
+ dlt_queue_item *head;
+ dlt_queue_item *tail;
+} dlt_queue;
+
+/**
+ * \brief Create new empty queue item
+ * Allocates a new item and returns a pointer to it
+ * @return Pointer to the new item
+ */
+dlt_queue_item *dlt_queue_create_item();
+
+/**
+ * \brief Free an queue item
+ * Frees the memory of the queue item
+ * @param item Pointer to the item to be freed
+ */
+void dlt_queue_free_item(dlt_queue_item *item);
+
+/**
+ * \brief Create a new empty queue
+ * Queue is created with no items in it.
+ * User is responsible for calling dlt_queue_free after
+ * the queue is not needed anymore.
+ * @return New allocated queue
+ */
+dlt_queue *dlt_queue_create();
+
+/**
+ * \brief Delete a queue
+ * Free the memory of the queue structure.
+ * Queued items are NOT freed. User must first pop all the items
+ * to remove the from queue and fere their memory themself.
+ * @param queue the queue to be freed
+ */
+void dlt_queue_free(dlt_queue *queue);
+
+/**
+ * \brief Push an item to the end of the queue
+ * Add a new item to the queue. It is now the new tail item.
+ * Queue does not take ownership of the item. User still must
+ * handle the freeing of the memory.
+ * @param item New item to add to the queue
+ * @param queue Queue to add the item to.
+ */
+void dlt_queue_push(dlt_queue_item *item, dlt_queue *queue);
+
+/**
+ * \brief Pop an item from the head of the queue
+ * Remove an item from the head of the queue and return it.
+ * @param queue Queue to pop from
+ * @return Pointer to the popped item
+ */
+dlt_queue_item *dlt_queue_pop(dlt_queue *queue);
+
+/**
+ * \brief Checks if the queue is empty
+ * Checks if the head and and tail are null pointers
+ * and returns the result.
+ * @param queue Queue to check
+ * @return 1 if queue is empty, 0 if not.
+ */
+int dlt_queue_is_empty(dlt_queue *queue);
+
+/**
+ * \brief Counts the items in the queue
+ * Walks the item chain and reports the number of items in
+ * the queue. If you only need to know if there are items
+ * or not, please use dlt_queue_is_empty, which is cheaper
+ * than counting the items.
+ * @param queue Queue to check
+ * @return number of items.
+ */
+int dlt_queue_item_count(dlt_queue *queue);
+#endif
diff --git a/src/shared/dlt_user_shared.h b/src/shared/dlt_user_shared.h
index 251a12e..203763a 100755
--- a/src/shared/dlt_user_shared.h
+++ b/src/shared/dlt_user_shared.h
@@ -75,11 +75,12 @@
* This are the return values for the functions dlt_user_log_out2() and dlt_user_log_out3()
*/
typedef enum
-{
- DLT_RETURN_PIPE_FULL = -3,
- DLT_RETURN_PIPE_ERROR = -2,
- DLT_RETURN_ERROR = -1,
- DLT_RETURN_OK = 0
+{
+ DLT_RETURN_BUFFER_FULL = -4,
+ DLT_RETURN_PIPE_FULL = -3,
+ DLT_RETURN_PIPE_ERROR = -2,
+ DLT_RETURN_ERROR = -1,
+ DLT_RETURN_OK = 0
} DltReturnValue;
/**
View Lorry Controller Status