Bug 84 - Adding utf8 support to dlt-daemon, dlt-viewer. Modified patch, originally provided by Stefan Vacek.

Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>

2 files changed, 69 insertions, 29 deletions

diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c
index 5da480f..a8f10ff 100755
--- a/src/tests/dlt-test-client.c
+++ b/src/tests/dlt-test-client.c
@@ -492,7 +492,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
         }
         else if (strcmp(text,"Test2: (Macro IF) finished")==0)
         {
-            if (dltdata->test_counter_macro[1]==14)
+            if (dltdata->test_counter_macro[1]==16)
             {
                 printf("Test2m PASSED\n");
                 dltdata->tests_passed++;
@@ -540,7 +540,21 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                                 DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t);
                                 type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp);
 
-                                if (type_info & DLT_TYPE_INFO_BOOL)
+                                if ((type_info & DLT_TYPE_INFO_STRG) && ((type_info & DLT_TYPE_INFO_SCOD) == DLT_SCOD_ASCII))
+                                {
+                                    if (datalength==(sizeof(uint16_t)+strlen("Hello world")+1))
+                                    {
+                                        dltdata->test_counter_macro[1]++;
+                                    }
+                                }
+                                else if ((type_info & DLT_TYPE_INFO_STRG) && ((type_info & DLT_TYPE_INFO_SCOD) == DLT_SCOD_UTF8))
+                                {
+                                    if (datalength==(sizeof(uint16_t)+strlen("Hello world")+1))
+                                    {
+                                        dltdata->test_counter_macro[1]++;
+                                    }
+                                }
+                                else if (type_info & DLT_TYPE_INFO_BOOL)
                                 {
                                     if (datalength==sizeof(uint8_t))
                                     {
@@ -694,7 +708,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
         }
         else if (strcmp(text,"Test3: (Macro IF) finished")==0)
         {
-            if (dltdata->test_counter_macro[2]==14)
+            if (dltdata->test_counter_macro[2]==16)
             {
                 printf("Test3m PASSED\n");
                 dltdata->tests_passed++;
@@ -731,6 +745,28 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                 {
                 case  1:
                 {
+                    slen=strlen("string")+1;
+                    datalength-=slen;
+                    ptr+=slen;
+                    if (datalength==sizeof(uint16_t)+strlen("Hello world")+1)
+                    {
+                        dltdata->test_counter_macro[2]++;
+                    }
+                    break;
+                }
+                case  2:
+                {
+                    slen=strlen("utf8")+1;
+                    datalength-=slen;
+                    ptr+=slen;
+                    if (datalength==sizeof(uint16_t)+strlen("Hello world")+1)
+                    {
+                        dltdata->test_counter_macro[2]++;
+                    }
+                    break;
+                }
+                case  3:
+                {
                     slen=strlen("bool")+1;
                     datalength-=slen;
                     ptr+=slen;
@@ -740,7 +776,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                     }
                     break;
                 }
-                case  2:
+                case  4:
                 {
                     slen=strlen("int")+1;
                     datalength-=slen;
@@ -751,7 +787,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                     }
                     break;
                 }
-                case  3:
+                case  5:
                 {
                     slen=strlen("int8")+1;
                     datalength-=slen;
@@ -762,7 +798,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                     }
                     break;
                 }
-                case  4:
+                case  6:
                 {
                     slen=strlen("int16")+1;
                     datalength-=slen;
@@ -773,7 +809,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                     }
                     break;
                 }
-                case  5:
+                case  7:
                 {
                     slen=strlen("int32")+1;
                     datalength-=slen;
@@ -784,7 +820,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                     }
                     break;
                 }
-                case  6:
+                case  8:
                 {
                     slen=strlen("int64")+1;
                     datalength-=slen;
@@ -795,7 +831,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                     }
                     break;
                 }
-                case  7:
+                case  9:
                 {
                     slen=strlen("uint")+1;
                     datalength-=slen;
@@ -806,7 +842,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                     }
                     break;
                 }
-                case  8:
+                case  10:
                 {
                     slen=strlen("uint8")+1;
                     datalength-=slen;
@@ -817,7 +853,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                     }
                     break;
                 }
-                case  9:
+                case  11:
                 {
                     slen=strlen("uint16")+1;
                     datalength-=slen;
@@ -828,7 +864,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                     }
                     break;
                 }
-                case 10:
+                case 12:
                 {
                     slen=strlen("uint32")+1;
                     datalength-=slen;
@@ -839,7 +875,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                     }
                     break;
                 }
-                case 11:
+                case 13:
                 {
                     slen=strlen("uint64")+1;
                     datalength-=slen;
@@ -850,7 +886,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                     }
                     break;
                 }
