summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Brandner <simon.brandner@partner.bmw.de>2013-03-18 13:54:00 +0100
committerAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>2013-07-19 16:54:43 +0200
commit0455d98d5664dd8891b3e5c97f268a0da0828e12 (patch)
treea69e3d3acabd1fe0916323e4c2e1b375731857b1 /src
parent64012cd52293c8126e8ab332ef0f665d27f7c594 (diff)
downloadDLT-daemon-0455d98d5664dd8891b3e5c97f268a0da0828e12.tar.gz
added DLT_SEM_LOCK around init of dlt user buffer
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Diffstat (limited to 'src')
-rw-r--r--src/lib/dlt_user.c3
-rwxr-xr-xsrc/shared/dlt_common.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index 407154f..afacf03 100644
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -406,6 +406,7 @@ int dlt_init_common(void)
}
/* Initialize LogLevel/TraceStatus field */
+ DLT_SEM_LOCK();
dlt_user.dlt_ll_ts = 0;
dlt_user.dlt_ll_ts_max_num_entries = 0;
dlt_user.dlt_ll_ts_num_entries = 0;
@@ -413,8 +414,10 @@ int dlt_init_common(void)
if (dlt_buffer_init_dynamic(&(dlt_user.startup_buffer), DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)==-1)
{
dlt_user_initialised = 0;
+ DLT_SEM_FREE();
return -1;
}
+ DLT_SEM_FREE();
signal(SIGPIPE,SIG_IGN); /* ignore pipe signals */
diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c
index 09a3258..8047fcb 100755
--- a/src/shared/dlt_common.c
+++ b/src/shared/dlt_common.c
@@ -2378,6 +2378,7 @@ int dlt_buffer_init_static_client(DltBuffer *buf, const unsigned char *ptr, uint
int dlt_buffer_init_dynamic(DltBuffer *buf, uint32_t min_size, uint32_t max_size,uint32_t step_size)
{
+ //Do not DLT_SEM_LOCK inside here!
char str[256];
DltBufferHead *head;