Merge branch 'master' of 10.250.89.78:/home/q237052/git/DLT-daemon

3 files changed, 16 insertions, 10 deletions

diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index 0764efc..4f153d5 100755
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -197,12 +197,18 @@ int dlt_init(void)
         return -1;
     }
 
-    /* Initialize thread */
+    /* Set default thread stack size */
     if (pthread_attr_init(&dlt_receiverthread_attr)<0)
     {
-        dlt_log(LOG_WARNING, "Initialization of thread failed!\n");
-        return -1;
-    }   
+        dlt_log(LOG_WARNING, "Initialization of default thread stack size failed!\n");
+    }
+    else
+    {
+        if (pthread_attr_setstacksize(&dlt_receiverthread_attr,DLT_USER_RECEIVERTHREAD_STACKSIZE)<0)
+        {
+            dlt_log(LOG_WARNING, "Setting of default thread stack size failed!\n");
+        }
+    }
 
     /* Start receiver thread */
     if (pthread_create(&(dlt_receiverthread_handle),
diff --git a/src/lib/dlt_user_cfg.h b/src/lib/dlt_user_cfg.h
index 31af24d..5b1e71e 100755
--- a/src/lib/dlt_user_cfg.h
+++ b/src/lib/dlt_user_cfg.h
@@ -106,6 +106,9 @@
 /* Length of buffer for constructing text output */

 #define DLT_USER_TEXT_LENGTH         	   10024

 

+/* Stack size of receiver thread */

+#define DLT_USER_RECEIVERTHREAD_STACKSIZE 100000

+

 /* default value for storage to file, not used in daemon connection */

 #define DLT_USER_DEFAULT_ECU_ID "ECU1"

 

diff --git a/src/tests/dlt-test-stress.c b/src/tests/dlt-test-stress.c
index ea17857..07b3ae9 100755
--- a/src/tests/dlt-test-stress.c
+++ b/src/tests/dlt-test-stress.c
@@ -98,7 +98,7 @@ typedef struct
 } thread_data_t;
 
 #define STRESS1_NUM_CONTEXTS    3000
-#define STRESS2_MAX_NUM_THREADS  256
+#define STRESS2_MAX_NUM_THREADS  64
 #define STRESS3_MAX_NUM_MESSAGES 512
 
 #define MAX_TESTS 3
@@ -319,10 +319,7 @@ void stress2(void)
 
     for (index=0;index<STRESS2_MAX_NUM_THREADS;index++)
     {
-        if (thread[index]!=0)
-        {
-            pthread_join(thread[index], NULL);
-        }
+		pthread_join(thread[index], NULL);
     }
 
     printf("Finished stress test2 \n\n");
@@ -366,7 +363,7 @@ void stress3(void)
     {
         buffer[num] = num;
         DLT_LOG(context_stress3,DLT_LOG_INFO,DLT_INT(num),DLT_RAW(buffer,num));
-        usleep(1);
+        usleep(10000);
     }
 
     printf("Finished stress test3 \n\n");