-                case 12:
+                case 14:
                 {
                     slen=strlen("float32")+1;
                     datalength-=slen;
@@ -862,7 +898,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                     }
                     break;
                 }
-                case 13:
+                case 15:
                 {
                     slen=strlen("float64")+1;
                     datalength-=slen;
@@ -874,7 +910,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
                     }
                     break;
                 }
-                case 14:
+                case 16:
                 {
                     slen=strlen("raw")+1;
                     datalength-=slen;
diff --git a/src/tests/dlt-test-user.c b/src/tests/dlt-test-user.c
index 16c3cab..caef49f 100755
--- a/src/tests/dlt-test-user.c
+++ b/src/tests/dlt-test-user.c
@@ -373,6 +373,8 @@ int test2m(void)
     printf("Test2m: (Macro IF) Test all variable types (verbose)\n");
     DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test2: (Macro IF) Test all variable types (verbose)"));
 
+    DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("string"),DLT_STRING("Hello world"));
+    DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("utf8"),DLT_UTF8("Hello world"));
     DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("bool"),DLT_BOOL(1));
     DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("int"),DLT_INT(INT32_MIN));         /* (-2147483647-1) */
     DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("int8"),DLT_INT8(INT8_MIN));        /*          (-128) */
@@ -412,19 +414,21 @@ int test3m(void)
 
 	DLT_NONVERBOSE_MODE();
 
-    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,1,DLT_STRING("bool"),DLT_BOOL(1));
-    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,2,DLT_STRING("int"),DLT_INT(INT32_MIN));         /* (-2147483647-1) */
-    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,3,DLT_STRING("int8"),DLT_INT8(INT8_MIN));        /*          (-128) */
-    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,4,DLT_STRING("int16"),DLT_INT16(INT16_MIN));     /*      (-32767-1) */
-    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,5,DLT_STRING("int32"),DLT_INT32(INT32_MIN));     /* (-2147483647-1) */
-    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,6,DLT_STRING("int64"),DLT_INT64(INT64_MIN));     /* (-__INT64_C(9223372036854775807)-1) */
-    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,7,DLT_STRING("uint"),DLT_UINT(UINT32_MAX));      /*   (4294967295U) */
-    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,8,DLT_STRING("uint8"),DLT_UINT8(UINT8_MAX));     /*           (255) */
-    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,9,DLT_STRING("uint16"),DLT_UINT16(UINT16_MAX));  /*         (65535) */
-    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,10,DLT_STRING("uint32"),DLT_UINT32(UINT32_MAX));  /*   (4294967295U) */
-    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,11,DLT_STRING("uint64"),DLT_UINT64(UINT64_MAX));  /* (__UINT64_C(18446744073709551615)) */
-    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,12,DLT_STRING("float32"),DLT_FLOAT32(FLT_MIN),DLT_FLOAT32(FLT_MAX));
-    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,13,DLT_STRING("float64"),DLT_FLOAT64(DBL_MIN),DLT_FLOAT64(DBL_MAX));
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,1,DLT_STRING("string"),DLT_STRING("Hello world"));
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,2,DLT_STRING("utf8"),DLT_UTF8("Hello world"));
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,3,DLT_STRING("bool"),DLT_BOOL(1));
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,4,DLT_STRING("int"),DLT_INT(INT32_MIN));         /* (-2147483647-1) */
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,5,DLT_STRING("int8"),DLT_INT8(INT8_MIN));        /*          (-128) */
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,6,DLT_STRING("int16"),DLT_INT16(INT16_MIN));     /*      (-32767-1) */
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,7,DLT_STRING("int32"),DLT_INT32(INT32_MIN));     /* (-2147483647-1) */
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,8,DLT_STRING("int64"),DLT_INT64(INT64_MIN));     /* (-__INT64_C(9223372036854775807)-1) */
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,9,DLT_STRING("uint"),DLT_UINT(UINT32_MAX));      /*   (4294967295U) */
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,10,DLT_STRING("uint8"),DLT_UINT8(UINT8_MAX));     /*           (255) */
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,11,DLT_STRING("uint16"),DLT_UINT16(UINT16_MAX));  /*         (65535) */
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,12,DLT_STRING("uint32"),DLT_UINT32(UINT32_MAX));  /*   (4294967295U) */
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,13,DLT_STRING("uint64"),DLT_UINT64(UINT64_MAX));  /* (__UINT64_C(18446744073709551615)) */
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,14,DLT_STRING("float32"),DLT_FLOAT32(FLT_MIN),DLT_FLOAT32(FLT_MAX));
+    DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,15,DLT_STRING("float64"),DLT_FLOAT64(DBL_MIN),DLT_FLOAT64(DBL_MAX));
 
 
     for(num2=0;num2<10;num2++)