diff options
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/dlt-test-client.c | 2335 | ||||
| -rw-r--r-- | src/tests/dlt-test-filetransfer.c | 430 | ||||
| -rw-r--r-- | src/tests/dlt-test-fork-handler.c | 9 | ||||
| -rw-r--r-- | src/tests/dlt-test-init-free.c | 87 | ||||
| -rw-r--r-- | src/tests/dlt-test-multi-process-client.c | 193 | ||||
| -rw-r--r-- | src/tests/dlt-test-multi-process.c | 258 | ||||
| -rw-r--r-- | src/tests/dlt-test-stress-client.c | 277 | ||||
| -rw-r--r-- | src/tests/dlt-test-stress-user.c | 81 | ||||
| -rw-r--r-- | src/tests/dlt-test-stress.c | 143 | ||||
| -rw-r--r-- | src/tests/dlt-test-user.c | 845 |
10 files changed, 2110 insertions, 2548 deletions
diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c index cab327f..2cd39c5 100644 --- a/src/tests/dlt-test-client.c +++ b/src/tests/dlt-test-client.c @@ -64,8 +64,8 @@ * $LastChangedRevision: 1670 $ * $LastChangedDate: 2011-04-08 15:12:06 +0200 (Fr, 08. Apr 2011) $ * $LastChangedBy$ - Initials Date Comment - aw 13.01.2010 initial + * Initials Date Comment + * aw 13.01.2010 initial */ #include <ctype.h> /* for isprint() */ @@ -85,7 +85,7 @@ #define DLT_TESTCLIENT_NUM_TESTS 9 static int g_testsFailed = 0; -DltClient g_dltclient; +DltClient g_dltclient; /* Function prototypes */ int dlt_testclient_message_callback(DltMessage *message, void *data); @@ -127,7 +127,7 @@ void usage() { char version[255]; - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: dlt-test-client [options] hostname/serial_device_name\n"); printf("Test against received data from dlt-test-user.\n"); @@ -149,10 +149,10 @@ void usage() /** * Main function of tool. */ -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { DltTestclientData dltdata; - int c,i; + int c, i; int index; /* Initialize dltdata */ @@ -166,14 +166,13 @@ int main(int argc, char* argv[]) dltdata.fvalue = 0; dltdata.evalue = 0; dltdata.bvalue = 0; - dltdata.ohandle=-1; + dltdata.ohandle = -1; dltdata.running_test = 0; - for (i=0;i<DLT_TESTCLIENT_NUM_TESTS;i++) - { - dltdata.test_counter_macro[i]=0; - dltdata.test_counter_function[i]=0; + for (i = 0; i < DLT_TESTCLIENT_NUM_TESTS; i++) { + dltdata.test_counter_macro[i] = 0; + dltdata.test_counter_function[i] = 0; } dltdata.tests_passed = 0; @@ -185,9 +184,7 @@ int main(int argc, char* argv[]) opterr = 0; while ((c = getopt (argc, argv, "vashyxmf:o:e:b:")) != -1) - { - switch (c) - { + switch (c) { case 'v': { dltdata.vflag = 1; @@ -245,18 +242,13 @@ int main(int argc, char* argv[]) } case '?': { - if (optopt == 'o' || optopt == 'f' || optopt == 't') - { + if ((optopt == 'o') || (optopt == 'f') || (optopt == 't')) fprintf (stderr, "Option -%c requires an argument.\n", optopt); - } else if (isprint (optopt)) - { fprintf (stderr, "Unknown option `-%c'.\n", optopt); - } else - { - fprintf (stderr, "Unknown option character `\\x%x'.\n",optopt); - } + fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt); + /* unknown or wrong option used, show usage information and terminate */ usage(); return -1; @@ -264,10 +256,9 @@ int main(int argc, char* argv[]) default: { abort (); - return -1;//for parasoft + return -1;/*for parasoft */ } } - } /* Initialize DLT Client */ dlt_client_init(&g_dltclient, dltdata.vflag); @@ -278,108 +269,91 @@ int main(int argc, char* argv[]) /* Setup DLT Client structure */ g_dltclient.mode = dltdata.yflag; - if (g_dltclient.mode==0) - { + if (g_dltclient.mode == 0) { for (index = optind; index < argc; index++) - { - if(dlt_client_set_server_ip(&g_dltclient, argv[index]) == -1) - { - fprintf(stderr,"set server ip didn't succeed\n"); + if (dlt_client_set_server_ip(&g_dltclient, argv[index]) == -1) { + fprintf(stderr, "set server ip didn't succeed\n"); return -1; } - } - if (g_dltclient.servIP == 0) - { + + + if (g_dltclient.servIP == 0) { /* no hostname selected, show usage and terminate */ - fprintf(stderr,"ERROR: No hostname selected\n"); + fprintf(stderr, "ERROR: No hostname selected\n"); usage(); - dlt_client_cleanup(&g_dltclient,dltdata.vflag); + dlt_client_cleanup(&g_dltclient, dltdata.vflag); return -1; } } - else - { + else { for (index = optind; index < argc; index++) - { - if(dlt_client_set_serial_device(&g_dltclient, argv[index]) == -1) - { - fprintf(stderr,"set serial device didn't succeed\n"); + if (dlt_client_set_serial_device(&g_dltclient, argv[index]) == -1) { + fprintf(stderr, "set serial device didn't succeed\n"); return -1; } - } - if (g_dltclient.serialDevice == 0) - { + + + if (g_dltclient.serialDevice == 0) { /* no serial device name selected, show usage and terminate */ - fprintf(stderr,"ERROR: No serial device name specified\n"); + fprintf(stderr, "ERROR: No serial device name specified\n"); usage(); return -1; } - dlt_client_setbaudrate(&g_dltclient,dltdata.bvalue); + dlt_client_setbaudrate(&g_dltclient, dltdata.bvalue); } /* initialise structure to use DLT file */ - dlt_file_init(&(dltdata.file),dltdata.vflag); + dlt_file_init(&(dltdata.file), dltdata.vflag); /* first parse filter file if filter parameter is used */ - dlt_filter_init(&(dltdata.filter),dltdata.vflag); + dlt_filter_init(&(dltdata.filter), dltdata.vflag); - if (dltdata.fvalue) - { - if (dlt_filter_load(&(dltdata.filter),dltdata.fvalue,dltdata.vflag) < DLT_RETURN_OK) - { - dlt_file_free(&(dltdata.file),dltdata.vflag); + if (dltdata.fvalue) { + if (dlt_filter_load(&(dltdata.filter), dltdata.fvalue, dltdata.vflag) < DLT_RETURN_OK) { + dlt_file_free(&(dltdata.file), dltdata.vflag); return -1; } - dlt_file_set_filter(&(dltdata.file),&(dltdata.filter),dltdata.vflag); + dlt_file_set_filter(&(dltdata.file), &(dltdata.filter), dltdata.vflag); } /* open DLT output file */ - if (dltdata.ovalue) - { - dltdata.ohandle = open(dltdata.ovalue,O_WRONLY|O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); /* mode: wb */ + if (dltdata.ovalue) { + dltdata.ohandle = open(dltdata.ovalue, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); /* mode: wb */ - if (dltdata.ohandle == -1) - { - dlt_file_free(&(dltdata.file),dltdata.vflag); - fprintf(stderr,"ERROR: Output file %s cannot be opened!\n",dltdata.ovalue); + if (dltdata.ohandle == -1) { + dlt_file_free(&(dltdata.file), dltdata.vflag); + fprintf(stderr, "ERROR: Output file %s cannot be opened!\n", dltdata.ovalue); return -1; } } if (dltdata.evalue) - { - dlt_set_id(dltdata.ecuid,dltdata.evalue); - } + dlt_set_id(dltdata.ecuid, dltdata.evalue); else - { - dlt_set_id(dltdata.ecuid,DLT_TESTCLIENT_ECU_ID); - } + dlt_set_id(dltdata.ecuid, DLT_TESTCLIENT_ECU_ID); /* Connect to TCP socket or open serial device */ - if (dlt_client_connect(&g_dltclient, dltdata.vflag) != DLT_RETURN_ERROR) - { + if (dlt_client_connect(&g_dltclient, dltdata.vflag) != DLT_RETURN_ERROR) { dltdata.sock = g_dltclient.sock; /* Dlt Client Main Loop */ dlt_client_main_loop(&g_dltclient, &dltdata, dltdata.vflag); /* Dlt Client Cleanup */ - dlt_client_cleanup(&g_dltclient,dltdata.vflag); + dlt_client_cleanup(&g_dltclient, dltdata.vflag); } /* dlt-receive cleanup */ if (dltdata.ovalue) - { close(dltdata.ohandle); - } - dlt_file_free(&(dltdata.file),dltdata.vflag); + dlt_file_free(&(dltdata.file), dltdata.vflag); - dlt_filter_free(&(dltdata.filter),dltdata.vflag); + dlt_filter_free(&(dltdata.filter), dltdata.vflag); return g_testsFailed == 0 ? 0 : 1; } @@ -391,224 +365,188 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) DltTestclientData *dltdata; uint32_t type_info, type_info_tmp; - int16_t length,length_tmp; /* the macro can set this variable to -1 */ + int16_t length, length_tmp; /* the macro can set this variable to -1 */ uint32_t length_tmp32 = 0; uint8_t *ptr; int32_t datalength; - uint32_t id,id_tmp; + uint32_t id, id_tmp; int slen; int tc_old; struct iovec iov[2]; int bytes_written; - if ((message==0) || (data==0)) - { + if ((message == 0) || (data == 0)) return -1; - } - dltdata = (DltTestclientData*)data; + dltdata = (DltTestclientData *)data; /* prepare storage header */ if (DLT_IS_HTYP_WEID(message->standardheader->htyp)) - { - dlt_set_storageheader(message->storageheader,message->headerextra.ecu); - } + dlt_set_storageheader(message->storageheader, message->headerextra.ecu); else - { - dlt_set_storageheader(message->storageheader,dltdata->ecuid); - } + dlt_set_storageheader(message->storageheader, dltdata->ecuid); + + if ((dltdata->fvalue == 0) || + (dltdata->fvalue && + (dlt_message_filter_check(message, &(dltdata->filter), dltdata->vflag) == DLT_RETURN_TRUE))) { - if ((dltdata->fvalue==0) || (dltdata->fvalue && dlt_message_filter_check(message,&(dltdata->filter),dltdata->vflag) == DLT_RETURN_TRUE)) - { + dlt_message_header(message, text, sizeof(text), dltdata->vflag); - dlt_message_header(message,text,sizeof(text),dltdata->vflag); if (dltdata->aflag) - { - printf("%s ",text); - } - dlt_message_payload(message,text,sizeof(text),DLT_OUTPUT_ASCII,dltdata->vflag); + printf("%s ", text); + + dlt_message_payload(message, text, sizeof(text), DLT_OUTPUT_ASCII, dltdata->vflag); + if (dltdata->aflag) - { - printf("[%s]\n",text); - } + printf("[%s]\n", text); - if (strcmp(text,"Tests starting")==0) - { + if (strcmp(text, "Tests starting") == 0) printf("Tests starting\n"); - } /* check test 1m */ - if (strcmp(text,"Test1: (Macro IF) Test all log levels")==0) - { + if (strcmp(text, "Test1: (Macro IF) Test all log levels") == 0) { printf("Test1m: (Macro IF) Test all log levels\n"); dltdata->running_test = 1; dltdata->test_counter_macro[0] = 0; } - else if (strcmp(text,"Test1: (Macro IF) finished")==0) + else if (strcmp(text, "Test1: (Macro IF) finished") == 0) { /* >=4, as "info" is default log level */ - if (dltdata->test_counter_macro[0]>=4) - { + if (dltdata->test_counter_macro[0] >= 4) { printf("Test1m PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test1m FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==1) + else if (dltdata->running_test == 1) { - if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) - { - if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin))==DLT_TYPE_LOG) - { - mtin=DLT_GET_MSIN_MTIN(message->extendedheader->msin); + if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) { + if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_LOG) { + mtin = DLT_GET_MSIN_MTIN(message->extendedheader->msin); - if (mtin==DLT_LOG_FATAL) - { + if (mtin == DLT_LOG_FATAL) dltdata->test_counter_macro[0]++; - } - if (mtin==DLT_LOG_ERROR) - { + + if (mtin == DLT_LOG_ERROR) dltdata->test_counter_macro[0]++; - } - if (mtin==DLT_LOG_WARN) - { + + if (mtin == DLT_LOG_WARN) dltdata->test_counter_macro[0]++; - } - if (mtin==DLT_LOG_INFO) - { + + if (mtin == DLT_LOG_INFO) dltdata->test_counter_macro[0]++; - } - if (mtin==DLT_LOG_DEBUG) - { + + if (mtin == DLT_LOG_DEBUG) dltdata->test_counter_macro[0]++; - } - if (mtin==DLT_LOG_VERBOSE) - { + + if (mtin == DLT_LOG_VERBOSE) dltdata->test_counter_macro[0]++; - } } } } /* check test 2m */ - if (strcmp(text,"Test2: (Macro IF) Test all variable types (verbose)")==0) - { + if (strcmp(text, "Test2: (Macro IF) Test all variable types (verbose)") == 0) { printf("Test2m: (Macro IF) Test all variable types (verbose)\n"); dltdata->running_test = 2; dltdata->test_counter_macro[1] = 0; } - else if (strcmp(text,"Test2: (Macro IF) finished")==0) + else if (strcmp(text, "Test2: (Macro IF) finished") == 0) { - if (dltdata->test_counter_macro[1]==16) - { + if (dltdata->test_counter_macro[1] == 16) { printf("Test2m PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test2m FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==2) + else if (dltdata->running_test == 2) { /* Verbose */ - if (!(DLT_MSG_IS_NONVERBOSE(message))) - { - type_info=0; - type_info_tmp=0; - length=0; /* the macro can set this variable to -1 */ - length_tmp=0; + if (!(DLT_MSG_IS_NONVERBOSE(message))) { + type_info = 0; + type_info_tmp = 0; + length = 0; /* the macro can set this variable to -1 */ + length_tmp = 0; ptr = message->databuffer; datalength = message->datasize; /* Log message */ - if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin))==DLT_TYPE_LOG) - { - if (message->extendedheader->noar>=2) - { + if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_LOG) { + if (message->extendedheader->noar >= 2) { /* get type of first argument: must be string */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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_STRG) - { + if (type_info & DLT_TYPE_INFO_STRG) { /* skip string */ - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - if (length>=0) - { - ptr+=length; - datalength-=length; + if (length >= 0) { + ptr += length; + datalength -= length; /* read type of second argument: must be raw */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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_STRG) && ((type_info & DLT_TYPE_INFO_SCOD) == DLT_SCOD_ASCII)) - { - if (datalength==(sizeof(uint16_t)+strlen("Hello world")+1)) - { + 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)) + 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)) - { + 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)) - { + if (datalength == sizeof(uint8_t)) dltdata->test_counter_macro[1]++; - } } else if (type_info & DLT_TYPE_INFO_SINT) { - switch (type_info & DLT_TYPE_INFO_TYLE) - { + switch (type_info & DLT_TYPE_INFO_TYLE) { case DLT_TYLE_8BIT: { - if (datalength==sizeof(int8_t)) - { + if (datalength == sizeof(int8_t)) dltdata->test_counter_macro[1]++; - } + break; } case DLT_TYLE_16BIT: { - if (datalength==sizeof(int16_t)) - { + if (datalength == sizeof(int16_t)) dltdata->test_counter_macro[1]++; - } + break; } case DLT_TYLE_32BIT: { - if (datalength==sizeof(int32_t)) - { + if (datalength == sizeof(int32_t)) dltdata->test_counter_macro[1]++; - } + break; } case DLT_TYLE_64BIT: { - if (datalength==sizeof(int64_t)) - { + if (datalength == sizeof(int64_t)) dltdata->test_counter_macro[1]++; - } + break; } case DLT_TYLE_128BIT: @@ -620,38 +558,33 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } else if (type_info & DLT_TYPE_INFO_UINT) { - switch (type_info & DLT_TYPE_INFO_TYLE) - { + switch (type_info & DLT_TYPE_INFO_TYLE) { case DLT_TYLE_8BIT: { - if (datalength==sizeof(uint8_t)) - { + if (datalength == sizeof(uint8_t)) dltdata->test_counter_macro[1]++; - } + break; } case DLT_TYLE_16BIT: { - if (datalength==sizeof(uint16_t)) - { + if (datalength == sizeof(uint16_t)) dltdata->test_counter_macro[1]++; - } + break; } case DLT_TYLE_32BIT: { - if (datalength==sizeof(uint32_t)) - { + if (datalength == sizeof(uint32_t)) dltdata->test_counter_macro[1]++; - } + break; } case DLT_TYLE_64BIT: { - if (datalength==sizeof(uint64_t)) - { + if (datalength == sizeof(uint64_t)) dltdata->test_counter_macro[1]++; - } + break; } case DLT_TYLE_128BIT: @@ -663,8 +596,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } else if (type_info & DLT_TYPE_INFO_FLOA) { - switch (type_info & DLT_TYPE_INFO_TYLE) - { + switch (type_info & DLT_TYPE_INFO_TYLE) { case DLT_TYLE_8BIT: { /* Not tested here */ @@ -677,18 +609,16 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } case DLT_TYLE_32BIT: { - if (datalength==(2*sizeof(float)+sizeof(uint32_t))) - { + if (datalength == (2 * sizeof(float) + sizeof(uint32_t))) dltdata->test_counter_macro[1]++; - } + break; } case DLT_TYLE_64BIT: { - if (datalength==(2*sizeof(double)+sizeof(uint32_t))) - { + if (datalength == (2 * sizeof(double) + sizeof(uint32_t))) dltdata->test_counter_macro[1]++; - } + break; } case DLT_TYLE_128BIT: @@ -699,12 +629,11 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) else if (type_info & DLT_TYPE_INFO_RAWD) { /* Get length */ - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - if ((length==datalength) && (10 == length)) - { + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + + if ((length == datalength) && (10 == length)) dltdata->test_counter_macro[1]++; - } } } } @@ -714,313 +643,296 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } /* check test 3m */ - if (strcmp(text,"Test3: (Macro IF) Test all variable types (non-verbose)")==0) - { + if (strcmp(text, "Test3: (Macro IF) Test all variable types (non-verbose)") == 0) { printf("Test3m: (Macro IF) Test all variable types (non-verbose)\n"); dltdata->running_test = 3; - dltdata->test_counter_macro[2]=0; + dltdata->test_counter_macro[2] = 0; } - else if (strcmp(text,"Test3: (Macro IF) finished")==0) + else if (strcmp(text, "Test3: (Macro IF) finished") == 0) { - if (dltdata->test_counter_macro[2]==16) - { + if (dltdata->test_counter_macro[2] == 16) { printf("Test3m PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test3m FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==3) + else if (dltdata->running_test == 3) { /* Nonverbose */ - if (DLT_MSG_IS_NONVERBOSE(message)) - { - id=0; - id_tmp=0; + if (DLT_MSG_IS_NONVERBOSE(message)) { + id = 0; + id_tmp = 0; ptr = message->databuffer; datalength = message->datasize; - slen=-1; + slen = -1; - tc_old=dltdata->test_counter_macro[2]; + tc_old = dltdata->test_counter_macro[2]; /* Get message id */ - DLT_MSG_READ_VALUE(id_tmp,ptr,datalength,uint32_t); - id=DLT_ENDIAN_GET_32(message->standardheader->htyp, id_tmp); + DLT_MSG_READ_VALUE(id_tmp, ptr, datalength, uint32_t); + id = DLT_ENDIAN_GET_32(message->standardheader->htyp, id_tmp); /* Length of string */ - datalength-=sizeof(uint16_t); - ptr+=sizeof(uint16_t); + datalength -= sizeof(uint16_t); + ptr += sizeof(uint16_t); - switch (id) - { + switch (id) { case 1: { - slen=strlen("string")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(uint16_t)+strlen("Hello world")+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) - { + 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; - if (datalength==sizeof(uint8_t)) - { + slen = strlen("bool") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(uint8_t)) dltdata->test_counter_macro[2]++; - } + break; } case 4: { - slen=strlen("int")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(int)) - { + slen = strlen("int") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(int)) dltdata->test_counter_macro[2]++; - } + break; } case 5: { - slen=strlen("int8")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(int8_t)) - { + slen = strlen("int8") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(int8_t)) dltdata->test_counter_macro[2]++; - } + break; } case 6: { - slen=strlen("int16")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(int16_t)) - { + slen = strlen("int16") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(int16_t)) dltdata->test_counter_macro[2]++; - } + break; } case 7: { - slen=strlen("int32")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(int32_t)) - { + slen = strlen("int32") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(int32_t)) dltdata->test_counter_macro[2]++; - } + break; } case 8: { - slen=strlen("int64")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(int64_t)) - { + slen = strlen("int64") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(int64_t)) dltdata->test_counter_macro[2]++; - } + break; } case 9: { - slen=strlen("uint")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(unsigned int)) - { + slen = strlen("uint") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(unsigned int)) dltdata->test_counter_macro[2]++; - } + break; } case 10: { - slen=strlen("uint8")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(uint8_t)) - { + slen = strlen("uint8") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(uint8_t)) dltdata->test_counter_macro[2]++; - } + break; } case 11: { - slen=strlen("uint16")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(uint16_t)) - { + slen = strlen("uint16") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(uint16_t)) dltdata->test_counter_macro[2]++; - } + break; } case 12: { - slen=strlen("uint32")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(uint32_t)) - { + slen = strlen("uint32") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(uint32_t)) dltdata->test_counter_macro[2]++; - } + break; } case 13: { - slen=strlen("uint64")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(uint64_t)) - { + slen = strlen("uint64") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(uint64_t)) dltdata->test_counter_macro[2]++; - } + break; } case 14: { - slen=strlen("float32")+1; - datalength-=slen; - ptr+=slen; + slen = strlen("float32") + 1; + datalength -= slen; + ptr += slen; + /* 2*, as the min and the max is transfered */ - if (datalength==2*sizeof(float)) - { + if (datalength == 2 * sizeof(float)) dltdata->test_counter_macro[2]++; - } + break; } case 15: { - slen=strlen("float64")+1; - datalength-=slen; - ptr+=slen; + slen = strlen("float64") + 1; + datalength -= slen; + ptr += slen; + /* 2*, as the min and the max is transfered */ - if (datalength==2*sizeof(double)) - { + if (datalength == 2 * sizeof(double)) dltdata->test_counter_macro[2]++; - } + break; } case 16: { - slen=strlen("raw")+1; - datalength-=slen; - ptr+=slen; - datalength-=sizeof(uint16_t); - ptr+=sizeof(uint16_t); - if (datalength==10) - { + slen = strlen("raw") + 1; + datalength -= slen; + ptr += slen; + datalength -= sizeof(uint16_t); + ptr += sizeof(uint16_t); + + if (datalength == 10) dltdata->test_counter_macro[2]++; - } + break; } } - if ((slen>=0) && (tc_old==dltdata->test_counter_macro[2])) - { - printf("ID=%d, Datalength=%d => Failed!",id,datalength); - } + if ((slen >= 0) && (tc_old == dltdata->test_counter_macro[2])) + printf("ID=%d, Datalength=%d => Failed!", id, datalength); } } /* check test 4m */ - if (strcmp(text,"Test4: (Macro IF) Test different message sizes")==0) - { + if (strcmp(text, "Test4: (Macro IF) Test different message sizes") == 0) { printf("Test4m: (Macro IF) Test different message sizes\n"); dltdata->running_test = 4; - dltdata->test_counter_macro[3]=0; + dltdata->test_counter_macro[3] = 0; } - else if (strcmp(text,"Test4: (Macro IF) finished")==0) + else if (strcmp(text, "Test4: (Macro IF) finished") == 0) { - if (dltdata->test_counter_macro[3]==4) - { + if (dltdata->test_counter_macro[3] == 4) { printf("Test4m PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test4m FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==4) + else if (dltdata->running_test == 4) { /* Extended header */ - if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) - { + if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) { /* Log message */ - if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin))==DLT_TYPE_LOG) - { + if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_LOG) { /* Verbose */ - if (DLT_IS_MSIN_VERB(message->extendedheader->msin)) - { + if (DLT_IS_MSIN_VERB(message->extendedheader->msin)) { /* 2 arguments */ - if (message->extendedheader->noar==2) - { + if (message->extendedheader->noar == 2) { /* verbose mode */ - type_info=0; - type_info_tmp=0; - length=0; - length_tmp=0; /* the macro can set this variable to -1 */ + type_info = 0; + type_info_tmp = 0; + length = 0; + length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; /* first read the type info of the first argument: must be string */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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_STRG) - { + if (type_info & DLT_TYPE_INFO_STRG) { /* skip string */ - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - if (length>=0) - { - ptr+=length; - datalength-=length; + if (length >= 0) { + ptr += length; + datalength -= length; /* read type of second argument: must be raw */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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_RAWD) - { + if (type_info & DLT_TYPE_INFO_RAWD) { /* get length of raw data block */ - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - if ((length>=0) && (length==datalength)) - { - //printf("Raw data found in payload, length="); - //printf("%d, datalength=%d \n", length, datalength); + if ((length >= 0) && (length == datalength)) + /*printf("Raw data found in payload, length="); */ + /*printf("%d, datalength=%d \n", length, datalength); */ dltdata->test_counter_macro[3]++; - } } } } @@ -1031,209 +943,171 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } /* check test 5m */ - if (strcmp(text,"Test5: (Macro IF) Test high-level API")==0) - { + if (strcmp(text, "Test5: (Macro IF) Test high-level API") == 0) { printf("Test5m: (Macro IF) Test high-level API\n"); dltdata->running_test = 5; - dltdata->test_counter_macro[4]=0; + dltdata->test_counter_macro[4] = 0; } - else if (strcmp(text,"Test5: (Macro IF) finished")==0) + else if (strcmp(text, "Test5: (Macro IF) finished") == 0) { - if (dltdata->test_counter_macro[4]==12) - { + if (dltdata->test_counter_macro[4] == 12) { printf("Test5m PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test5m FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==5) + else if (dltdata->running_test == 5) { - if (strcmp(text,"Next line: DLT_LOG_INT")==0) - { + if (strcmp(text, "Next line: DLT_LOG_INT") == 0) dltdata->test_counter_macro[4]++; - } - if (strcmp(text,"-42")==0) - { + + if (strcmp(text, "-42") == 0) dltdata->test_counter_macro[4]++; - } - if (strcmp(text,"Next line: DLT_LOG_UINT")==0) - { + if (strcmp(text, "Next line: DLT_LOG_UINT") == 0) dltdata->test_counter_macro[4]++; - } - if (strcmp(text,"42")==0) - { + + if (strcmp(text, "42") == 0) dltdata->test_counter_macro[4]++; - } - if (strcmp(text,"Next line: DLT_LOG_STRING")==0) - { + if (strcmp(text, "Next line: DLT_LOG_STRING") == 0) dltdata->test_counter_macro[4]++; - } - if (strcmp(text,"String output")==0) - { + + if (strcmp(text, "String output") == 0) dltdata->test_counter_macro[4]++; - } - if (strcmp(text,"Next line: DLT_LOG_RAW")==0) - { + if (strcmp(text, "Next line: DLT_LOG_RAW") == 0) dltdata->test_counter_macro[4]++; - } - if (strcmp(text,"00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f")==0) - { + + if (strcmp(text, "00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f") == 0) dltdata->test_counter_macro[4]++; - } - if (strcmp(text,"Next line: DLT_LOG_STRING_INT")==0) - { + if (strcmp(text, "Next line: DLT_LOG_STRING_INT") == 0) dltdata->test_counter_macro[4]++; - } - if (strcmp(text,"String output: -42")==0) - { + + if (strcmp(text, "String output: -42") == 0) dltdata->test_counter_macro[4]++; - } - if (strcmp(text,"Next line: DLT_LOG_STRING_UINT")==0) - { + if (strcmp(text, "Next line: DLT_LOG_STRING_UINT") == 0) dltdata->test_counter_macro[4]++; - } - if (strcmp(text,"String output: 42")==0) - { + + if (strcmp(text, "String output: 42") == 0) dltdata->test_counter_macro[4]++; - } } /* check test 6m */ - if (strcmp(text,"Test 6: (Macro IF) Test local printing")==0) - { + if (strcmp(text, "Test 6: (Macro IF) Test local printing") == 0) { printf("Test6m: (Macro IF) Test local printing\n"); dltdata->running_test = 6; - dltdata->test_counter_macro[5]=0; + dltdata->test_counter_macro[5] = 0; } - else if (strcmp(text,"Test6: (Macro IF) finished")==0) + else if (strcmp(text, "Test6: (Macro IF) finished") == 0) { - if (dltdata->test_counter_macro[5]==2) - { + if (dltdata->test_counter_macro[5] == 2) { printf("Test6m PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test6m FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==6) + else if (dltdata->running_test == 6) { - if (strcmp(text,"Message (visible: locally printed)")==0) - { + if (strcmp(text, "Message (visible: locally printed)") == 0) { printf("Message (visible: locally printed)\n"); dltdata->test_counter_macro[5]++; } - if (strcmp(text,"Message (invisible: not locally printed)")==0) - { + + if (strcmp(text, "Message (invisible: not locally printed)") == 0) { printf("Message (invisible: not locally printed)\n"); dltdata->test_counter_macro[5]++; } } /* check test 7m */ - if (strcmp(text,"Test 7: (Macro IF) Test network trace")==0) - { + if (strcmp(text, "Test 7: (Macro IF) Test network trace") == 0) { printf("Test7m: (Macro IF) Test network trace\n"); dltdata->running_test = 7; - dltdata->test_counter_macro[6]=0; + dltdata->test_counter_macro[6] = 0; } - else if (strcmp(text,"Test7: (Macro IF) finished")==0) + else if (strcmp(text, "Test7: (Macro IF) finished") == 0) { - if (dltdata->test_counter_macro[6]==8) - { + if (dltdata->test_counter_macro[6] == 8) { printf("Test7m PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test7m FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==7) + else if (dltdata->running_test == 7) { - if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) - { - if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin))==DLT_TYPE_NW_TRACE) - { + if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) { + if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_NW_TRACE) { /* Check message type information*/ /* Each correct message type increases the counter by 1 */ - mtin=DLT_GET_MSIN_MTIN(message->extendedheader->msin); + mtin = DLT_GET_MSIN_MTIN(message->extendedheader->msin); - if (mtin==DLT_NW_TRACE_IPC) - { + if (mtin == DLT_NW_TRACE_IPC) dltdata->test_counter_macro[6]++; - } - if (mtin==DLT_NW_TRACE_CAN) - { + + if (mtin == DLT_NW_TRACE_CAN) dltdata->test_counter_macro[6]++; - } - if (mtin==DLT_NW_TRACE_FLEXRAY) - { + + if (mtin == DLT_NW_TRACE_FLEXRAY) dltdata->test_counter_macro[6]++; - } - if (mtin==DLT_NW_TRACE_MOST) - { + + if (mtin == DLT_NW_TRACE_MOST) dltdata->test_counter_macro[6]++; - } /* Check payload, must be two arguments (2 raw data blocks) */ /* If the payload is correct, the counter is increased by 1 */ - if (message->extendedheader->noar==2) - { + if (message->extendedheader->noar == 2) { /* verbose mode */ - type_info=0; - type_info_tmp=0; - length=0,length_tmp=0; /* the macro can set this variable to -1 */ + type_info = 0; + type_info_tmp = 0; + length = 0, length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; /* first read the type info of the first argument: must be string */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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_RAWD) - { + if (type_info & DLT_TYPE_INFO_RAWD) { /* skip string */ - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - if (length>=0) - { - ptr+=length; - datalength-=length; + if (length >= 0) { + ptr += length; + datalength -= length; /* read type of second argument: must be raw */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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_RAWD) - { + if (type_info & DLT_TYPE_INFO_RAWD) { /* get length of raw data block */ - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - if ((length>=0) && (length==datalength)) - { - //printf("Raw data found in payload, length="); - //printf("%d, datalength=%d \n", length, datalength); + if ((length >= 0) && (length == datalength)) + /*printf("Raw data found in payload, length="); */ + /*printf("%d, datalength=%d \n", length, datalength); */ dltdata->test_counter_macro[6]++; - } } } } @@ -1243,116 +1117,100 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } /* check test 8m */ - if (strcmp(text,"Test 8: (Macro IF) Test truncated network trace")==0) - { + if (strcmp(text, "Test 8: (Macro IF) Test truncated network trace") == 0) { printf("Test8m: (Macro IF) Test truncated network trace\n"); dltdata->running_test = 8; - dltdata->test_counter_macro[7]=0; + dltdata->test_counter_macro[7] = 0; } - else if (strcmp(text,"Test8: (Macro IF) finished")==0) + else if (strcmp(text, "Test8: (Macro IF) finished") == 0) { - if (dltdata->test_counter_macro[7]==20) - { + if (dltdata->test_counter_macro[7] == 20) { printf("Test8m PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test8m FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==8) + else if (dltdata->running_test == 8) { - if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) - { - if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin))==DLT_TYPE_NW_TRACE) - { + if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) { + if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_NW_TRACE) { /* Check message type information*/ /* Each correct message type increases the counter by 1 */ - mtin=DLT_GET_MSIN_MTIN(message->extendedheader->msin); + mtin = DLT_GET_MSIN_MTIN(message->extendedheader->msin); - if (mtin==DLT_NW_TRACE_IPC) - { + if (mtin == DLT_NW_TRACE_IPC) dltdata->test_counter_macro[7]++; - } - if (mtin==DLT_NW_TRACE_CAN) - { + + if (mtin == DLT_NW_TRACE_CAN) dltdata->test_counter_macro[7]++; - } - if (mtin==DLT_NW_TRACE_FLEXRAY) - { + + if (mtin == DLT_NW_TRACE_FLEXRAY) dltdata->test_counter_macro[7]++; - } - if (mtin==DLT_NW_TRACE_MOST) - { + + if (mtin == DLT_NW_TRACE_MOST) dltdata->test_counter_macro[7]++; - } /* Check payload, must be two arguments (2 raw data blocks) */ /* If the payload is correct, the counter is increased by 1 */ - if (message->extendedheader->noar==4) - { - type_info=0; - type_info_tmp=0; - length=0,length_tmp=0; /* the macro can set this variable to -1 */ + if (message->extendedheader->noar == 4) { + type_info = 0; + type_info_tmp = 0; + length = 0, length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; - 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_STRG) - { - // Read NWTR + 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_STRG) { + /* Read NWTR */ char chdr[10]; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); DLT_MSG_READ_STRING(chdr, ptr, datalength, length); - if(strcmp((char *)chdr, "NWTR")==0) - { + if (strcmp((char *)chdr, "NWTR") == 0) dltdata->test_counter_macro[7]++; - } - 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_RAWD) - { + 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_RAWD) { char hdr[2048]; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); DLT_MSG_READ_STRING(hdr, ptr, datalength, length); - if(length == 16 && hdr[15] == 15) - { + if ((length == 16) && (hdr[15] == 15)) dltdata->test_counter_macro[7]++; - } - 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_UINT) - { + 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_UINT) { uint32_t orig_size; - DLT_MSG_READ_VALUE(length_tmp32,ptr,datalength,uint32_t); - orig_size=DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); - if(orig_size == 1024*5) - { + DLT_MSG_READ_VALUE(length_tmp32, ptr, datalength, uint32_t); + orig_size = DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); + + if (orig_size == 1024 * 5) dltdata->test_counter_macro[7]++; - } - 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_RAWD) - { - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - // Size of the truncated message after headers - if(length == DLT_USER_BUF_MAX_SIZE - 41 - sizeof(uint16_t) - sizeof(uint32_t)) - { + 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_RAWD) { + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + + /* Size of the truncated message after headers */ + if (length == DLT_USER_BUF_MAX_SIZE - 41 - sizeof(uint16_t) - sizeof(uint32_t)) dltdata->test_counter_macro[7]++; - } } } } @@ -1362,154 +1220,135 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } } - /* check test 9m */ - if (strcmp(text,"Test 9: (Macro IF) Test segmented network trace")==0) - { + if (strcmp(text, "Test 9: (Macro IF) Test segmented network trace") == 0) { printf("Test9m: (Macro IF) Test segmented network trace\n"); dltdata->running_test = 9; - dltdata->test_counter_macro[8]=0; + dltdata->test_counter_macro[8] = 0; } - else if (strcmp(text,"Test9: (Macro IF) finished")==0) + else if (strcmp(text, "Test9: (Macro IF) finished") == 0) { /* (Interface types) * (results per packet)*/ - if (dltdata->test_counter_macro[8]==4*35) - { + if (dltdata->test_counter_macro[8] == 4 * 35) { printf("Test9m PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test9m FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==9) + else if (dltdata->running_test == 9) { - if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) - { - if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin))==DLT_TYPE_NW_TRACE) - { + if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) { + if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_NW_TRACE) { /* Check message type information*/ /* Each correct message type increases the counter by 1 */ - mtin=DLT_GET_MSIN_MTIN(message->extendedheader->msin); + mtin = DLT_GET_MSIN_MTIN(message->extendedheader->msin); - if (mtin==DLT_NW_TRACE_IPC) - { + if (mtin == DLT_NW_TRACE_IPC) dltdata->test_counter_macro[8]++; - } - if (mtin==DLT_NW_TRACE_CAN) - { + + if (mtin == DLT_NW_TRACE_CAN) dltdata->test_counter_macro[8]++; - } - if (mtin==DLT_NW_TRACE_FLEXRAY) - { + + if (mtin == DLT_NW_TRACE_FLEXRAY) dltdata->test_counter_macro[8]++; - } - if (mtin==DLT_NW_TRACE_MOST) - { + + if (mtin == DLT_NW_TRACE_MOST) dltdata->test_counter_macro[8]++; - } /* Payload for first segmented message */ - if (message->extendedheader->noar==6) - { + if (message->extendedheader->noar == 6) { /* verbose mode */ - type_info=0; - type_info_tmp=0; - length=0,length_tmp=0; /* the macro can set this variable to -1 */ + type_info = 0; + type_info_tmp = 0; + length = 0, length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; /* NWST */ - 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_STRG) - { + 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_STRG) { char chdr[10]; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); DLT_MSG_READ_STRING(chdr, ptr, datalength, length); - if(strcmp((char *)chdr, "NWST")==0) - { + + if (strcmp((char *)chdr, "NWST") == 0) dltdata->test_counter_macro[8]++; - } /* Streahandle */ - 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_UINT) - { + 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_UINT) { uint32_t handle; - DLT_MSG_READ_VALUE(length_tmp32,ptr,datalength,uint32_t); - handle=DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); - if(handle > 0) - { + DLT_MSG_READ_VALUE(length_tmp32, ptr, datalength, uint32_t); + handle = DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); + + if (handle > 0) dltdata->test_counter_macro[8]++; - } /* Header */ - 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_RAWD) - { - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t); + type_info = DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); - // Test packet header size 16 - if(length == 16) - { + if (type_info & DLT_TYPE_INFO_RAWD) { + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + + /* Test packet header size 16 */ + if (length == 16) dltdata->test_counter_macro[8]++; - } + /* Skip data */ - ptr+=length; - datalength-=length; + ptr += length; + datalength -= length; /* Payload size */ - 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_UINT) - { + 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_UINT) { uint32_t pl_sz; - DLT_MSG_READ_VALUE(length_tmp32,ptr,datalength,uint32_t); - pl_sz=DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); + DLT_MSG_READ_VALUE(length_tmp32, ptr, datalength, uint32_t); + pl_sz = DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); - // Test packet payload size. - if(pl_sz == 5120) - { + /* Test packet payload size. */ + if (pl_sz == 5120) dltdata->test_counter_macro[8]++; - } /* Segmentcount */ - 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_UINT) - { + 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_UINT) { uint16_t scount; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - scount=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + scount = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); /* Test packet segment count 5 */ - if(scount == 5) - { + if (scount == 5) dltdata->test_counter_macro[8]++; - } /* Segment length */ - 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_UINT) - { + 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_UINT) { uint16_t slen; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - slen=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + slen = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + /* Default segment size 1024 */ - if(slen == 1024) - { + if (slen == 1024) dltdata->test_counter_macro[8]++; - } } } } @@ -1518,108 +1357,102 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } } /* Data segment */ - else if (message->extendedheader->noar==4) + else if (message->extendedheader->noar == 4) { /* verbose mode */ - type_info=0; - type_info_tmp=0; - length=0,length_tmp=0; /* the macro can set this variable to -1 */ + type_info = 0; + type_info_tmp = 0; + length = 0, length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; /* NWCH */ - 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_STRG) - { + 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_STRG) { char chdr[10]; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); DLT_MSG_READ_STRING(chdr, ptr, datalength, length); - if(strcmp((char *)chdr, "NWCH")==0) - { + + if (strcmp((char *)chdr, "NWCH") == 0) dltdata->test_counter_macro[8]++; - } /* handle */ - 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_UINT) - { + 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_UINT) { uint32_t handle; - DLT_MSG_READ_VALUE(length_tmp32,ptr,datalength,uint32_t); - handle=DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); - if(handle > 0) - { + DLT_MSG_READ_VALUE(length_tmp32, ptr, datalength, uint32_t); + handle = DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); + + if (handle > 0) dltdata->test_counter_macro[8]++; - } /* Sequence */ - 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_UINT) - { - //uint16_t seq; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - //seq=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - dltdata->test_counter_macro[8]++; + 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_UINT) { + /*uint16_t seq; */ + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + /*seq=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); */ + dltdata->test_counter_macro[8]++; /* 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_RAWD) - { - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t); + type_info = DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); - // Segment size by default, 1024 - if(length == 1024) - { + if (type_info & DLT_TYPE_INFO_RAWD) { + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + + /* Segment size by default, 1024 */ + if (length == 1024) dltdata->test_counter_macro[8]++; - } } } } } } /* End segment */ - else if (message->extendedheader->noar==2) + else if (message->extendedheader->noar == 2) { /* verbose mode */ - type_info=0; - type_info_tmp=0; - length=0,length_tmp=0; /* the macro can set this variable to -1 */ + type_info = 0; + type_info_tmp = 0; + length = 0, length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; /* NWEN */ - 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_STRG) - { + 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_STRG) { char chdr[10]; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); DLT_MSG_READ_STRING(chdr, ptr, datalength, length); - if(strcmp((char *)chdr, "NWEN")==0) - { + + if (strcmp((char *)chdr, "NWEN") == 0) dltdata->test_counter_macro[8]++; - } /* handle */ - 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_UINT) - { + 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_UINT) { uint32_t handle; - DLT_MSG_READ_VALUE(length_tmp32,ptr,datalength,uint32_t); - handle=DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); - if(handle > 0) - { + DLT_MSG_READ_VALUE(length_tmp32, ptr, datalength, uint32_t); + handle = DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); + + if (handle > 0) dltdata->test_counter_macro[8]++; - } } } } @@ -1628,161 +1461,135 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } /* check test 1f */ - if (strcmp(text,"Test1: (Function IF) Test all log levels")==0) - { + if (strcmp(text, "Test1: (Function IF) Test all log levels") == 0) { printf("Test1f: (Function IF) Test all log levels\n"); dltdata->running_test = 10; dltdata->test_counter_function[0] = 0; } - else if (strcmp(text,"Test1: (Function IF) finished")==0) + else if (strcmp(text, "Test1: (Function IF) finished") == 0) { /* >=4, as "info" is default log level */ - if (dltdata->test_counter_function[0]>=4) - { + if (dltdata->test_counter_function[0] >= 4) { printf("Test1f PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test1f FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==10) + else if (dltdata->running_test == 10) { - if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) - { - if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin))==DLT_TYPE_LOG) - { - mtin=DLT_GET_MSIN_MTIN(message->extendedheader->msin); + if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) { + if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_LOG) { + mtin = DLT_GET_MSIN_MTIN(message->extendedheader->msin); - if (mtin==DLT_LOG_FATAL) - { + if (mtin == DLT_LOG_FATAL) dltdata->test_counter_function[0]++; - } - if (mtin==DLT_LOG_ERROR) - { + + if (mtin == DLT_LOG_ERROR) dltdata->test_counter_function[0]++; - } - if (mtin==DLT_LOG_WARN) - { + + if (mtin == DLT_LOG_WARN) dltdata->test_counter_function[0]++; - } - if (mtin==DLT_LOG_INFO) - { + + if (mtin == DLT_LOG_INFO) dltdata->test_counter_function[0]++; - } - if (mtin==DLT_LOG_DEBUG) - { + + if (mtin == DLT_LOG_DEBUG) dltdata->test_counter_function[0]++; - } - if (mtin==DLT_LOG_VERBOSE) - { + + if (mtin == DLT_LOG_VERBOSE) dltdata->test_counter_function[0]++; - } } } } /* check test 2f */ - if (strcmp(text,"Test2: (Function IF) Test all variable types (verbose)")==0) - { + if (strcmp(text, "Test2: (Function IF) Test all variable types (verbose)") == 0) { printf("Test2f: (Function IF) Test all variable types (verbose)\n"); dltdata->running_test = 11; dltdata->test_counter_function[1] = 0; } - else if (strcmp(text,"Test2: (Function IF) finished")==0) + else if (strcmp(text, "Test2: (Function IF) finished") == 0) { - if (dltdata->test_counter_function[1]==14) - { + if (dltdata->test_counter_function[1] == 14) { printf("Test2f PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test2f FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==11) + else if (dltdata->running_test == 11) { /* Verbose */ - if (!(DLT_MSG_IS_NONVERBOSE(message))) - { - type_info=0; - type_info_tmp=0; - length=0; - length_tmp=0; /* the macro can set this variable to -1 */ + if (!(DLT_MSG_IS_NONVERBOSE(message))) { + type_info = 0; + type_info_tmp = 0; + length = 0; + length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; /* Log message */ - if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin))==DLT_TYPE_LOG) - { - if (message->extendedheader->noar>=2) - { + if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_LOG) { + if (message->extendedheader->noar >= 2) { /* get type of first argument: must be string */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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_STRG) - { + if (type_info & DLT_TYPE_INFO_STRG) { /* skip string */ - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - if (length>=0) - { - ptr+=length; - datalength-=length; + if (length >= 0) { + ptr += length; + datalength -= length; /* read type of second argument: must be raw */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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 (datalength==sizeof(uint8_t)) - { + if (type_info & DLT_TYPE_INFO_BOOL) { + if (datalength == sizeof(uint8_t)) dltdata->test_counter_function[1]++; - } } else if (type_info & DLT_TYPE_INFO_SINT) { - switch (type_info & DLT_TYPE_INFO_TYLE) - { + switch (type_info & DLT_TYPE_INFO_TYLE) { case DLT_TYLE_8BIT: { - if (datalength==sizeof(int8_t)) - { + if (datalength == sizeof(int8_t)) dltdata->test_counter_function[1]++; - } + break; } case DLT_TYLE_16BIT: { - if (datalength==sizeof(int16_t)) - { + if (datalength == sizeof(int16_t)) dltdata->test_counter_function[1]++; - } + break; } case DLT_TYLE_32BIT: { - if (datalength==sizeof(int32_t)) - { + if (datalength == sizeof(int32_t)) dltdata->test_counter_function[1]++; - } + break; } case DLT_TYLE_64BIT: { - if (datalength==sizeof(int64_t)) - { + if (datalength == sizeof(int64_t)) dltdata->test_counter_function[1]++; - } + break; } case DLT_TYLE_128BIT: @@ -1794,38 +1601,33 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } else if (type_info & DLT_TYPE_INFO_UINT) { - switch (type_info & DLT_TYPE_INFO_TYLE) - { + switch (type_info & DLT_TYPE_INFO_TYLE) { case DLT_TYLE_8BIT: { - if (datalength==sizeof(uint8_t)) - { + if (datalength == sizeof(uint8_t)) dltdata->test_counter_function[1]++; - } + break; } case DLT_TYLE_16BIT: { - if (datalength==sizeof(uint16_t)) - { + if (datalength == sizeof(uint16_t)) dltdata->test_counter_function[1]++; - } + break; } case DLT_TYLE_32BIT: { - if (datalength==sizeof(uint32_t)) - { + if (datalength == sizeof(uint32_t)) dltdata->test_counter_function[1]++; - } + break; } case DLT_TYLE_64BIT: { - if (datalength==sizeof(uint64_t)) - { + if (datalength == sizeof(uint64_t)) dltdata->test_counter_function[1]++; - } + break; } case DLT_TYLE_128BIT: @@ -1837,8 +1639,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } else if (type_info & DLT_TYPE_INFO_FLOA) { - switch (type_info & DLT_TYPE_INFO_TYLE) - { + switch (type_info & DLT_TYPE_INFO_TYLE) { case DLT_TYLE_8BIT: { /* Not tested here */ @@ -1851,18 +1652,16 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } case DLT_TYLE_32BIT: { - if (datalength==(2*sizeof(float)+sizeof(uint32_t))) - { + if (datalength == (2 * sizeof(float) + sizeof(uint32_t))) dltdata->test_counter_function[1]++; - } + break; } case DLT_TYLE_64BIT: { - if (datalength==(2*sizeof(double)+sizeof(uint32_t))) - { + if (datalength == (2 * sizeof(double) + sizeof(uint32_t))) dltdata->test_counter_function[1]++; - } + break; } case DLT_TYLE_128BIT: @@ -1875,12 +1674,11 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) else if (type_info & DLT_TYPE_INFO_RAWD) { /* Get length */ - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - if ((length==datalength) && (length==10)) - { + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + + if ((length == datalength) && (length == 10)) dltdata->test_counter_function[1]++; - } } } } @@ -1890,291 +1688,274 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } /* check test 3f */ - if (strcmp(text,"Test3: (Function IF) Test all variable types (non-verbose)")==0) - { + if (strcmp(text, "Test3: (Function IF) Test all variable types (non-verbose)") == 0) { printf("Test3f: (Function IF) Test all variable types (non-verbose)\n"); dltdata->running_test = 12; - dltdata->test_counter_function[2]=0; + dltdata->test_counter_function[2] = 0; } - else if (strcmp(text,"Test3: (Function IF) finished")==0) + else if (strcmp(text, "Test3: (Function IF) finished") == 0) { - if (dltdata->test_counter_function[2]==14) - { + if (dltdata->test_counter_function[2] == 14) { printf("Test3f PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test3f FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==12) + else if (dltdata->running_test == 12) { /* Nonverbose */ - if (DLT_MSG_IS_NONVERBOSE(message)) - { - id=0; - id_tmp=0; + if (DLT_MSG_IS_NONVERBOSE(message)) { + id = 0; + id_tmp = 0; ptr = message->databuffer; datalength = message->datasize; - slen=-1; + slen = -1; - tc_old=dltdata->test_counter_function[2]; + tc_old = dltdata->test_counter_function[2]; /* Get message id */ - DLT_MSG_READ_VALUE(id_tmp,ptr,datalength,uint32_t); - id=DLT_ENDIAN_GET_32(message->standardheader->htyp, id_tmp); + DLT_MSG_READ_VALUE(id_tmp, ptr, datalength, uint32_t); + id = DLT_ENDIAN_GET_32(message->standardheader->htyp, id_tmp); /* Length of string */ - datalength-=sizeof(uint16_t); - ptr+=sizeof(uint16_t); + datalength -= sizeof(uint16_t); + ptr += sizeof(uint16_t); - switch (id) - { + switch (id) { case 1: { - slen=strlen("bool")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(uint8_t)) - { + slen = strlen("bool") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(uint8_t)) dltdata->test_counter_function[2]++; - } + break; } case 2: { - slen=strlen("int")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(int)) - { + slen = strlen("int") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(int)) dltdata->test_counter_function[2]++; - } + break; } case 3: { - slen=strlen("int8")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(int8_t)) - { + slen = strlen("int8") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(int8_t)) dltdata->test_counter_function[2]++; - } + break; } case 4: { - slen=strlen("int16")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(int16_t)) - { + slen = strlen("int16") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(int16_t)) dltdata->test_counter_function[2]++; - } + break; } case 5: { - slen=strlen("int32")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(int32_t)) - { + slen = strlen("int32") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(int32_t)) dltdata->test_counter_function[2]++; - } + break; } case 6: { - slen=strlen("int64")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(int64_t)) - { + slen = strlen("int64") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(int64_t)) dltdata->test_counter_function[2]++; - } + break; } case 7: { - slen=strlen("uint")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(unsigned int)) - { + slen = strlen("uint") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(unsigned int)) dltdata->test_counter_function[2]++; - } + break; } case 8: { - slen=strlen("uint8")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(uint8_t)) - { + slen = strlen("uint8") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(uint8_t)) dltdata->test_counter_function[2]++; - } + break; } case 9: { - slen=strlen("uint16")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(uint16_t)) - { + slen = strlen("uint16") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(uint16_t)) dltdata->test_counter_function[2]++; - } + break; } case 10: { - slen=strlen("uint32")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(uint32_t)) - { + slen = strlen("uint32") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(uint32_t)) dltdata->test_counter_function[2]++; - } + break; } case 11: { - slen=strlen("uint64")+1; - datalength-=slen; - ptr+=slen; - if (datalength==sizeof(uint64_t)) - { + slen = strlen("uint64") + 1; + datalength -= slen; + ptr += slen; + + if (datalength == sizeof(uint64_t)) dltdata->test_counter_function[2]++; - } + break; } case 12: { - slen=strlen("float32")+1; - datalength-=slen; - ptr+=slen; + slen = strlen("float32") + 1; + datalength -= slen; + ptr += slen; + /* 2*, as the min and the max is transfered */ - if (datalength==2*sizeof(float)) - { + if (datalength == 2 * sizeof(float)) dltdata->test_counter_function[2]++; - } + break; } case 13: { - slen=strlen("float64")+1; - datalength-=slen; - ptr+=slen; + slen = strlen("float64") + 1; + datalength -= slen; + ptr += slen; + /* 2*, as the min and the max is transfered */ - if (datalength==2*sizeof(double)) - { + if (datalength == 2 * sizeof(double)) dltdata->test_counter_function[2]++; - } + break; } case 14: { - slen=strlen("raw")+1; - datalength-=slen; - ptr+=slen; - datalength-=sizeof(uint16_t); - ptr+=sizeof(uint16_t); - if (datalength==10) - { + slen = strlen("raw") + 1; + datalength -= slen; + ptr += slen; + datalength -= sizeof(uint16_t); + ptr += sizeof(uint16_t); + + if (datalength == 10) dltdata->test_counter_function[2]++; - } + break; } } - if ((slen>=0) && (tc_old==dltdata->test_counter_function[2])) - { - printf("ID=%d, Datalength=%d => Failed!",id,datalength); - } + if ((slen >= 0) && (tc_old == dltdata->test_counter_function[2])) + printf("ID=%d, Datalength=%d => Failed!", id, datalength); } } /* check test 4f */ - if (strcmp(text,"Test4: (Function IF) Test different message sizes")==0) - { + if (strcmp(text, "Test4: (Function IF) Test different message sizes") == 0) { printf("Test4f: (Function IF) Test different message sizes\n"); dltdata->running_test = 13; - dltdata->test_counter_function[3]=0; + dltdata->test_counter_function[3] = 0; } - else if (strcmp(text,"Test4: (Function IF) finished")==0) + else if (strcmp(text, "Test4: (Function IF) finished") == 0) { - if (dltdata->test_counter_function[3]==4) - { + if (dltdata->test_counter_function[3] == 4) { printf("Test4f PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test4f FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==13) + else if (dltdata->running_test == 13) { /* Extended header */ - if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) - { + if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) { /* Log message */ - if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin))==DLT_TYPE_LOG) - { + if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_LOG) { /* Verbose */ - if (DLT_IS_MSIN_VERB(message->extendedheader->msin)) - { + if (DLT_IS_MSIN_VERB(message->extendedheader->msin)) { /* 2 arguments */ - if (message->extendedheader->noar==2) - { + if (message->extendedheader->noar == 2) { /* verbose mode */ - type_info=0; - type_info_tmp=0; - length=0; - length_tmp=0; /* the macro can set this variable to -1 */ + type_info = 0; + type_info_tmp = 0; + length = 0; + length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; /* first read the type info of the first argument: should be string */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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_STRG) - { + if (type_info & DLT_TYPE_INFO_STRG) { /* skip string */ - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - if (length>=0) - { - ptr+=length; - datalength-=length; + if (length >= 0) { + ptr += length; + datalength -= length; /* read type of second argument: should be raw */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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_RAWD) - { + if (type_info & DLT_TYPE_INFO_RAWD) { /* get length of raw data block */ - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - if ((length>=0) && (length==datalength)) - { - //printf("Raw data found in payload, length="); - //printf("%d, datalength=%d \n", length, datalength); + if ((length >= 0) && (length == datalength)) + /*printf("Raw data found in payload, length="); */ + /*printf("%d, datalength=%d \n", length, datalength); */ dltdata->test_counter_function[3]++; - } } } } @@ -2185,210 +1966,172 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } /* check test 5f */ - if (strcmp(text,"Test5: (Function IF) Test high-level API")==0) - { + if (strcmp(text, "Test5: (Function IF) Test high-level API") == 0) { printf("Test5f: (Function IF) Test high-level API\n"); dltdata->running_test = 14; - dltdata->test_counter_function[4]=0; + dltdata->test_counter_function[4] = 0; } - else if (strcmp(text,"Test5: (Function IF) finished")==0) + else if (strcmp(text, "Test5: (Function IF) finished") == 0) { - if (dltdata->test_counter_function[4]==12) - { + if (dltdata->test_counter_function[4] == 12) { printf("Test5f PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test5f FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==14) + else if (dltdata->running_test == 14) { - if (strcmp(text,"Next line: dlt_log_int()")==0) - { + if (strcmp(text, "Next line: dlt_log_int()") == 0) dltdata->test_counter_function[4]++; - } - if (strcmp(text,"-42")==0) - { + + if (strcmp(text, "-42") == 0) dltdata->test_counter_function[4]++; - } - if (strcmp(text,"Next line: dlt_log_uint()")==0) - { + if (strcmp(text, "Next line: dlt_log_uint()") == 0) dltdata->test_counter_function[4]++; - } - if (strcmp(text,"42")==0) - { + + if (strcmp(text, "42") == 0) dltdata->test_counter_function[4]++; - } - if (strcmp(text,"Next line: dlt_log_string()")==0) - { + if (strcmp(text, "Next line: dlt_log_string()") == 0) dltdata->test_counter_function[4]++; - } - if (strcmp(text,"String output")==0) - { + + if (strcmp(text, "String output") == 0) dltdata->test_counter_function[4]++; - } - if (strcmp(text,"Next line: dlt_log_raw()")==0) - { + if (strcmp(text, "Next line: dlt_log_raw()") == 0) dltdata->test_counter_function[4]++; - } - if (strcmp(text,"00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f")==0) - { + + if (strcmp(text, "00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f") == 0) dltdata->test_counter_function[4]++; - } - if (strcmp(text,"Next line: dlt_log_string_int()")==0) - { + if (strcmp(text, "Next line: dlt_log_string_int()") == 0) dltdata->test_counter_function[4]++; - } - if (strcmp(text,"String output: -42")==0) - { + + if (strcmp(text, "String output: -42") == 0) dltdata->test_counter_function[4]++; - } - if (strcmp(text,"Next line: dlt_log_string_uint()")==0) - { + if (strcmp(text, "Next line: dlt_log_string_uint()") == 0) dltdata->test_counter_function[4]++; - } - if (strcmp(text,"String output: 42")==0) - { + + if (strcmp(text, "String output: 42") == 0) dltdata->test_counter_function[4]++; - } } /* check test 6f */ - if (strcmp(text,"Test 6: (Function IF) Test local printing")==0) - { + if (strcmp(text, "Test 6: (Function IF) Test local printing") == 0) { printf("Test6f: (Function IF) Test local printing\n"); dltdata->running_test = 15; - dltdata->test_counter_function[5]=0; + dltdata->test_counter_function[5] = 0; } - else if (strcmp(text,"Test6: (Function IF) finished")==0) + else if (strcmp(text, "Test6: (Function IF) finished") == 0) { - if (dltdata->test_counter_function[5]==2) - { + if (dltdata->test_counter_function[5] == 2) { printf("Test6f PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test6f FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==15) + else if (dltdata->running_test == 15) { - if (strcmp(text,"Message (visible: locally printed)")==0) - { + if (strcmp(text, "Message (visible: locally printed)") == 0) { printf("Message (visible: locally printed)\n"); dltdata->test_counter_function[5]++; } - if (strcmp(text,"Message (invisible: not locally printed)")==0) - { + + if (strcmp(text, "Message (invisible: not locally printed)") == 0) { printf("Message (invisible: not locally printed)\n"); dltdata->test_counter_function[5]++; } } /* check test 7f */ - if (strcmp(text,"Test 7: (Function IF) Test network trace")==0) - { + if (strcmp(text, "Test 7: (Function IF) Test network trace") == 0) { printf("Test7f: (Function IF) Test network trace\n"); dltdata->running_test = 16; - dltdata->test_counter_function[6]=0; + dltdata->test_counter_function[6] = 0; } - else if (strcmp(text,"Test7: (Function IF) finished")==0) + else if (strcmp(text, "Test7: (Function IF) finished") == 0) { - if (dltdata->test_counter_function[6]==8) - { + if (dltdata->test_counter_function[6] == 8) { printf("Test7f PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test7f FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==16) + else if (dltdata->running_test == 16) { - if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) - { - if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin))==DLT_TYPE_NW_TRACE) - { + if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) { + if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_NW_TRACE) { /* Check message type information*/ /* Each correct message type increases the counter by 1 */ - mtin=DLT_GET_MSIN_MTIN(message->extendedheader->msin); + mtin = DLT_GET_MSIN_MTIN(message->extendedheader->msin); - if (mtin==DLT_NW_TRACE_IPC) - { + if (mtin == DLT_NW_TRACE_IPC) dltdata->test_counter_function[6]++; - } - if (mtin==DLT_NW_TRACE_CAN) - { + + if (mtin == DLT_NW_TRACE_CAN) dltdata->test_counter_function[6]++; - } - if (mtin==DLT_NW_TRACE_FLEXRAY) - { + + if (mtin == DLT_NW_TRACE_FLEXRAY) dltdata->test_counter_function[6]++; - } - if (mtin==DLT_NW_TRACE_MOST) - { + + if (mtin == DLT_NW_TRACE_MOST) dltdata->test_counter_function[6]++; - } /* Check payload, must be two arguments (2 raw data blocks) */ /* If the payload is correct, the counter is increased by 1 */ - if (message->extendedheader->noar==2) - { + if (message->extendedheader->noar == 2) { /* verbose mode */ - type_info=0; - type_info_tmp=0; - length=0; - length_tmp=0; /* the macro can set this variable to -1 */ + type_info = 0; + type_info_tmp = 0; + length = 0; + length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; /* first read the type info of the first argument: should be string */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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_RAWD) - { + if (type_info & DLT_TYPE_INFO_RAWD) { /* skip string */ - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - if (length>=0) - { - ptr+=length; - datalength-=length; + if (length >= 0) { + ptr += length; + datalength -= length; /* read type of second argument: should be raw */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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_RAWD) - { + if (type_info & DLT_TYPE_INFO_RAWD) { /* get length of raw data block */ - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - if ((length>=0) && (length==datalength)) - { - //printf("Raw data found in payload, length="); - //printf("%d, datalength=%d \n", length, datalength); + if ((length >= 0) && (length == datalength)) + /*printf("Raw data found in payload, length="); */ + /*printf("%d, datalength=%d \n", length, datalength); */ dltdata->test_counter_function[6]++; - } } } } @@ -2398,116 +2141,100 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } /* check test 8f */ - if (strcmp(text,"Test 8: (Function IF) Test truncated network trace")==0) - { + if (strcmp(text, "Test 8: (Function IF) Test truncated network trace") == 0) { printf("Test8f: (Function IF) Test truncated network trace\n"); dltdata->running_test = 17; - dltdata->test_counter_function[7]=0; + dltdata->test_counter_function[7] = 0; } - else if (strcmp(text,"Test8: (Function IF) finished")==0) + else if (strcmp(text, "Test8: (Function IF) finished") == 0) { - if (dltdata->test_counter_function[7]==20) - { + if (dltdata->test_counter_function[7] == 20) { printf("Test8f PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test8f FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==17) + else if (dltdata->running_test == 17) { - if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) - { - if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin))==DLT_TYPE_NW_TRACE) - { + if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) { + if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_NW_TRACE) { /* Check message type information*/ /* Each correct message type increases the counter by 1 */ - mtin=DLT_GET_MSIN_MTIN(message->extendedheader->msin); + mtin = DLT_GET_MSIN_MTIN(message->extendedheader->msin); - if (mtin==DLT_NW_TRACE_IPC) - { + if (mtin == DLT_NW_TRACE_IPC) dltdata->test_counter_function[7]++; - } - if (mtin==DLT_NW_TRACE_CAN) - { + + if (mtin == DLT_NW_TRACE_CAN) dltdata->test_counter_function[7]++; - } - if (mtin==DLT_NW_TRACE_FLEXRAY) - { + + if (mtin == DLT_NW_TRACE_FLEXRAY) dltdata->test_counter_function[7]++; - } - if (mtin==DLT_NW_TRACE_MOST) - { + + if (mtin == DLT_NW_TRACE_MOST) dltdata->test_counter_function[7]++; - } /* Check payload, must be two arguments (2 raw data blocks) */ /* If the payload is correct, the counter is increased by 1 */ - if (message->extendedheader->noar==4) - { - type_info=0; - type_info_tmp=0; - length=0,length_tmp=0; /* the macro can set this variable to -1 */ + if (message->extendedheader->noar == 4) { + type_info = 0; + type_info_tmp = 0; + length = 0, length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; - 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_STRG) - { - // Read NWTR + 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_STRG) { + /* Read NWTR */ char chdr[10]; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); DLT_MSG_READ_STRING(chdr, ptr, datalength, length); - if(strcmp((char *)chdr, "NWTR")==0) - { + if (strcmp((char *)chdr, "NWTR") == 0) dltdata->test_counter_function[7]++; - } - 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_RAWD) - { + 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_RAWD) { char hdr[2048]; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); DLT_MSG_READ_STRING(hdr, ptr, datalength, length); - if(length == 16 && hdr[15] == 15) - { + if ((length == 16) && (hdr[15] == 15)) dltdata->test_counter_function[7]++; - } - 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_UINT) - { + 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_UINT) { uint32_t orig_size; - DLT_MSG_READ_VALUE(length_tmp32,ptr,datalength,uint32_t); - orig_size=DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); - if(orig_size == 1024*5) - { + DLT_MSG_READ_VALUE(length_tmp32, ptr, datalength, uint32_t); + orig_size = DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); + + if (orig_size == 1024 * 5) dltdata->test_counter_function[7]++; - } - 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_RAWD) - { - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - // Size of the truncated message after headers - if(length == DLT_USER_BUF_MAX_SIZE - 41 - sizeof(uint16_t) - sizeof(uint32_t)) - { + 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_RAWD) { + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + + /* Size of the truncated message after headers */ + if (length == DLT_USER_BUF_MAX_SIZE - 41 - sizeof(uint16_t) - sizeof(uint32_t)) dltdata->test_counter_function[7]++; - } } } } @@ -2518,152 +2245,134 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } /* check test 9f */ - if (strcmp(text,"Test 9: (Function IF) Test segmented network trace")==0) - { + if (strcmp(text, "Test 9: (Function IF) Test segmented network trace") == 0) { printf("Test9f: (Function IF) Test segmented network trace\n"); dltdata->running_test = 18; - dltdata->test_counter_function[8]=0; + dltdata->test_counter_function[8] = 0; } - else if (strcmp(text,"Test9: (Function IF) finished")==0) + else if (strcmp(text, "Test9: (Function IF) finished") == 0) { /* (Interface types) * (number of messages per complete message) */ - if (dltdata->test_counter_function[8]==4*35) - { + if (dltdata->test_counter_function[8] == 4 * 35) { printf("Test9f PASSED\n"); dltdata->tests_passed++; } - else - { + else { printf("Test9f FAILED\n"); dltdata->tests_failed++; } + dltdata->running_test = 0; } - else if (dltdata->running_test==18) + else if (dltdata->running_test == 18) { - if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) - { - if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin))==DLT_TYPE_NW_TRACE) - { + if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) { + if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_NW_TRACE) { /* Check message type information*/ /* Each correct message type increases the counter by 1 */ - mtin=DLT_GET_MSIN_MTIN(message->extendedheader->msin); + mtin = DLT_GET_MSIN_MTIN(message->extendedheader->msin); - if (mtin==DLT_NW_TRACE_IPC) - { + if (mtin == DLT_NW_TRACE_IPC) dltdata->test_counter_function[8]++; - } - if (mtin==DLT_NW_TRACE_CAN) - { + + if (mtin == DLT_NW_TRACE_CAN) dltdata->test_counter_function[8]++; - } - if (mtin==DLT_NW_TRACE_FLEXRAY) - { + + if (mtin == DLT_NW_TRACE_FLEXRAY) dltdata->test_counter_function[8]++; - } - if (mtin==DLT_NW_TRACE_MOST) - { + + if (mtin == DLT_NW_TRACE_MOST) dltdata->test_counter_function[8]++; - } /* Payload for first segmented message */ - if (message->extendedheader->noar==6) - { + if (message->extendedheader->noar == 6) { /* verbose mode */ - type_info=0; - type_info_tmp=0; - length=0,length_tmp=0; /* the macro can set this variable to -1 */ + type_info = 0; + type_info_tmp = 0; + length = 0, length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; /* NWST */ - 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_STRG) - { + 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_STRG) { char chdr[10]; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); DLT_MSG_READ_STRING(chdr, ptr, datalength, length); - if(strcmp((char *)chdr, "NWST")==0) - { + + if (strcmp((char *)chdr, "NWST") == 0) dltdata->test_counter_function[8]++; - } /* Streahandle */ - 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_UINT) - { + 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_UINT) { uint32_t handle; - DLT_MSG_READ_VALUE(length_tmp32,ptr,datalength,uint32_t); - handle=DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); - if(handle > 0) - { + DLT_MSG_READ_VALUE(length_tmp32, ptr, datalength, uint32_t); + handle = DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); + + if (handle > 0) dltdata->test_counter_function[8]++; - } /* Header */ - 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_RAWD) - { - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t); + type_info = DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); - // Test packet header size 16 - if(length == 16) - { + if (type_info & DLT_TYPE_INFO_RAWD) { + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + + /* Test packet header size 16 */ + if (length == 16) dltdata->test_counter_function[8]++; - } + /* Skip data */ - ptr+=length; - datalength-=length; + ptr += length; + datalength -= length; /* Payload size */ - 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_UINT) - { + 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_UINT) { uint32_t pl_sz; - DLT_MSG_READ_VALUE(length_tmp32,ptr,datalength,uint32_t); - pl_sz=DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); + DLT_MSG_READ_VALUE(length_tmp32, ptr, datalength, uint32_t); + pl_sz = DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); - // Test packet payload size. - if(pl_sz == 5120) - { + /* Test packet payload size. */ + if (pl_sz == 5120) dltdata->test_counter_function[8]++; - } /* Segmentcount */ - 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_UINT) - { + 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_UINT) { uint16_t scount; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - scount=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + scount = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); /* Test packet segment count 5 */ - if(scount == 5) - { + if (scount == 5) dltdata->test_counter_function[8]++; - } /* Segment length */ - 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_UINT) - { + 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_UINT) { uint16_t slen; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - slen=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + slen = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + /* Default segment size 1024 */ - if(slen == 1024) - { + if (slen == 1024) dltdata->test_counter_function[8]++; - } } } } @@ -2672,126 +2381,118 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) } } /* Data segment */ - else if (message->extendedheader->noar==4) + else if (message->extendedheader->noar == 4) { /* verbose mode */ - type_info=0; - type_info_tmp=0; - length=0,length_tmp=0; /* the macro can set this variable to -1 */ + type_info = 0; + type_info_tmp = 0; + length = 0, length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; /* NWCH */ - 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_STRG) - { + 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_STRG) { char chdr[10]; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); DLT_MSG_READ_STRING(chdr, ptr, datalength, length); - if(strcmp((char *)chdr, "NWCH")==0) - { + + if (strcmp((char *)chdr, "NWCH") == 0) dltdata->test_counter_function[8]++; - } /* handle */ - 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_UINT) - { + 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_UINT) { uint32_t handle; - DLT_MSG_READ_VALUE(length_tmp32,ptr,datalength,uint32_t); - handle=DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); - if(handle > 0) - { + DLT_MSG_READ_VALUE(length_tmp32, ptr, datalength, uint32_t); + handle = DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); + + if (handle > 0) dltdata->test_counter_function[8]++; - } /* Sequence */ - 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_UINT) - { - //uint16_t seq; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - //seq=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + 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_UINT) { + /*uint16_t seq; */ + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + /*seq=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); */ dltdata->test_counter_function[8]++; /* 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_RAWD) - { - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t); + type_info = DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); - // Segment size by default, 1024 - if(length == 1024) - { + if (type_info & DLT_TYPE_INFO_RAWD) { + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + + /* Segment size by default, 1024 */ + if (length == 1024) dltdata->test_counter_function[8]++; - } } } } } } /* End segment */ - else if (message->extendedheader->noar==2) + else if (message->extendedheader->noar == 2) { /* verbose mode */ - type_info=0; - type_info_tmp=0; - length=0,length_tmp=0; /* the macro can set this variable to -1 */ + type_info = 0; + type_info_tmp = 0; + length = 0, length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; /* NWEN */ - 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_STRG) - { + 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_STRG) { char chdr[10]; - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); DLT_MSG_READ_STRING(chdr, ptr, datalength, length); - if(strcmp((char *)chdr, "NWEN")==0) - { + + if (strcmp((char *)chdr, "NWEN") == 0) dltdata->test_counter_function[8]++; - } /* handle */ - 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_UINT) - { + 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_UINT) { uint32_t handle; - DLT_MSG_READ_VALUE(length_tmp32,ptr,datalength,uint32_t); - handle=DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); - if(handle > 0) - { + DLT_MSG_READ_VALUE(length_tmp32, ptr, datalength, uint32_t); + handle = DLT_ENDIAN_GET_32(message->standardheader->htyp, length_tmp32); + + if (handle > 0) dltdata->test_counter_function[8]++; - } } } } } } } - if (strcmp(text,"Tests finished")==0) - { + + if (strcmp(text, "Tests finished") == 0) { printf("Tests finished\n"); dltdata->running_test = 1; - printf("%d tests passed\n",dltdata->tests_passed); - printf("%d tests failed\n",dltdata->tests_failed); + printf("%d tests passed\n", dltdata->tests_passed); + printf("%d tests failed\n", dltdata->tests_failed); - if (dltdata->sock!=-1) - { + if (dltdata->sock != -1) close(dltdata->sock); - } g_testsFailed = dltdata->tests_failed; @@ -2800,30 +2501,24 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) /* if no filter set or filter is matching display message */ if (dltdata->xflag) - { - dlt_message_print_hex(message,text,DLT_TESTCLIENT_TEXTBUFSIZE,dltdata->vflag); - } + dlt_message_print_hex(message, text, DLT_TESTCLIENT_TEXTBUFSIZE, dltdata->vflag); else if (dltdata->mflag) - { - dlt_message_print_mixed_plain(message,text,DLT_TESTCLIENT_TEXTBUFSIZE,dltdata->vflag); - } + dlt_message_print_mixed_plain(message, text, DLT_TESTCLIENT_TEXTBUFSIZE, dltdata->vflag); else if (dltdata->sflag) - { - dlt_message_print_header(message,text,sizeof(text),dltdata->vflag); - } + dlt_message_print_header(message, text, sizeof(text), dltdata->vflag); /* if file output enabled write message */ - if (dltdata->ovalue) - { + if (dltdata->ovalue) { iov[0].iov_base = message->headerbuffer; iov[0].iov_len = message->headersize; iov[1].iov_base = message->databuffer; iov[1].iov_len = message->datasize; bytes_written = writev(dltdata->ohandle, iov, 2); - if (0 > bytes_written){ - printf("dlt_testclient_message_callback, error in: writev(dltdata->ohandle, iov, 2)\n"); - return -1; + + if (0 > bytes_written) { + printf("dlt_testclient_message_callback, error in: writev(dltdata->ohandle, iov, 2)\n"); + return -1; } } } diff --git a/src/tests/dlt-test-filetransfer.c b/src/tests/dlt-test-filetransfer.c index 591714a..05a54d9 100644 --- a/src/tests/dlt-test-filetransfer.c +++ b/src/tests/dlt-test-filetransfer.c @@ -58,337 +58,347 @@ #include <dlt_filetransfer.h> /*Needed for transferring files with the dlt protocol*/ #include <dlt.h> /*Needed for dlt logging*/ -//!Declare some context for the main program. It's a must have to do this, when you want to log with dlt. +/*!Declare some context for the main program. It's a must have to do this, when you want to log with dlt. */ DLT_DECLARE_CONTEXT(mainContext) -//!Declare some context for the file transfer. It's not a must have to do this, but later you can set a filter on this context in the dlt viewer. +/*!Declare some context for the file transfer. It's not a must have to do this, but later you can set a filter on this context in the dlt viewer. */ DLT_DECLARE_CONTEXT(fileContext) -//!Textfile which will be transferred. +/*!Textfile which will be transferred. */ char *file1; -//!Image which will be transferred. +/*!Image which will be transferred. */ char *file2; -//!Not existing file which will be transferred. +/*!Not existing file which will be transferred. */ char *file3_1; -//!Not existing file which will be transferred. +/*!Not existing file which will be transferred. */ char *file3_2; -//!Not existing file which will be transferred. +/*!Not existing file which will be transferred. */ char *file3_3; -//!Just some variables -int i,countPackages, transferResult; +/*!Just some variables */ +int i, countPackages, transferResult; static int g_numFailed = 0; -//!Prints the test result -void printTestResultPositiveExpected(const char *function, int result){ +/*!Prints the test result */ +void printTestResultPositiveExpected(const char *function, int result) +{ - if(result >= 0){ - printf("%s successful\n",function); + if (result >= 0) { + printf("%s successful\n", function); } - else - { - printf("%s failed\n",function); + else { + printf("%s failed\n", function); g_numFailed++; } - } -//!Prints the test result -void printTestResultNegativeExpected(const char *function, int result){ +/*!Prints the test result */ +void printTestResultNegativeExpected(const char *function, int result) +{ - if(result < 0){ - printf("%s successful\n",function); + if (result < 0) { + printf("%s successful\n", function); } - else - { - printf("%s failed\n",function); + else { + printf("%s failed\n", function); g_numFailed++; } - } -//!Test the file transfer with the condition that the transferred file is smaller as the file transfer buffer using dlt_user_log_file_complete. -int testFile1Run1(){ - //Just some log to the main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Started testF1P1 - dlt_user_log_file_complete"),DLT_STRING(file1)); +/*!Test the file transfer with the condition that the transferred file is smaller as the file transfer buffer using dlt_user_log_file_complete. */ +int testFile1Run1() +{ + /*Just some log to the main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Started testF1P1 - dlt_user_log_file_complete"), DLT_STRING(file1)); - //Here's the line where the dlt file transfer is called. The method call needs a context, the absolute file path, will the file be deleted after transfer and the timeout between the packages - transferResult = dlt_user_log_file_complete(&fileContext,file1,0,20); - if(transferResult < 0 ) - { - printf("Error: dlt_user_log_file_complete\n"); - return transferResult; + /*Here's the line where the dlt file transfer is called. The method call needs a context, the absolute file path, will the file be deleted after transfer and the timeout between the packages */ + transferResult = dlt_user_log_file_complete(&fileContext, file1, 0, 20); + + if (transferResult < 0) { + printf("Error: dlt_user_log_file_complete\n"); + return transferResult; } - //Just some log to the main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Finished testF1P1"),DLT_STRING(file1)); - printTestResultPositiveExpected(__FUNCTION__,transferResult); + /*Just some log to the main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Finished testF1P1"), DLT_STRING(file1)); + + printTestResultPositiveExpected(__FUNCTION__, transferResult); return transferResult; } -//!Test the file transfer with the condition that the transferred file is smaller as the file transfer buffer using single package transfer -int testFile1Run2(){ +/*!Test the file transfer with the condition that the transferred file is smaller as the file transfer buffer using single package transfer */ +int testFile1Run2() +{ int total_size, used_size; - //Get the information how many packages have the file - countPackages = dlt_user_log_file_packagesCount(&fileContext,file1); - if(countPackages < 0 ) - { - printf("Error: dlt_user_log_file_packagesCount\n"); - printTestResultPositiveExpected(__FUNCTION__,countPackages); - return -1; + /*Get the information how many packages have the file */ + countPackages = dlt_user_log_file_packagesCount(&fileContext, file1); + + if (countPackages < 0) { + printf("Error: dlt_user_log_file_packagesCount\n"); + printTestResultPositiveExpected(__FUNCTION__, countPackages); + return -1; } - //Just some log to the main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Started testF1P2 - transfer single package"),DLT_STRING(file1)); - - //Logs the header of the file transfer. For more details see Mainpage.c. - //The header gives information about the file serial number, filename (with absolute path), filesize, packages of file, buffer size - transferResult = dlt_user_log_file_header(&fileContext,file1); - if(transferResult >= 0) - { - //Loop to log all packages - for(i=1;i<=countPackages;i++) - { + + /*Just some log to the main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Started testF1P2 - transfer single package"), DLT_STRING(file1)); + + /*Logs the header of the file transfer. For more details see Mainpage.c. */ + /*The header gives information about the file serial number, filename (with absolute path), filesize, packages of file, buffer size */ + transferResult = dlt_user_log_file_header(&fileContext, file1); + + if (transferResult >= 0) { + /*Loop to log all packages */ + for (i = 1; i <= countPackages; i++) { dlt_user_check_buffer(&total_size, &used_size); - if((total_size - used_size) < (total_size/2)) - { + + if ((total_size - used_size) < (total_size / 2)) { printf("Error: dlt_user_log_file_data\n"); - printTestResultPositiveExpected(__FUNCTION__,transferResult); + printTestResultPositiveExpected(__FUNCTION__, transferResult); break; } - //Logs one single package to the file context - transferResult = dlt_user_log_file_data(&fileContext,file1,i,20); - if(transferResult < 0) - { + /*Logs one single package to the file context */ + transferResult = dlt_user_log_file_data(&fileContext, file1, i, 20); + + if (transferResult < 0) { printf("Error: dlt_user_log_file_data\n"); - printTestResultPositiveExpected(__FUNCTION__,transferResult); + printTestResultPositiveExpected(__FUNCTION__, transferResult); return transferResult; } } - //Logs the end of the file transfer. For more details see Mainpage.c - //The end gives just information about the file serial number but is needed to signal that the file transfer has correctly finished and needed for the file transfer plugin of the dlt viewer. - transferResult = dlt_user_log_file_end(&fileContext,file1,0); - if(transferResult < 0) - { + /*Logs the end of the file transfer. For more details see Mainpage.c */ + /*The end gives just information about the file serial number but is needed to signal that the file transfer has correctly finished and needed for the file transfer plugin of the dlt viewer. */ + transferResult = dlt_user_log_file_end(&fileContext, file1, 0); + + if (transferResult < 0) { printf("Error: dlt_user_log_file_end\n"); - printTestResultPositiveExpected(__FUNCTION__,transferResult); + printTestResultPositiveExpected(__FUNCTION__, transferResult); return transferResult; } } - else - { + else { printf("Error: dlt_user_log_file_header\n"); - printTestResultPositiveExpected(__FUNCTION__,transferResult); + printTestResultPositiveExpected(__FUNCTION__, transferResult); return transferResult; } - //Just some log to main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Finished testF1P2 - transfer single package"),DLT_STRING(file1)); - printTestResultPositiveExpected(__FUNCTION__,transferResult); + /*Just some log to main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Finished testF1P2 - transfer single package"), DLT_STRING(file1)); + printTestResultPositiveExpected(__FUNCTION__, transferResult); return 0; } -//!Test the file transfer with the condition that the transferred file is bigger as the file transfer buffer using dlt_user_log_file_complete. -int testFile2Run1(){ - //Just some log to main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Started testF2P1 - dlt_user_log_file_complete"),DLT_STRING(file2)); - - //Here's the line where the dlt file transfer is called. The method call needs a context, the absolute file path, will the file be deleted after transfer and the timeout between the packages - transferResult = dlt_user_log_file_complete(&fileContext,file2,0,20); - if(transferResult < 0) - { +/*!Test the file transfer with the condition that the transferred file is bigger as the file transfer buffer using dlt_user_log_file_complete. */ +int testFile2Run1() +{ + /*Just some log to main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Started testF2P1 - dlt_user_log_file_complete"), DLT_STRING(file2)); + + /*Here's the line where the dlt file transfer is called. The method call needs a context, the absolute file path, will the file be deleted after transfer and the timeout between the packages */ + transferResult = dlt_user_log_file_complete(&fileContext, file2, 0, 20); + + if (transferResult < 0) { printf("Error: dlt_user_log_file_complete\n"); - printTestResultPositiveExpected(__FUNCTION__,transferResult); + printTestResultPositiveExpected(__FUNCTION__, transferResult); return transferResult; } - //Just some log to main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Finished testF2P1"),DLT_STRING(file2)); - printTestResultPositiveExpected(__FUNCTION__,transferResult); + + /*Just some log to main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Finished testF2P1"), DLT_STRING(file2)); + printTestResultPositiveExpected(__FUNCTION__, transferResult); return transferResult; } -//!Test the file transfer with the condition that the transferred file is bigger as the file transfer buffer using single package transfer -int testFile2Run2(){ +/*!Test the file transfer with the condition that the transferred file is bigger as the file transfer buffer using single package transfer */ +int testFile2Run2() +{ int total_size, used_size; - //Get the information how many packages have the file - countPackages = dlt_user_log_file_packagesCount(&fileContext,file2); - if(countPackages < 0 ) - { - printf("Error: dlt_user_log_file_packagesCount\n"); - printTestResultPositiveExpected(__FUNCTION__,countPackages); - return -1; + /*Get the information how many packages have the file */ + countPackages = dlt_user_log_file_packagesCount(&fileContext, file2); + + if (countPackages < 0) { + printf("Error: dlt_user_log_file_packagesCount\n"); + printTestResultPositiveExpected(__FUNCTION__, countPackages); + return -1; } - //Just some log to the main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Started testF2P2 - transfer single package"),DLT_STRING(file2)); + /*Just some log to the main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Started testF2P2 - transfer single package"), DLT_STRING(file2)); + + /*Logs the header of the file transfer. For more details see Mainpage.c. */ + /*The header gives information about the file serial number, filename (with absolute path), filesize, packages of file, buffer size */ + transferResult = dlt_user_log_file_header(&fileContext, file2); - //Logs the header of the file transfer. For more details see Mainpage.c. - //The header gives information about the file serial number, filename (with absolute path), filesize, packages of file, buffer size - transferResult = dlt_user_log_file_header(&fileContext,file2); - if( transferResult >= 0){ + if (transferResult >= 0) { - //Loop to log all packages - for(i=1;i<=countPackages;i++) - { + /*Loop to log all packages */ + for (i = 1; i <= countPackages; i++) { dlt_user_check_buffer(&total_size, &used_size); - if((total_size - used_size) < (total_size/2)) - { + + if ((total_size - used_size) < (total_size / 2)) { printf("Error: dlt_user_log_file_data\n"); - printTestResultPositiveExpected(__FUNCTION__,transferResult); + printTestResultPositiveExpected(__FUNCTION__, transferResult); break; } - //Logs one single package to the file context - transferResult = dlt_user_log_file_data(&fileContext,file2,i,20); - if(transferResult < 0) - { + /*Logs one single package to the file context */ + transferResult = dlt_user_log_file_data(&fileContext, file2, i, 20); + + if (transferResult < 0) { printf("Error: dlt_user_log_file_data\n"); - printTestResultPositiveExpected(__FUNCTION__,transferResult); + printTestResultPositiveExpected(__FUNCTION__, transferResult); return transferResult; } } - //Logs the end of the file transfer. For more details see Mainpage.c - //The end gives just information about the file serial number but is needed to signal that the file transfer has correctly finished and needed for the file transfer plugin of the dlt viewer. - transferResult = dlt_user_log_file_end(&fileContext,file2,0); - if(transferResult < 0) - { + /*Logs the end of the file transfer. For more details see Mainpage.c */ + /*The end gives just information about the file serial number but is needed to signal that the file transfer has correctly finished and needed for the file transfer plugin of the dlt viewer. */ + transferResult = dlt_user_log_file_end(&fileContext, file2, 0); + + if (transferResult < 0) { printf("Error: dlt_user_log_file_end\n"); - printTestResultPositiveExpected(__FUNCTION__,transferResult); + printTestResultPositiveExpected(__FUNCTION__, transferResult); return transferResult; } } - else - { + else { printf("Error: dlt_user_log_file_header\n"); - printTestResultPositiveExpected(__FUNCTION__,transferResult); + printTestResultPositiveExpected(__FUNCTION__, transferResult); return transferResult; } - //Just some log to the main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Finished testF2P2"),DLT_STRING(file2)); - printTestResultPositiveExpected(__FUNCTION__,transferResult); + + /*Just some log to the main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Finished testF2P2"), DLT_STRING(file2)); + printTestResultPositiveExpected(__FUNCTION__, transferResult); return 0; } -//!Test the file transfer with the condition that the transferred file does not exist using dlt_user_log_file_complete. -int testFile3Run1(){ - - //Just some log to the main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Started testF3P1"),DLT_STRING(file3_1)); - - //Here's the line where the dlt file transfer is called. The method call needs a context, the absolute file path, will the file be deleted after transfer and the timeout between the packages - transferResult = dlt_user_log_file_complete(&fileContext,file3_1,0,20); - if(transferResult < 0) - { - //Error expected because file doesn't exist - //printf("Error: dlt_user_log_file_complete\n"); - //Just some log to the main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Finished testF3P1"),DLT_STRING(file3_1)); - printTestResultNegativeExpected(__FUNCTION__,transferResult); +/*!Test the file transfer with the condition that the transferred file does not exist using dlt_user_log_file_complete. */ +int testFile3Run1() +{ + + /*Just some log to the main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Started testF3P1"), DLT_STRING(file3_1)); + + /*Here's the line where the dlt file transfer is called. The method call needs a context, the absolute file path, will the file be deleted after transfer and the timeout between the packages */ + transferResult = dlt_user_log_file_complete(&fileContext, file3_1, 0, 20); + + if (transferResult < 0) { + /*Error expected because file doesn't exist */ + /*printf("Error: dlt_user_log_file_complete\n"); */ + /*Just some log to the main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Finished testF3P1"), DLT_STRING(file3_1)); + printTestResultNegativeExpected(__FUNCTION__, transferResult); return transferResult; } - printTestResultNegativeExpected(__FUNCTION__,transferResult); + + printTestResultNegativeExpected(__FUNCTION__, transferResult); return transferResult; } -//!Test the file transfer with the condition that the transferred file does not exist using single package transfer -int testFile3Run2(){ +/*!Test the file transfer with the condition that the transferred file does not exist using single package transfer */ +int testFile3Run2() +{ - //Get the information how many packages have the file - countPackages = dlt_user_log_file_packagesCount(&fileContext,file3_2); - if(countPackages < 0 ) - { - //Error expected because file doesn't exist - //printf("Error: dlt_user_log_file_packagesCount\n"); - //Just some log to the main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Finished testF3P1"),DLT_STRING(file3_2)); - printTestResultNegativeExpected(__FUNCTION__,countPackages); - return -1; + /*Get the information how many packages have the file */ + countPackages = dlt_user_log_file_packagesCount(&fileContext, file3_2); + + if (countPackages < 0) { + /*Error expected because file doesn't exist */ + /*printf("Error: dlt_user_log_file_packagesCount\n"); */ + /*Just some log to the main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Finished testF3P1"), DLT_STRING(file3_2)); + printTestResultNegativeExpected(__FUNCTION__, countPackages); + return -1; } - //Just some log to the main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Started testF3P1"),DLT_STRING(file3_2)); - - //Logs the header of the file transfer. For more details see Mainpage.c. - //The header gives information about the file serial number, filename (with absolute path), filesize, packages of file, buffer size - transferResult = dlt_user_log_file_header(&fileContext,file3_2); - if( transferResult >= 0){ - - //Loop to log all packages - for(i=1;i<=countPackages;i++) - { - //Logs one single package to the file context - transferResult = dlt_user_log_file_data(&fileContext,file3_2,i,20); - if(transferResult < 0) - { + + /*Just some log to the main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Started testF3P1"), DLT_STRING(file3_2)); + + /*Logs the header of the file transfer. For more details see Mainpage.c. */ + /*The header gives information about the file serial number, filename (with absolute path), filesize, packages of file, buffer size */ + transferResult = dlt_user_log_file_header(&fileContext, file3_2); + + if (transferResult >= 0) { + + /*Loop to log all packages */ + for (i = 1; i <= countPackages; i++) { + /*Logs one single package to the file context */ + transferResult = dlt_user_log_file_data(&fileContext, file3_2, i, 20); + + if (transferResult < 0) { printf("Error: dlt_user_log_file_data\n"); - printTestResultNegativeExpected(__FUNCTION__,transferResult); + printTestResultNegativeExpected(__FUNCTION__, transferResult); return transferResult; } } - //Logs the end of the file transfer. For more details see Mainpage.c - //The end gives just information about the file serial number but is needed to signal that the file transfer has correctly finished and needed for the file transfer plugin of the dlt viewer. - transferResult = dlt_user_log_file_end(&fileContext,file3_2,0); - if(transferResult < 0) - { + /*Logs the end of the file transfer. For more details see Mainpage.c */ + /*The end gives just information about the file serial number but is needed to signal that the file transfer has correctly finished and needed for the file transfer plugin of the dlt viewer. */ + transferResult = dlt_user_log_file_end(&fileContext, file3_2, 0); + + if (transferResult < 0) { printf("Error: dlt_user_log_file_end\n"); - printTestResultNegativeExpected(__FUNCTION__,transferResult); + printTestResultNegativeExpected(__FUNCTION__, transferResult); return transferResult; } } - printTestResultNegativeExpected(__FUNCTION__,transferResult); + + printTestResultNegativeExpected(__FUNCTION__, transferResult); return 0; } -//!Logs some information about the file. -int testFile3Run3(){ +/*!Logs some information about the file. */ +int testFile3Run3() +{ - //Just some log to the main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Started testF3P2"),DLT_STRING(file3_3)); + /*Just some log to the main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Started testF3P2"), DLT_STRING(file3_3)); - //Here's the line where the dlt file file info is called. The method call logs some information to dlt about the file, filesize, file serial number and number of packages - transferResult = dlt_user_log_file_infoAbout(&fileContext,file3_3); - if(transferResult < 0) - { - //Error expected because file doesn't exist - //printf("Error: dlt_user_log_file_infoAbout\n"); - //Just some log to the main context - DLT_LOG(mainContext,DLT_LOG_INFO,DLT_STRING("Finished testF3P2"),DLT_STRING(file3_3)); - printTestResultNegativeExpected(__FUNCTION__,transferResult); + /*Here's the line where the dlt file file info is called. The method call logs some information to dlt about the file, filesize, file serial number and number of packages */ + transferResult = dlt_user_log_file_infoAbout(&fileContext, file3_3); + + if (transferResult < 0) { + /*Error expected because file doesn't exist */ + /*printf("Error: dlt_user_log_file_infoAbout\n"); */ + /*Just some log to the main context */ + DLT_LOG(mainContext, DLT_LOG_INFO, DLT_STRING("Finished testF3P2"), DLT_STRING(file3_3)); + printTestResultNegativeExpected(__FUNCTION__, transferResult); return transferResult; } - printTestResultNegativeExpected(__FUNCTION__,transferResult); + + printTestResultNegativeExpected(__FUNCTION__, transferResult); return 0; } -//!Main program dlt-test-filestransfer starts here +/*!Main program dlt-test-filestransfer starts here */ int main(void) { - //First file contains some text + /*First file contains some text */ file1 = "/usr/local/share/dlt-filetransfer/dlt-test-filetransfer-file"; - //Second file is a picture + /*Second file is a picture */ file2 = "/usr/local/share/dlt-filetransfer/dlt-test-filetransfer-image.png"; - //Third file doesn't exist. Just to test the reaction when the file isn't available. + /*Third file doesn't exist. Just to test the reaction when the file isn't available. */ file3_1 = "dlt-test-filetransfer-doesntExist_1"; - //Third file doesn't exist. Just to test the reaction when the file isn't available. + /*Third file doesn't exist. Just to test the reaction when the file isn't available. */ file3_2 = "dlt-test-filetransfer-doesntExist_2"; - //Third file doesn't exist. Just to test the reaction when the file isn't available. + /*Third file doesn't exist. Just to test the reaction when the file isn't available. */ file3_3 = "dlt-test-filetransfer-doesntExist_3"; - //Register the application at the dlt-daemon - DLT_REGISTER_APP("FLTR","Test Application filetransfer"); + /*Register the application at the dlt-daemon */ + DLT_REGISTER_APP("FLTR", "Test Application filetransfer"); - //Register the context of the main program at the dlt-daemon - DLT_REGISTER_CONTEXT(mainContext,"MAIN","Main context for filetransfer test"); + /*Register the context of the main program at the dlt-daemon */ + DLT_REGISTER_CONTEXT(mainContext, "MAIN", "Main context for filetransfer test"); - //Register the context in which the file transfer will be logged at the dlt-daemon - DLT_REGISTER_CONTEXT(fileContext,"FLTR","Test Context for filetransfer"); + /*Register the context in which the file transfer will be logged at the dlt-daemon */ + DLT_REGISTER_CONTEXT(fileContext, "FLTR", "Test Context for filetransfer"); - //More details in corresponding methods + /*More details in corresponding methods */ testFile1Run1(); testFile1Run2(); testFile2Run1(); @@ -397,11 +407,11 @@ int main(void) testFile3Run2(); testFile3Run3(); - //Unregister the context in which the file transfer happened from the dlt-daemon + /*Unregister the context in which the file transfer happened from the dlt-daemon */ DLT_UNREGISTER_CONTEXT(fileContext); - //Unregister the context of the main program from the dlt-daemon + /*Unregister the context of the main program from the dlt-daemon */ DLT_UNREGISTER_CONTEXT(mainContext); - //Unregister the app from the dlt-daemon + /*Unregister the app from the dlt-daemon */ DLT_UNREGISTER_APP(); return g_numFailed == 0 ? 0 : 1; diff --git a/src/tests/dlt-test-fork-handler.c b/src/tests/dlt-test-fork-handler.c index 84685f9..4bd3321 100644 --- a/src/tests/dlt-test-fork-handler.c +++ b/src/tests/dlt-test-fork-handler.c @@ -22,7 +22,7 @@ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-test-fork-handler.c -*/ + */ #include <unistd.h> /* for fork() */ @@ -41,8 +41,8 @@ int main() usleep(200000); pid_t pid = fork(); - if (pid == 0) /* child process */ - { + + if (pid == 0) { /* child process */ /* this message should not be visible */ /* DLT_LOG(mainContext, DLT_LOG_WARN, DLT_STRING("Child's first message after fork, pid: "), DLT_INT32(getpid())); */ /* unfortunately, this message does arrive, I assume because it still has (locally) valid data ... */ @@ -56,8 +56,7 @@ int main() { return -1; } - else /* parent */ - { + else { /* parent */ DLT_LOG(mainContext, DLT_LOG_WARN, DLT_STRING("Parent's first message after fork, pid: "), DLT_INT32(getpid())); usleep(500000); } diff --git a/src/tests/dlt-test-init-free.c b/src/tests/dlt-test-init-free.c index 81083e3..bce4b0b 100644 --- a/src/tests/dlt-test-init-free.c +++ b/src/tests/dlt-test-init-free.c @@ -1,28 +1,28 @@ /* -* @licence app begin@ -* SPDX license identifier: MPL-2.0 -* -* Copyright (C) 2011-2015, BMW AG -* -* This file is part of GENIVI Project DLT - Diagnostic Log and Trace. -* -* This Source Code Form is subject to the terms of the -* Mozilla Public License (MPL), 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/. -* -* For further information see http://www.genivi.org/. -* @licence end@ -*/ + * @licence app begin@ + * SPDX license identifier: MPL-2.0 + * + * Copyright (C) 2011-2015, BMW AG + * + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. + * + * This Source Code Form is subject to the terms of the + * Mozilla Public License (MPL), 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/. + * + * For further information see http://www.genivi.org/. + * @licence end@ + */ /*! -* \author Sven Hassler <sven_hassler@mentor.com> -* -* \copyright Copyright © 2011-2015 BMW AG. \n -* License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. -* -* \file dlt-test-init-free.c -*/ + * \author Sven Hassler <sven_hassler@mentor.com> + * + * \copyright Copyright © 2011-2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-test-init-free.c + */ #include <stdio.h> #include <stdlib.h> @@ -32,9 +32,9 @@ #include "dlt_common.h" #include "dlt_user.h" -void exec(const char* cmd, char *buffer, size_t length); +void exec(const char *cmd, char *buffer, size_t length); void printMemoryUsage(); -char* occupyMemory(uint size); +char *occupyMemory(uint size); void do_example_test(); void do_dlt_test(); @@ -49,7 +49,7 @@ int main(int argc, char **argv) printf("Will do %d repetitions.\n", num_repetitions); - //do_example_test(); + /*do_example_test(); */ do_dlt_test(); printf("Done.\n"); @@ -57,25 +57,23 @@ int main(int argc, char **argv) return 0; } -// Should increase and then decrease memory amount. +/* Should increase and then decrease memory amount. */ void do_example_test() { const int immediatelyFree = 0; int numBufs = 1024; - int sizePerBuf = 1024 * 1024; // 1MB + int sizePerBuf = 1024 * 1024; /* 1MB */ - char** bufs = (char**) malloc(numBufs * sizeof(char*)); + char **bufs = (char **)malloc(numBufs * sizeof(char *)); - for (int i = 0; i < numBufs; i++) - { + for (int i = 0; i < numBufs; i++) { bufs[i] = occupyMemory(sizePerBuf); printf("after alloc: "); printMemoryUsage(); - if (immediatelyFree) - { + if (immediatelyFree) { free(bufs[i]); printf("after free: "); @@ -86,9 +84,8 @@ void do_example_test() printf("deleting memory:\n"); if (!immediatelyFree) - for (int i = 0; i < numBufs; i++) - //for (int i = numBufs - 1; i >= 0; i--) // other way round works, too - { + for (int i = 0; i < numBufs; i++) { + /*for (int i = numBufs - 1; i >= 0; i--) // other way round works, too */ free(bufs[i]); printf("after free: "); @@ -98,11 +95,10 @@ void do_example_test() free(bufs); } -// Should give stable amount of memory across all iterations. +/* Should give stable amount of memory across all iterations. */ void do_dlt_test() { - for (int i = 0; i < num_repetitions; i++) - { + for (int i = 0; i < num_repetitions; i++) { dlt_init(); dlt_free(); @@ -111,17 +107,17 @@ void do_dlt_test() } } -void exec(const char* cmd, char *buffer, size_t length) +void exec(const char *cmd, char *buffer, size_t length) { - FILE* pipe = NULL; + FILE *pipe = NULL; strncpy(buffer, "ERROR", length); - if ( (pipe = popen(cmd, "r")) == NULL ) + if ((pipe = popen(cmd, "r")) == NULL) return; while (fgets(buffer, length, pipe) != NULL); - if(pipe != NULL) + if (pipe != NULL) pclose(pipe); } @@ -137,13 +133,12 @@ void printMemoryUsage() printf("%s", result); } -char* occupyMemory(uint size) +char *occupyMemory(uint size) { - char* buf = (char*) malloc(size * sizeof(char)); + char *buf = (char *)malloc(size * sizeof(char)); + for (int i = 0; i < 1; i++) - { buf[i] = 1; - } return buf; } diff --git a/src/tests/dlt-test-multi-process-client.c b/src/tests/dlt-test-multi-process-client.c index 72a9ea4..ab434cc 100644 --- a/src/tests/dlt-test-multi-process-client.c +++ b/src/tests/dlt-test-multi-process-client.c @@ -25,25 +25,25 @@ */ /******************************************************************************* - ** ** - ** SRC-MODULE: dlt-test-multi-process-client.c ** - ** ** - ** TARGET : linux ** - ** ** - ** PROJECT : DLT ** - ** ** - ** AUTHOR : Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> ** - ** ** - ** PURPOSE : Receive, validate and measure data from multi process tester ** - ** ** - ** REMARKS : ** - ** ** - ** PLATFORM DEPENDANT [yes/no]: yes ** - ** ** - ** TO BE CHANGED BY USER [yes/no]: no ** - ** ** - *******************************************************************************/ -// System includes +** ** +** SRC-MODULE: dlt-test-multi-process-client.c ** +** ** +** TARGET : linux ** +** ** +** PROJECT : DLT ** +** ** +** AUTHOR : Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> ** +** ** +** PURPOSE : Receive, validate and measure data from multi process tester ** +** ** +** REMARKS : ** +** ** +** PLATFORM DEPENDANT [yes/no]: yes ** +** ** +** TO BE CHANGED BY USER [yes/no]: no ** +** ** +*******************************************************************************/ +/* System includes */ #include <string.h> #include <stdio.h> #include <unistd.h> @@ -54,14 +54,14 @@ #include <sys/uio.h> #include <sys/stat.h> -// DLT Library includes +/* DLT Library includes */ #include "dlt_client.h" #include "dlt_protocol.h" #include "dlt_user.h" -// PRivate includes +/* PRivate includes */ #include "dlt-test-multi-process.h" -// Local data structures +/* Local data structures */ typedef struct { int max_messages; int verbose; @@ -74,22 +74,23 @@ typedef struct { } s_parameters; typedef struct { - int messages_received; - int broken_messages_received; - int bytes_received; - int first_message_time; - int output_bytes; + int messages_received; + int broken_messages_received; + int bytes_received; + int first_message_time; + int output_bytes; } s_statistics; -// Forward declarations +/* Forward declarations */ int receive(DltMessage *msg, void *data); /** * Print usage information */ -void usage(char *name) { +void usage(char *name) +{ char version[255]; - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: %s [options] <remote address|serial device>\n", name); printf("Receive messages from dlt-test-multi-process.\n"); @@ -105,7 +106,8 @@ void usage(char *name) { /** * Initialize reasonable default parameters. */ -void init_params(s_parameters *params) { +void init_params(s_parameters *params) +{ params->max_messages = 10000; params->verbose = 0; params->serial = 0; @@ -117,11 +119,13 @@ void init_params(s_parameters *params) { /** * Read the command line parameters */ -int read_params(s_parameters *params, int argc, char *argv[]) { +int read_params(s_parameters *params, int argc, char *argv[]) +{ init_params(params); int c; opterr = 0; - while ((c = getopt(argc, argv, "m:yb:vo:")) != -1) { + + while ((c = getopt(argc, argv, "m:yb:vo:")) != -1) switch (c) { case 'm': params->max_messages = atoi(optarg); @@ -139,49 +143,49 @@ int read_params(s_parameters *params, int argc, char *argv[]) { params->output = optarg; break; case '?': - if(optopt == 'm' || optopt == 'b' || optopt == 'o') - { + + if ((optopt == 'm') || (optopt == 'b') || (optopt == 'o')) fprintf(stderr, "Option -%c requires an argument.\n", optopt); - } - if (isprint(optopt)) { + + if (isprint(optopt)) fprintf(stderr, "Unknown option '-%c'.\n", optopt); - } else { + else fprintf(stderr, "Unknown option character '\\x%x'.\n", optopt); - } + return -1; break; default: return -1; } - } + return 0; } /** * Set the connection parameters for dlt client */ -int init_dlt_connect(DltClient *client, const s_parameters *params, int argc, char *argv[]) { +int init_dlt_connect(DltClient *client, const s_parameters *params, int argc, char *argv[]) +{ char id[4]; + if (argc < 2) return -1; - if(params->serial > 0) - { + + if (params->serial > 0) { client->mode = 1; - if(dlt_client_set_serial_device(client, argv[argc - 1]) == -1) - { - fprintf(stderr,"set serial device didn't succeed\n"); + + if (dlt_client_set_serial_device(client, argv[argc - 1]) == -1) { + fprintf(stderr, "set serial device didn't succeed\n"); return -1; } + dlt_client_setbaudrate(client, params->baudrate); } - else - { - if(dlt_client_set_server_ip(client, argv[argc - 1]) == -1) - { - fprintf(stderr,"set serial ip didn't succeed\n"); - return -1; - } + else if (dlt_client_set_server_ip(client, argv[argc - 1]) == -1) { + fprintf(stderr, "set serial ip didn't succeed\n"); + return -1; } + dlt_set_id(id, ECUID); return 0; } @@ -189,7 +193,8 @@ int init_dlt_connect(DltClient *client, const s_parameters *params, int argc, ch /** * Entry point */ -int main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ s_parameters params; DltClient client; params.client_ref = &client; @@ -204,24 +209,24 @@ int main(int argc, char *argv[]) { dlt_client_register_message_callback(receive); err = init_dlt_connect(&client, ¶ms, argc, argv); + if (err != 0) { usage(argv[0]); return err; } err = dlt_client_connect(&client, params.verbose); + if (err != DLT_RETURN_OK) { - printf("Failed to connect %s.\n", client.mode > 0 ? client.serialDevice : client.servIP); + printf("Failed to connect %s.\n", client.mode > 0 ? client.serialDevice : client.servIP); return err; } - if(params.output) - { - params.output_handle = open(params.output,O_WRONLY|O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + if (params.output) { + params.output_handle = open(params.output, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - if (params.output_handle == -1) - { - fprintf(stderr,"Failed to open %s for writing.\n",params.output); + if (params.output_handle == -1) { + fprintf(stderr, "Failed to open %s for writing.\n", params.output); return -1; } } @@ -230,10 +235,9 @@ int main(int argc, char *argv[]) { dlt_client_main_loop(&client, ¶ms, params.verbose); - if(params.output_handle > 0) - { + if (params.output_handle > 0) close(params.output_handle); - } + return 0; } @@ -243,36 +247,38 @@ int main(int argc, char *argv[]) { void print_stats(s_statistics stats, s_parameters params) { static int last_print_time; - if(last_print_time >= time(NULL) && // Only print once a second - (stats.messages_received+stats.broken_messages_received) % 1000 != 0 && - params.messages_left != 0) // Print also every 1000th message - { + + if ((last_print_time >= time(NULL)) && /* Only print once a second */ + ((stats.messages_received + stats.broken_messages_received) % 1000 != 0) && + (params.messages_left != 0)) /* Print also every 1000th message */ + return; - } - printf("\033[2J\033[1;1H"); // Clear screen. + + printf("\033[2J\033[1;1H"); /* Clear screen. */ printf("Statistics:\n"); printf(" Messages received : %d\n", stats.messages_received); printf(" Broken messages received : %d\n", stats.broken_messages_received); printf(" Bytes received : %d\n", stats.bytes_received); - printf(" Time running (seconds) : %ld\n", time(NULL)-stats.first_message_time); + printf(" Time running (seconds) : %ld\n", time(NULL) - stats.first_message_time); printf(" Throughput (msgs/sec)/(B/sec) : %ld/%ld\n", - stats.messages_received/((time(NULL)-stats.first_message_time)+1), - (stats.bytes_received)/((time(NULL)-stats.first_message_time)+1)); - if(params.messages_left == 0) - { - if(stats.broken_messages_received == 0) + stats.messages_received / ((time(NULL) - stats.first_message_time) + 1), + (stats.bytes_received) / ((time(NULL) - stats.first_message_time) + 1)); + + if (params.messages_left == 0) { + if (stats.broken_messages_received == 0) printf("All messages received succesfully!\n"); else printf("Test failure! There were %d broken messages.", stats.broken_messages_received); - } + fflush(stdout); last_print_time = time(NULL); } /** * Callback for dlt client */ -int receive(DltMessage *msg, void *data) { +int receive(DltMessage *msg, void *data) +{ static s_statistics stats; char apid[5]; struct iovec iov[2]; @@ -281,43 +287,38 @@ int receive(DltMessage *msg, void *data) { memset(apid, 0, 5); memcpy(apid, msg->extendedheader->apid, 4); - if(apid[0] != 'M' || apid[1] != 'T') // TODO: Check through the app description + if ((apid[0] != 'M') || (apid[1] != 'T')) /* TODO: Check through the app description */ return 0; params->messages_left--; - if(stats.first_message_time == 0) - { + if (stats.first_message_time == 0) stats.first_message_time = time(NULL); - } int buflen = msg->datasize + 1; char *buf = malloc(buflen); - if(buf==0) - { + + if (buf == 0) { printf("Out of memory\n"); return -1; } + memset(buf, 0, buflen); - dlt_message_payload(msg,buf,buflen-1,DLT_OUTPUT_ASCII,0); + dlt_message_payload(msg, buf, buflen - 1, DLT_OUTPUT_ASCII, 0); - if(strcmp(buf, PAYLOAD_DATA) == 0) - { + if (strcmp(buf, PAYLOAD_DATA) == 0) stats.messages_received++; - } else - { stats.broken_messages_received++; - } - stats.bytes_received += msg->datasize+msg->headersize-sizeof(DltStorageHeader);; + + stats.bytes_received += msg->datasize + msg->headersize - sizeof(DltStorageHeader); free(buf); print_stats(stats, *params); - if (params->output_handle > 0) - { + if (params->output_handle > 0) { iov[0].iov_base = msg->headerbuffer; iov[0].iov_len = msg->headersize; iov[1].iov_base = msg->databuffer; @@ -325,9 +326,9 @@ int receive(DltMessage *msg, void *data) { stats.output_bytes += writev(params->output_handle, iov, 2); } - if(params->messages_left < 1) - { + + if (params->messages_left < 1) dlt_client_cleanup(params->client_ref, params->verbose); - } + return 0; } diff --git a/src/tests/dlt-test-multi-process.c b/src/tests/dlt-test-multi-process.c index 0726b9a..5b508f3 100644 --- a/src/tests/dlt-test-multi-process.c +++ b/src/tests/dlt-test-multi-process.c @@ -58,30 +58,30 @@ #include "dlt_common.h" #include "dlt-test-multi-process.h" -// Constants +/* Constants */ #define MAX_PROCS 100 #define MAX_THREADS 100 #ifndef WAIT_ANY -#define WAIT_ANY -1 +# define WAIT_ANY -1 #endif -// Structs +/* Structs */ typedef struct { - int nmsgs; // Number of messages to send - int nprocs; // Number of processes to start - int nthreads; // Number of threads to start - int delay; // Delay between logs messages for each process - int delay_fudge; // Fudge the delay by 0-n to cause desynchronization + int nmsgs; /* Number of messages to send */ + int nprocs; /* Number of processes to start */ + int nthreads; /* Number of threads to start */ + int delay; /* Delay between logs messages for each process */ + int delay_fudge; /* Fudge the delay by 0-n to cause desynchronization */ } s_parameters; typedef struct { - s_parameters params; - DltContext ctx; + s_parameters params; + DltContext ctx; } s_thread_data; -// Forward declarations -void init_params(s_parameters * params); +/* Forward declarations */ +void init_params(s_parameters *params); void quit_handler(int signum); void cleanup(); void do_forks(s_parameters params); @@ -89,10 +89,10 @@ void run_threads(s_parameters params); void do_logging(s_thread_data *data); int wait_for_death(); -// State information +/* State information */ volatile sig_atomic_t in_handler = 0; -// Globals for cleanup from main and signal handler +/* Globals for cleanup from main and signal handler */ pid_t pids[MAX_PROCS]; unsigned int pidcount = 0; @@ -102,7 +102,7 @@ unsigned int pidcount = 0; void usage(char *prog_name) { char version[255]; - dlt_get_version(version,255); + dlt_get_version(version, 255); s_parameters defaults; init_params(&defaults); @@ -120,12 +120,13 @@ void usage(char *prog_name) /** * Set nice default values for parameters */ -void init_params(s_parameters * params) { - params->nmsgs = 100; - params->nprocs = 10; - params->nthreads = 2; - params->delay = 1000; - params->delay_fudge = 100; +void init_params(s_parameters *params) +{ + params->nmsgs = 100; + params->nprocs = 10; + params->nthreads = 2; + params->delay = 1000; + params->delay_fudge = 100; } /** @@ -135,55 +136,52 @@ int read_cli(s_parameters *params, int argc, char **argv) { int c; opterr = 0; + while ((c = getopt (argc, argv, "m:p:t:d:f:")) != -1) - { - switch(c) - { - case 'm': - params->nmsgs = atoi(optarg); - break; - case 'p': - params->nprocs = atoi(optarg); - if(params->nprocs > MAX_PROCS) - { - fprintf(stderr, "Too many processes selected.\n"); - return -1; - } - break; - case 't': - params->nthreads = atoi(optarg); - if(params->nprocs > MAX_PROCS) - { - fprintf(stderr, "Too many threads selected.\n"); - return -1; - } - break; - case 'd': - params->delay = atoi(optarg); - break; - case 'f': - params->delay_fudge = atoi(optarg); - break; - case '?': - if(optopt == 'n' || optopt == 'd' || optopt == 'f') - { - fprintf(stderr, "Option -%c requires an argument.\n", optopt); - } - else if(isprint(optopt)) - { - fprintf(stderr, "Unknown option '-%c'.\n", optopt); - } - else - { - fprintf(stderr, "Unknown option character '\\x%x'.\n", optopt); - } + switch (c) { + case 'm': + params->nmsgs = atoi(optarg); + break; + case 'p': + params->nprocs = atoi(optarg); + + if (params->nprocs > MAX_PROCS) { + fprintf(stderr, "Too many processes selected.\n"); return -1; - break; - default: - abort(); - return -1;//for parasoft + } + + break; + case 't': + params->nthreads = atoi(optarg); + + if (params->nprocs > MAX_PROCS) { + fprintf(stderr, "Too many threads selected.\n"); + return -1; + } + + break; + case 'd': + params->delay = atoi(optarg); + break; + case 'f': + params->delay_fudge = atoi(optarg); + break; + case '?': + + if ((optopt == 'n') || (optopt == 'd') || (optopt == 'f')) + fprintf(stderr, "Option -%c requires an argument.\n", optopt); + else if (isprint(optopt)) + fprintf(stderr, "Unknown option '-%c'.\n", optopt); + else + fprintf(stderr, "Unknown option character '\\x%x'.\n", optopt); + + return -1; + break; + default: + abort(); + return -1; /*for parasoft */ } - } + return 0; } @@ -192,24 +190,27 @@ int read_cli(s_parameters *params, int argc, char **argv) */ int main(int argc, char **argv) { - // Prepare parameters + /* Prepare parameters */ s_parameters params; init_params(¶ms); - if(read_cli(¶ms, argc, argv) != 0) { + + if (read_cli(¶ms, argc, argv) != 0) { usage(argv[0]); exit(-1); } - // Launch the child processes + /* Launch the child processes */ do_forks(params); - // Register signal handlers - if(signal(SIGINT, quit_handler) == SIG_IGN) - signal(SIGINT, SIG_IGN); // C-c - if(signal(SIGHUP, quit_handler) == SIG_IGN) - signal(SIGHUP, SIG_IGN); // Terminal closed - if(signal(SIGTERM, quit_handler) == SIG_IGN) - signal(SIGTERM, SIG_IGN); // kill (nice) + /* Register signal handlers */ + if (signal(SIGINT, quit_handler) == SIG_IGN) + signal(SIGINT, SIG_IGN); /* C-c */ + + if (signal(SIGHUP, quit_handler) == SIG_IGN) + signal(SIGHUP, SIG_IGN); /* Terminal closed */ + + if (signal(SIGTERM, quit_handler) == SIG_IGN) + signal(SIGTERM, SIG_IGN); /* kill (nice) */ printf("Setup done. Listening. My pid: %d\n", getpid()); fflush(stdout); @@ -227,30 +228,30 @@ void do_forks(s_parameters params) { int i; - // Launch child processes - for(i=0;i<params.nprocs;i++) - { + /* Launch child processes */ + for (i = 0; i < params.nprocs; i++) { pid_t pid = fork(); - switch(pid) - { - case -1: // An error occured - if(errno == EAGAIN) - { + + switch (pid) { + case -1: /* An error occured */ + + if (errno == EAGAIN) { fprintf(stderr, "Could not allocate resources for child process.\n"); cleanup(); abort(); } - if(errno == ENOMEM) - { + + if (errno == ENOMEM) { fprintf(stderr, "Could not allocate memory for child process' kernel structure.\n"); cleanup(); abort(); } + break; - case 0: // Child process, start threads + case 0: /* Child process, start threads */ run_threads(params); break; - default: // Parent process, store the childs pid + default: /* Parent process, store the childs pid */ pids[pidcount++] = pid; break; } @@ -263,8 +264,9 @@ void do_forks(s_parameters params) */ void quit_handler(int signum) { - if(in_handler) + if (in_handler) raise(signum); + in_handler = 1; cleanup(); @@ -279,10 +281,9 @@ void quit_handler(int signum) void cleanup() { unsigned int i; - for(i=0;i<pidcount;i++) - { + + for (i = 0; i < pidcount; i++) kill(pids[i], SIGINT); - } } /** @@ -291,9 +292,9 @@ void cleanup() time_t mksleep_time(int delay, int fudge) { if (!fudge) - return delay*1000; + return delay * 1000; else - return (delay+rand()%fudge)*1000; + return (delay + rand() % fudge) * 1000; } /** @@ -301,21 +302,22 @@ time_t mksleep_time(int delay, int fudge) */ void do_logging(s_thread_data *data) { - DltContext mycontext; - char ctid[5]; - char ctid_name[256]; + DltContext mycontext; + char ctid[5]; + char ctid_name[256]; - snprintf(ctid,5,"%.2x", rand() & 0x0000ffff); - snprintf(ctid_name,256, "Child %s in dlt-test-multi-process", ctid); + snprintf(ctid, 5, "%.2x", rand() & 0x0000ffff); + snprintf(ctid_name, 256, "Child %s in dlt-test-multi-process", ctid); DLT_REGISTER_CONTEXT(mycontext, ctid, ctid_name); int msgs_left = data->params.nmsgs; - while(msgs_left-- > 0) - { + + while (msgs_left-- > 0) { DLT_LOG(mycontext, DLT_LOG_INFO, DLT_STRING(PAYLOAD_DATA)); usleep(mksleep_time(data->params.delay, data->params.delay_fudge)); } + DLT_UNREGISTER_CONTEXT(mycontext); } @@ -324,38 +326,34 @@ void do_logging(s_thread_data *data) */ void run_threads(s_parameters params) { - pthread_t thread[params.nthreads]; - s_thread_data thread_data; - char apid[5]; - char apid_name[256]; - int i; + pthread_t thread[params.nthreads]; + s_thread_data thread_data; + char apid[5]; + char apid_name[256]; + int i; srand(getpid()); - snprintf(apid,5,"MT%02u", pidcount); - snprintf(apid_name,256, "Apps %s.", apid); + snprintf(apid, 5, "MT%02u", pidcount); + snprintf(apid_name, 256, "Apps %s.", apid); DLT_REGISTER_APP(apid, apid_name); - thread_data.params = params; + thread_data.params = params; - for(i=0;i<params.nthreads;i++) - { - if(pthread_create(&(thread[i]), NULL, (void *) &do_logging, &thread_data) != 0) - { + for (i = 0; i < params.nthreads; i++) + if (pthread_create(&(thread[i]), NULL, (void *)&do_logging, &thread_data) != 0) { printf("Error creating thread.\n"); abort(); } - } - for(i=0;i<params.nthreads;i++) - { - pthread_join(thread[i], NULL); - } + for (i = 0; i < params.nthreads; i++) + pthread_join(thread[i], NULL); + DLT_UNREGISTER_APP(); - // We can exit now + /* We can exit now */ exit(0); } @@ -365,26 +363,24 @@ void run_threads(s_parameters params) int wait_for_death() { int pids_left = pidcount; - while(pids_left > 0) - { + + while (pids_left > 0) { int status; pid_t w = waitpid(WAIT_ANY, &status, 0); - if(status < 0) - { + + if (status < 0) { return -1; } - else - { + else { unsigned int i; - for(i=0;i<pidcount;i++) - { - if(pids[i] == w) - { + + for (i = 0; i < pidcount; i++) + if (pids[i] == w) { pids_left--; break; } - } } } + return 0; } diff --git a/src/tests/dlt-test-stress-client.c b/src/tests/dlt-test-stress-client.c index 8a9e2ba..e2d0cfa 100644 --- a/src/tests/dlt-test-stress-client.c +++ b/src/tests/dlt-test-stress-client.c @@ -63,8 +63,8 @@ * $LastChangedRevision: 1670 $ * $LastChangedDate: 2011-04-08 15:12:06 +0200 (Fr, 08. Apr 2011) $ * $LastChangedBy$ - Initials Date Comment - aw 13.01.2010 initial + * Initials Date Comment + * aw 13.01.2010 initial */ #include <ctype.h> /* for isprint() */ @@ -117,7 +117,7 @@ typedef struct int sock; - // test values + /* test values */ unsigned long bytes_received; unsigned long time_elapsed; int last_value; @@ -133,7 +133,7 @@ void usage() { char version[255]; - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: dlt-test-stress-client [options] hostname/serial_device_name\n"); printf("Test against received data from dlt-test-stress-user.\n"); @@ -156,11 +156,11 @@ void usage() /** * Main function of tool. */ -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { - DltClient dltclient; + DltClient dltclient; DltTestclientData dltdata; - int c,i; + int c, i; int index; /* Initialize dltclient */ @@ -178,14 +178,13 @@ int main(int argc, char* argv[]) dltdata.evalue = 0; dltdata.bvalue = 0; dltdata.nvalue = 10000; - dltdata.ohandle= -1; + dltdata.ohandle = -1; dltdata.running_test = 0; - for (i=0;i<DLT_TESTCLIENT_NUM_TESTS;i++) - { - dltdata.test_counter_macro[i]=0; - dltdata.test_counter_function[i]=0; + for (i = 0; i < DLT_TESTCLIENT_NUM_TESTS; i++) { + dltdata.test_counter_macro[i] = 0; + dltdata.test_counter_function[i] = 0; } dltdata.tests_passed = 0; @@ -205,9 +204,7 @@ int main(int argc, char* argv[]) opterr = 0; while ((c = getopt (argc, argv, "vashyxmf:o:e:b:n:")) != -1) - { - switch (c) - { + switch (c) { case 'v': { dltdata.vflag = 1; @@ -270,18 +267,13 @@ int main(int argc, char* argv[]) } case '?': { - if (optopt == 'o' || optopt == 'f' || optopt == 't') - { + if ((optopt == 'o') || (optopt == 'f') || (optopt == 't')) fprintf (stderr, "Option -%c requires an argument.\n", optopt); - } else if (isprint (optopt)) - { fprintf (stderr, "Unknown option `-%c'.\n", optopt); - } else - { - fprintf (stderr, "Unknown option character `\\x%x'.\n",optopt); - } + fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt); + /* unknown or wrong option used, show usage information and terminate */ usage(); return -1; @@ -289,10 +281,9 @@ int main(int argc, char* argv[]) default: { abort (); - return -1;//for parasoft + return -1;/*for parasoft */ } } - } /* Initialize DLT Client */ dlt_client_init(&dltclient, dltdata.vflag); @@ -303,108 +294,91 @@ int main(int argc, char* argv[]) /* Setup DLT Client structure */ dltclient.mode = dltdata.yflag; - if (dltclient.mode==0) - { + if (dltclient.mode == 0) { for (index = optind; index < argc; index++) - { - if(dlt_client_set_server_ip(&dltclient, argv[index]) == -1) - { - fprintf(stderr,"set server ip didn't succeed\n"); + if (dlt_client_set_server_ip(&dltclient, argv[index]) == -1) { + fprintf(stderr, "set server ip didn't succeed\n"); return -1; } - } - if (dltclient.servIP == 0) - { + + + if (dltclient.servIP == 0) { /* no hostname selected, show usage and terminate */ - fprintf(stderr,"ERROR: No hostname selected\n"); + fprintf(stderr, "ERROR: No hostname selected\n"); usage(); - dlt_client_cleanup(&dltclient,dltdata.vflag); + dlt_client_cleanup(&dltclient, dltdata.vflag); return -1; } } - else - { + else { for (index = optind; index < argc; index++) - { - if(dlt_client_set_serial_device(&dltclient, argv[index]) == -1) - { - fprintf(stderr,"set serial device didn't succeed\n"); + if (dlt_client_set_serial_device(&dltclient, argv[index]) == -1) { + fprintf(stderr, "set serial device didn't succeed\n"); return -1; } - } - if (dltclient.serialDevice == 0) - { + + + if (dltclient.serialDevice == 0) { /* no serial device name selected, show usage and terminate */ - fprintf(stderr,"ERROR: No serial device name specified\n"); + fprintf(stderr, "ERROR: No serial device name specified\n"); usage(); return -1; } - dlt_client_setbaudrate(&dltclient,dltdata.bvalue); + dlt_client_setbaudrate(&dltclient, dltdata.bvalue); } /* initialise structure to use DLT file */ - dlt_file_init(&(dltdata.file),dltdata.vflag); + dlt_file_init(&(dltdata.file), dltdata.vflag); /* first parse filter file if filter parameter is used */ - dlt_filter_init(&(dltdata.filter),dltdata.vflag); + dlt_filter_init(&(dltdata.filter), dltdata.vflag); - if (dltdata.fvalue) - { - if (dlt_filter_load(&(dltdata.filter),dltdata.fvalue,dltdata.vflag) < DLT_RETURN_OK) - { - dlt_file_free(&(dltdata.file),dltdata.vflag); + if (dltdata.fvalue) { + if (dlt_filter_load(&(dltdata.filter), dltdata.fvalue, dltdata.vflag) < DLT_RETURN_OK) { + dlt_file_free(&(dltdata.file), dltdata.vflag); return -1; } - dlt_file_set_filter(&(dltdata.file),&(dltdata.filter),dltdata.vflag); + dlt_file_set_filter(&(dltdata.file), &(dltdata.filter), dltdata.vflag); } /* open DLT output file */ - if (dltdata.ovalue) - { - dltdata.ohandle = open(dltdata.ovalue,O_WRONLY|O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); /* mode: wb */ + if (dltdata.ovalue) { + dltdata.ohandle = open(dltdata.ovalue, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); /* mode: wb */ - if (dltdata.ohandle == -1) - { - dlt_file_free(&(dltdata.file),dltdata.vflag); - fprintf(stderr,"ERROR: Output file %s cannot be opened!\n",dltdata.ovalue); + if (dltdata.ohandle == -1) { + dlt_file_free(&(dltdata.file), dltdata.vflag); + fprintf(stderr, "ERROR: Output file %s cannot be opened!\n", dltdata.ovalue); return -1; } } if (dltdata.evalue) - { - dlt_set_id(dltdata.ecuid,dltdata.evalue); - } + dlt_set_id(dltdata.ecuid, dltdata.evalue); else - { - dlt_set_id(dltdata.ecuid,DLT_TESTCLIENT_ECU_ID); - } + dlt_set_id(dltdata.ecuid, DLT_TESTCLIENT_ECU_ID); /* Connect to TCP socket or open serial device */ - if (dlt_client_connect(&dltclient, dltdata.vflag) != DLT_RETURN_ERROR) - { + if (dlt_client_connect(&dltclient, dltdata.vflag) != DLT_RETURN_ERROR) { dltdata.sock = dltclient.sock; /* Dlt Client Main Loop */ dlt_client_main_loop(&dltclient, &dltdata, dltdata.vflag); /* Dlt Client Cleanup */ - dlt_client_cleanup(&dltclient,dltdata.vflag); + dlt_client_cleanup(&dltclient, dltdata.vflag); } /* dlt-receive cleanup */ if (dltdata.ovalue) - { close(dltdata.ohandle); - } - dlt_file_free(&(dltdata.file),dltdata.vflag); + dlt_file_free(&(dltdata.file), dltdata.vflag); - dlt_filter_free(&(dltdata.filter),dltdata.vflag); + dlt_filter_free(&(dltdata.filter), dltdata.vflag); return 0; } @@ -415,7 +389,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) DltTestclientData *dltdata; uint32_t type_info, type_info_tmp; - int16_t length,length_tmp; /* the macro can set this variable to -1 */ + int16_t length, length_tmp; /* the macro can set this variable to -1 */ uint8_t *ptr; int32_t datalength; int32_t value; @@ -424,122 +398,109 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) struct iovec iov[2]; int bytes_written; - if ((message==0) || (data==0)) - { + if ((message == 0) || (data == 0)) return -1; - } - dltdata = (DltTestclientData*)data; + dltdata = (DltTestclientData *)data; /* prepare storage header */ if (DLT_IS_HTYP_WEID(message->standardheader->htyp)) - { - dlt_set_storageheader(message->storageheader,message->headerextra.ecu); - } + dlt_set_storageheader(message->storageheader, message->headerextra.ecu); else - { - dlt_set_storageheader(message->storageheader,dltdata->ecuid); - } + dlt_set_storageheader(message->storageheader, dltdata->ecuid); - if ((dltdata->fvalue==0) || (dltdata->fvalue && dlt_message_filter_check(message,&(dltdata->filter),dltdata->vflag) == DLT_RETURN_TRUE)) - { + if ((dltdata->fvalue == 0) || + (dltdata->fvalue && + (dlt_message_filter_check(message, &(dltdata->filter), dltdata->vflag) == DLT_RETURN_TRUE))) { - //dlt_message_header(message,text,sizeof(text),dltdata->vflag); - if (dltdata->aflag) - { - //printf("%s ",text); + /*dlt_message_header(message,text,sizeof(text),dltdata->vflag); */ + if (dltdata->aflag) { + /*printf("%s ",text); */ } - //dlt_message_payload(message,text,sizeof(text),DLT_OUTPUT_ASCII,dltdata->vflag); - if (dltdata->aflag) - { - //printf("[%s]\n",text); + + /*dlt_message_payload(message,text,sizeof(text),DLT_OUTPUT_ASCII,dltdata->vflag); */ + if (dltdata->aflag) { + /*printf("[%s]\n",text); */ } /* do something here */ - // Count number of received bytes - dltdata->bytes_received += message->datasize+message->headersize-sizeof(DltStorageHeader); + /* Count number of received bytes */ + dltdata->bytes_received += message->datasize + message->headersize - sizeof(DltStorageHeader); - // print number of received bytes - if((dlt_uptime() - dltdata->time_elapsed) > 10000) - { - printf("Received %lu Bytes/s\n",dltdata->bytes_received/**10000/(dlt_uptime()-dltdata->time_elapsed)*/); - //printf("Received %lu Bytes received\n",dltdata->bytes_received); + /* print number of received bytes */ + if ((dlt_uptime() - dltdata->time_elapsed) > 10000) { + printf("Received %lu Bytes/s\n", dltdata->bytes_received /**10000/(dlt_uptime()-dltdata->time_elapsed)*/); + /*printf("Received %lu Bytes received\n",dltdata->bytes_received); */ dltdata->time_elapsed = dlt_uptime(); dltdata->bytes_received = 0; } /* Extended header */ - if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) - { + if (DLT_IS_HTYP_UEH(message->standardheader->htyp)) { /* Log message */ - if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin))==DLT_TYPE_LOG) - { + if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_LOG) { /* Verbose */ - if (DLT_IS_MSIN_VERB(message->extendedheader->msin)) - { + if (DLT_IS_MSIN_VERB(message->extendedheader->msin)) { /* 2 arguments */ - if (message->extendedheader->noar==2) - { + if (message->extendedheader->noar == 2) { /* verbose mode */ - type_info=0; - type_info_tmp=0; - length=0; - length_tmp=0; /* the macro can set this variable to -1 */ + type_info = 0; + type_info_tmp = 0; + length = 0; + length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; datalength = message->datasize; /* first read the type info of the first argument: must be string */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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_SINT) - { + if (type_info & DLT_TYPE_INFO_SINT) { /* read value */ - DLT_MSG_READ_VALUE(value_tmp,ptr,datalength,int32_t); - value=DLT_ENDIAN_GET_32(message->standardheader->htyp, value_tmp); - //printf("%d\n",value); - - if(value < dltdata->last_value) - { - if(dltdata->nvalue == dltdata->count_received_messages) - printf("PASSED: %d Msg received, %d not received\n",dltdata->count_received_messages,dltdata->count_not_received_messages); + DLT_MSG_READ_VALUE(value_tmp, ptr, datalength, int32_t); + value = DLT_ENDIAN_GET_32(message->standardheader->htyp, value_tmp); + /*printf("%d\n",value); */ + + if (value < dltdata->last_value) { + if (dltdata->nvalue == dltdata->count_received_messages) + printf("PASSED: %d Msg received, %d not received\n", + dltdata->count_received_messages, + dltdata->count_not_received_messages); else - printf("FAILED: %d Msg received, %d not received\n",dltdata->count_received_messages,dltdata->count_not_received_messages); + printf("FAILED: %d Msg received, %d not received\n", + dltdata->count_received_messages, + dltdata->count_not_received_messages); dltdata->last_value = 0; dltdata->count_received_messages = 0; - dltdata->count_not_received_messages = value -1; + dltdata->count_not_received_messages = value - 1; } - else - { - dltdata->count_not_received_messages += value - dltdata->last_value -1; + else { + dltdata->count_not_received_messages += value - dltdata->last_value - 1; } + dltdata->last_value = value; dltdata->count_received_messages++; - if (length>=0) - { - ptr+=length; - datalength-=length; + if (length >= 0) { + ptr += length; + datalength -= length; /* read type of second argument: must be raw */ - DLT_MSG_READ_VALUE(type_info_tmp,ptr,datalength,uint32_t); - type_info=DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp); + 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_RAWD) - { + if (type_info & DLT_TYPE_INFO_RAWD) { /* get length of raw data block */ - DLT_MSG_READ_VALUE(length_tmp,ptr,datalength,uint16_t); - length=DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); + DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); + length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - if ((length>=0) && (length==datalength)) - { - //printf("Raw data found in payload, length="); - //printf("%d, datalength=%d \n", length, datalength); + if ((length >= 0) && (length == datalength)) + /*printf("Raw data found in payload, length="); */ + /*printf("%d, datalength=%d \n", length, datalength); */ dltdata->test_counter_macro[3]++; - } } } } @@ -550,30 +511,24 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) /* if no filter set or filter is matching display message */ if (dltdata->xflag) - { - dlt_message_print_hex(message,text,DLT_TESTCLIENT_TEXTBUFSIZE,dltdata->vflag); - } + dlt_message_print_hex(message, text, DLT_TESTCLIENT_TEXTBUFSIZE, dltdata->vflag); else if (dltdata->mflag) - { - dlt_message_print_mixed_plain(message,text,DLT_TESTCLIENT_TEXTBUFSIZE,dltdata->vflag); - } + dlt_message_print_mixed_plain(message, text, DLT_TESTCLIENT_TEXTBUFSIZE, dltdata->vflag); else if (dltdata->sflag) - { - dlt_message_print_header(message,text,sizeof(text),dltdata->vflag); - } + dlt_message_print_header(message, text, sizeof(text), dltdata->vflag); /* if file output enabled write message */ - if (dltdata->ovalue) - { + if (dltdata->ovalue) { iov[0].iov_base = message->headerbuffer; iov[0].iov_len = message->headersize; iov[1].iov_base = message->databuffer; iov[1].iov_len = message->datasize; bytes_written = writev(dltdata->ohandle, iov, 2); - if (0 > bytes_written){ - printf("dlt_testclient_message_callback, error when: writev(dltdata->ohandle, iov, 2) \n"); - return -1; + + if (0 > bytes_written) { + printf("dlt_testclient_message_callback, error when: writev(dltdata->ohandle, iov, 2) \n"); + return -1; } } } diff --git a/src/tests/dlt-test-stress-user.c b/src/tests/dlt-test-stress-user.c index 6fe73d9..5cd3a65 100644 --- a/src/tests/dlt-test-stress-user.c +++ b/src/tests/dlt-test-stress-user.c @@ -64,8 +64,8 @@ * $LastChangedRevision: 1670 $ * $LastChangedDate: 2011-04-08 15:12:06 +0200 (Fr, 08. Apr 2011) $ * $LastChangedBy$ - Initials Date Comment - aw 13.01.2010 initial + * Initials Date Comment + * aw 13.01.2010 initial */ #include <stdio.h> /* for printf() and fprintf() */ @@ -80,7 +80,7 @@ /* Test functions... */ -int testall(int count,int repeat,int delay,int size); +int testall(int count, int repeat, int delay, int size); /* Context declaration.. */ DLT_DECLARE_CONTEXT(context_info) @@ -102,7 +102,7 @@ void usage() { char version[255]; - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: dlt-test-stress-user [options]\n"); printf("Test user application providing Test messages.\n"); @@ -119,9 +119,9 @@ void usage() /** * Main function of tool. */ -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { - //int vflag = 0; + /*int vflag = 0; */ char *fvalue = 0; int nvalue = 10000; int rvalue = 100; @@ -133,12 +133,10 @@ int main(int argc, char* argv[]) opterr = 0; while ((c = getopt (argc, argv, "vf:n:r:d:s:")) != -1) - { - switch (c) - { + switch (c) { case 'v': { - //vflag = 1; + /*vflag = 1; */ break; } case 'f': @@ -168,18 +166,14 @@ int main(int argc, char* argv[]) } case '?': { - if (optopt == 'd' || optopt == 'f' || optopt == 'n' || optopt == 'r' || optopt == 'd' || optopt == 's') - { + if ((optopt == 'd') || (optopt == 'f') || (optopt == 'n') || (optopt == 'r') || (optopt == 'd') || + (optopt == 's')) fprintf (stderr, "Option -%c requires an argument.\n", optopt); - } else if (isprint (optopt)) - { fprintf (stderr, "Unknown option `-%c'.\n", optopt); - } else - { - fprintf (stderr, "Unknown option character `\\x%x'.\n",optopt); - } + fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt); + /* unknown or wrong option used, show usage information and terminate */ usage(); return -1; @@ -187,41 +181,39 @@ int main(int argc, char* argv[]) default: { abort (); - return -1;//for parasoft + return -1;/*for parasoft */ } } - } - if (fvalue) - { + + + if (fvalue) { /* DLT is intialised automatically, except another output target will be used */ - if (dlt_init_file(fvalue)<0) /* log to file */ - { + if (dlt_init_file(fvalue) < 0) /* log to file */ return -1; - } } /* Register APP */ - DLT_REGISTER_APP("DIFT","DLT Interface Test"); + DLT_REGISTER_APP("DIFT", "DLT Interface Test"); /* Register CONTEXTS... */ - DLT_REGISTER_CONTEXT(context_info,"INFO","Information context"); + DLT_REGISTER_CONTEXT(context_info, "INFO", "Information context"); /* Tests starting */ printf("Tests starting\n"); - //DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Tests starting")); + /*DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Tests starting")); */ /* wait 3 seconds before starting */ - //sleep(3); + /*sleep(3); */ - testall(nvalue,rvalue,dvalue,svalue); + testall(nvalue, rvalue, dvalue, svalue); /* Tests finished */ printf("Tests finished\n"); - //DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Tests finished")); + /*DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Tests finished")); */ /* wait 3 seconds before terminating application */ - //sleep(3); + /*sleep(3); */ /* Unregister CONTEXTS... */ DLT_UNREGISTER_CONTEXT(context_info); @@ -236,32 +228,27 @@ int main(int argc, char* argv[]) /* The test cases */ /******************/ -int testall(int count,int repeat,int delay,int size) +int testall(int count, int repeat, int delay, int size) { char buffer[size]; - int num,rnum; + int num, rnum; - for(num=0;num< size;num++) - { + for (num = 0; num < size; num++) buffer[num] = num; - } /* Test All: Test all start */ - //printf("Test1: Test all\n"); - //DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test1: Test all")); + /*printf("Test1: Test all\n"); */ + /*DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test1: Test all")); */ - for(rnum=0;rnum<repeat;rnum++) - { - for(num=1;num<=count;num++) - { - DLT_LOG(context_info,DLT_LOG_INFO,DLT_INT(num),DLT_RAW(buffer, size)); + for (rnum = 0; rnum < repeat; rnum++) + for (num = 1; num <= count; num++) { + DLT_LOG(context_info, DLT_LOG_INFO, DLT_INT(num), DLT_RAW(buffer, size)); usleep(delay); } - } /* wait 5 seconds after test */ - //sleep(5); - //DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test1: finished")); + /*sleep(5); */ + /*DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test1: finished")); */ return 0; } diff --git a/src/tests/dlt-test-stress.c b/src/tests/dlt-test-stress.c index 14067f1..ddfe937 100644 --- a/src/tests/dlt-test-stress.c +++ b/src/tests/dlt-test-stress.c @@ -64,8 +64,8 @@ * $LastChangedRevision: 1670 $ * $LastChangedDate: 2011-04-08 15:12:06 +0200 (Fr, 08. Apr 2011) $ * $LastChangedBy$ - Initials Date Comment - aw 13.01.2010 initial + * Initials Date Comment + * aw 13.01.2010 initial */ #include <netdb.h> #include <ctype.h> /* for isprint() */ @@ -106,7 +106,7 @@ void usage() { char version[255]; - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: dlt-test-stress [options]\n"); printf("Test application executing several stress tests.\n"); @@ -122,28 +122,24 @@ void usage() /** * Main function of tool. */ -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { - //int vflag = 0; + /*int vflag = 0; */ char *fvalue = 0; int test[MAX_TESTS]; - int i,c,help; + int i, c, help; - for (i=0;i<MAX_TESTS;i++) - { - test[i]=0; - } + for (i = 0; i < MAX_TESTS; i++) + test[i] = 0; opterr = 0; while ((c = getopt (argc, argv, "vf:123")) != -1) - { - switch (c) - { + switch (c) { case 'v': { - //vflag = 1; + /*vflag = 1; */ break; } case 'f': @@ -169,17 +165,12 @@ int main(int argc, char* argv[]) case '?': { if (optopt == 'f') - { fprintf (stderr, "Option -%c requires an argument.\n", optopt); - } else if (isprint (optopt)) - { fprintf (stderr, "Unknown option `-%c'.\n", optopt); - } else - { - fprintf (stderr, "Unknown option character `\\x%x'.\n",optopt); - } + fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt); + /* unknown or wrong option used, show usage information and terminate */ usage(); return -1; @@ -187,50 +178,43 @@ int main(int argc, char* argv[]) default: { abort (); - return -1;//for parasoft + return -1;/*for parasoft */ } } - } - if (fvalue) - { + + + if (fvalue) { /* DLT is intialised automatically, except another output target will be used */ - if (dlt_init_file(fvalue)<0) /* log to file */ - { + if (dlt_init_file(fvalue) < 0) /* log to file */ return -1; - } } - help=0; - for (i=0;i<MAX_TESTS;i++) - { - if (test[i]==1) - { - help=1; + help = 0; + + for (i = 0; i < MAX_TESTS; i++) + if (test[i] == 1) { + help = 1; break; } - } - if (help==0) - { + + + if (help == 0) { usage(); return -1; } - DLT_REGISTER_APP("DSTS","DLT daemon stress tests"); + DLT_REGISTER_APP("DSTS", "DLT daemon stress tests"); if (test[0]) - { stress1(); - } + if (test[1]) - { stress2(); - } + if (test[2]) - { stress3(); - } DLT_UNREGISTER_APP(); @@ -241,39 +225,35 @@ int main(int argc, char* argv[]) void stress1(void) { - int i,c; + int i, c; char ctid[5]; printf("Starting stress test1... (press \"Enter\" to terminate test) \n"); - printf("* Register %d contexts...\n",STRESS1_NUM_CONTEXTS); + printf("* Register %d contexts...\n", STRESS1_NUM_CONTEXTS); - for (i=0; i<STRESS1_NUM_CONTEXTS; i++) - { + for (i = 0; i < STRESS1_NUM_CONTEXTS; i++) { /* Generate id */ - memset(ctid,0,5); - snprintf(ctid,5,"%d",i); + memset(ctid, 0, 5); + snprintf(ctid, 5, "%d", i); - //printf("%i: '%s' \n",i,ctid); + /*printf("%i: '%s' \n",i,ctid); */ - dlt_register_context(&(mycontext[i]),ctid,ctid); + dlt_register_context(&(mycontext[i]), ctid, ctid); usleep(500); } - while (1) - { - c=getchar(); + while (1) { + c = getchar(); + /* if "Return" is pressed, exit loop; */ - if (c==10) - { + if (c == 10) break; - } } - printf("* Unregister %d contexts...\n",STRESS1_NUM_CONTEXTS); + printf("* Unregister %d contexts...\n", STRESS1_NUM_CONTEXTS); - for (i=0; i<STRESS1_NUM_CONTEXTS; i++) - { + for (i = 0; i < STRESS1_NUM_CONTEXTS; i++) { DLT_UNREGISTER_CONTEXT(mycontext[i]); usleep(500); } @@ -283,7 +263,7 @@ void stress1(void) void stress2(void) { - int ret,index; + int ret, index; pthread_t thread[STRESS2_MAX_NUM_THREADS]; thread_data_t thread_data[STRESS2_MAX_NUM_THREADS]; @@ -292,47 +272,43 @@ void stress2(void) srand(time(NULL)); - printf("* Creating %d Threads, each of them registers one context,\n",STRESS2_MAX_NUM_THREADS); + printf("* Creating %d Threads, each of them registers one context,\n", STRESS2_MAX_NUM_THREADS); printf(" sending one log message, then unregisters the context\n"); - for (index=0;index<STRESS2_MAX_NUM_THREADS;index++) - { + for (index = 0; index < STRESS2_MAX_NUM_THREADS; index++) { thread_data[index].num = index; - ret=pthread_create(&(thread[index]), NULL, (void *) &thread_function, (void *) &(thread_data[index])); - if (ret!=0) - { + ret = pthread_create(&(thread[index]), NULL, (void *)&thread_function, (void *)&(thread_data[index])); + + if (ret != 0) printf("Error creating thread %d: %s \n", index, strerror(errno)); - } usleep(1000); } - for (index=0;index<STRESS2_MAX_NUM_THREADS;index++) - { + for (index = 0; index < STRESS2_MAX_NUM_THREADS; index++) pthread_join(thread[index], NULL); - } printf("Finished stress test2 \n\n"); } void thread_function(void) { - //thread_data_t *data; + /*thread_data_t *data; */ DLT_DECLARE_CONTEXT(context_thread1); char ctid[5]; - //data = (thread_data_t *) ptr; + /*data = (thread_data_t *) ptr; */ - memset(ctid,0,5); + memset(ctid, 0, 5); /* Create random context id */ - snprintf(ctid,5,"%.2x", rand() & 0x0000ffff); + snprintf(ctid, 5, "%.2x", rand() & 0x0000ffff); - usleep(rand()/1000); + usleep(rand() / 1000); - DLT_REGISTER_CONTEXT(context_thread1,ctid,ctid); + DLT_REGISTER_CONTEXT(context_thread1, ctid, ctid); - DLT_LOG(context_thread1,DLT_LOG_INFO,DLT_STRING(ctid)); + DLT_LOG(context_thread1, DLT_LOG_INFO, DLT_STRING(ctid)); DLT_UNREGISTER_CONTEXT(context_thread1); } @@ -344,15 +320,14 @@ void stress3(void) int num; /* Performance test */ - DLT_REGISTER_CONTEXT(context_stress3,"TST3","Stress Test 3 - Performance"); + DLT_REGISTER_CONTEXT(context_stress3, "TST3", "Stress Test 3 - Performance"); printf("Starting stress test3... \n"); - printf("* Logging raw data, up to a size of %d\n",STRESS3_MAX_NUM_MESSAGES); + printf("* Logging raw data, up to a size of %d\n", STRESS3_MAX_NUM_MESSAGES); - for (num=0;num<STRESS3_MAX_NUM_MESSAGES;num++) - { + for (num = 0; num < STRESS3_MAX_NUM_MESSAGES; num++) { buffer[num] = num; - DLT_LOG(context_stress3,DLT_LOG_INFO,DLT_INT(num),DLT_RAW(buffer,num)); + DLT_LOG(context_stress3, DLT_LOG_INFO, DLT_INT(num), DLT_RAW(buffer, num)); usleep(10000); } diff --git a/src/tests/dlt-test-user.c b/src/tests/dlt-test-user.c index 9a57573..5e0fe47 100644 --- a/src/tests/dlt-test-user.c +++ b/src/tests/dlt-test-user.c @@ -64,8 +64,8 @@ * $LastChangedRevision: 1670 $ * $LastChangedDate: 2011-04-08 15:12:06 +0200 (Fr, 08. Apr 2011) $ * $LastChangedBy$ - Initials Date Comment - aw 13.01.2010 initial + * Initials Date Comment + * aw 13.01.2010 initial */ #include <stdio.h> /* for printf() and fprintf() */ @@ -79,15 +79,14 @@ #define DLT_TEST_NUM_CONTEXT 9 /* LogLevel string representation */ -static const char *loglevelstr[DLT_LOG_MAX] = -{ - "DLT_LOG_OFF", - "DLT_LOG_FATAL", - "DLT_LOG_ERROR", - "DLT_LOG_WARN", - "DLT_LOG_INFO", - "DLT_LOG_DEBUG", - "DLT_LOG_VERBOSE" +static const char *loglevelstr[DLT_LOG_MAX] = { + "DLT_LOG_OFF", + "DLT_LOG_FATAL", + "DLT_LOG_ERROR", + "DLT_LOG_WARN", + "DLT_LOG_INFO", + "DLT_LOG_DEBUG", + "DLT_LOG_VERBOSE" }; /* Test functions... */ @@ -138,7 +137,7 @@ void usage() { char version[255]; - dlt_get_version(version,255); + dlt_get_version(version, 255); printf("Usage: dlt-test-user [options]\n"); printf("Test user application providing several Tests.\n"); @@ -171,9 +170,9 @@ void usage() /** * Main function of tool. */ -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { - //int vflag = 0; + /*int vflag = 0; */ char *fvalue = 0; char *nvalue = 0; @@ -182,17 +181,15 @@ int main(int argc, char* argv[]) int i; char ctid[4], ctdesc[255]; - int num,maxnum; + int num, maxnum; opterr = 0; while ((c = getopt (argc, argv, "vf:n:")) != -1) - { - switch (c) - { + switch (c) { case 'v': { - //vflag = 1; + /*vflag = 1; */ break; } case 'f': @@ -207,18 +204,13 @@ int main(int argc, char* argv[]) } case '?': { - if (optopt == 'd' || optopt == 'f' || optopt == 'n') - { + if ((optopt == 'd') || (optopt == 'f') || (optopt == 'n')) fprintf (stderr, "Option -%c requires an argument.\n", optopt); - } else if (isprint (optopt)) - { fprintf (stderr, "Unknown option `-%c'.\n", optopt); - } else - { - fprintf (stderr, "Unknown option character `\\x%x'.\n",optopt); - } + fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt); + /* unknown or wrong option used, show usage information and terminate */ usage(); return -1; @@ -226,76 +218,70 @@ int main(int argc, char* argv[]) default: { abort (); - return -1;//for parasoft + return -1;/*for parasoft */ } } - } - if (fvalue) - { + + + if (fvalue) { /* DLT is intialised automatically, except another output target will be used */ - if (dlt_init_file(fvalue)<0) /* log to file */ - { + if (dlt_init_file(fvalue) < 0) /* log to file */ return -1; - } } if (nvalue) - { maxnum = atoi(nvalue); - } else - { maxnum = 1; - } /* Register APP */ - DLT_REGISTER_APP("DIFT","DLT Interface Test"); + DLT_REGISTER_APP("DIFT", "DLT Interface Test"); /* Register CONTEXTS... */ - DLT_REGISTER_CONTEXT(context_info,"INFO","Information context"); + DLT_REGISTER_CONTEXT(context_info, "INFO", "Information context"); /* used for macro interface tests */ - DLT_REGISTER_CONTEXT(context_macro_callback,"CBM","Callback Test context for macro interface"); - for (i=0;i<DLT_TEST_NUM_CONTEXT;i++) - { - snprintf(ctid,4,"TM%d",i+1); - snprintf(ctdesc,255,"Test %d context for macro interface",i+1); - DLT_REGISTER_CONTEXT(context_macro_test[i],ctid,ctdesc); + DLT_REGISTER_CONTEXT(context_macro_callback, "CBM", "Callback Test context for macro interface"); + + for (i = 0; i < DLT_TEST_NUM_CONTEXT; i++) { + snprintf(ctid, 4, "TM%d", i + 1); + snprintf(ctdesc, 255, "Test %d context for macro interface", i + 1); + DLT_REGISTER_CONTEXT(context_macro_test[i], ctid, ctdesc); } /* used for function interface tests */ - dlt_register_context(&context_function_callback,"CBF","Callback Test context for function interface"); - for (i=0;i<DLT_TEST_NUM_CONTEXT;i++) - { - snprintf(ctid,4,"TF%d",i+1); - snprintf(ctdesc,255,"Test %d context for function interface",i+1); - dlt_register_context(&(context_function_test[i]),ctid,ctdesc); + dlt_register_context(&context_function_callback, "CBF", "Callback Test context for function interface"); + + for (i = 0; i < DLT_TEST_NUM_CONTEXT; i++) { + snprintf(ctid, 4, "TF%d", i + 1); + snprintf(ctdesc, 255, "Test %d context for function interface", i + 1); + dlt_register_context(&(context_function_test[i]), ctid, ctdesc); } /* Register callbacks... */ /* with macro interface */ - DLT_LOG(context_macro_callback,DLT_LOG_INFO,DLT_STRING("Register callback (Macro Interface) for Injection ID: 0xFFF")); + DLT_LOG(context_macro_callback, DLT_LOG_INFO, + DLT_STRING("Register callback (Macro Interface) for Injection ID: 0xFFF")); DLT_REGISTER_INJECTION_CALLBACK(context_macro_callback, 0xFFF, test_injection_macro_callback); /* with function interface */ - if (dlt_user_log_write_start(&context_function_callback,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Register callback (Function Interface) for Injection ID: 0xFFF"); + if (dlt_user_log_write_start(&context_function_callback, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Register callback (Function Interface) for Injection ID: 0xFFF"); dlt_user_log_write_finish(&context_data); } + dlt_register_injection_callback(&context_function_callback, 0xFFF, test_injection_function_callback); /* Tests starting */ printf("Tests starting\n"); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Tests starting")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Tests starting")); /* wait 3 seconds before starting */ sleep(3); - for (num=0;num<maxnum;num++) - { + for (num = 0; num < maxnum; num++) { /* Execute tests... */ /* with macro interface */ @@ -326,7 +312,7 @@ int main(int argc, char* argv[]) /* Tests finished */ printf("Tests finished\n"); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Tests finished")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Tests finished")); /* wait 3 seconds before terminating application */ sleep(3); @@ -335,17 +321,15 @@ int main(int argc, char* argv[]) DLT_UNREGISTER_CONTEXT(context_info); /* used for macro interface tests */ - for (i=0;i<DLT_TEST_NUM_CONTEXT;i++) - { + for (i = 0; i < DLT_TEST_NUM_CONTEXT; i++) DLT_UNREGISTER_CONTEXT(context_macro_test[i]); - } + DLT_UNREGISTER_CONTEXT(context_macro_callback); /* used for function interface tests */ - for (i=0;i<DLT_TEST_NUM_CONTEXT;i++) - { + for (i = 0; i < DLT_TEST_NUM_CONTEXT; i++) dlt_unregister_context(&(context_function_test[i])); - } + dlt_unregister_context(&context_function_callback); /* Unregister APP */ @@ -362,18 +346,18 @@ int test1m(void) { /* Test 1: (Macro IF) Test all log levels */ printf("Test1m: (Macro IF) Test all log levels\n"); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test1: (Macro IF) Test all log levels")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Test1: (Macro IF) Test all log levels")); - DLT_LOG(context_macro_test[0],DLT_LOG_FATAL,DLT_STRING("fatal")); - DLT_LOG(context_macro_test[0],DLT_LOG_ERROR,DLT_STRING("error")); - DLT_LOG(context_macro_test[0],DLT_LOG_WARN,DLT_STRING("warn")); - DLT_LOG(context_macro_test[0],DLT_LOG_INFO,DLT_STRING("info")); - DLT_LOG(context_macro_test[0],DLT_LOG_DEBUG,DLT_STRING("debug")); - DLT_LOG(context_macro_test[0],DLT_LOG_VERBOSE,DLT_STRING("verbose")); + DLT_LOG(context_macro_test[0], DLT_LOG_FATAL, DLT_STRING("fatal")); + DLT_LOG(context_macro_test[0], DLT_LOG_ERROR, DLT_STRING("error")); + DLT_LOG(context_macro_test[0], DLT_LOG_WARN, DLT_STRING("warn")); + DLT_LOG(context_macro_test[0], DLT_LOG_INFO, DLT_STRING("info")); + DLT_LOG(context_macro_test[0], DLT_LOG_DEBUG, DLT_STRING("debug")); + DLT_LOG(context_macro_test[0], DLT_LOG_VERBOSE, DLT_STRING("verbose")); /* wait 2 second before next test */ sleep(2); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test1: (Macro IF) finished")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Test1: (Macro IF) finished")); return 0; } @@ -385,34 +369,32 @@ int test2m(void) /* Test 2: (Macro IF) Test all variable types (verbose) */ 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) */ - DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("int16"),DLT_INT16(INT16_MIN)); /* (-32767-1) */ - DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("int32"),DLT_INT32(INT32_MIN)); /* (-2147483647-1) */ - DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("int64"),DLT_INT64(INT64_MIN)); /* (-__INT64_C(9223372036854775807)-1) */ - DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("uint"),DLT_UINT(UINT32_MAX)); /* (4294967295U) */ - DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("uint8"),DLT_UINT8(UINT8_MAX)); /* (255) */ - DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("uint16"),DLT_UINT16(UINT16_MAX)); /* (65535) */ - DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("uint32"),DLT_UINT32(UINT32_MAX)); /* (4294967295U) */ - DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("uint64"),DLT_UINT64(UINT64_MAX)); /* (__UINT64_C(18446744073709551615)) */ - DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("float32"),DLT_FLOAT32(FLT_MIN),DLT_FLOAT32(FLT_MAX)); - DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("float64"),DLT_FLOAT64(DBL_MIN),DLT_FLOAT64(DBL_MAX)); - - for(num2=0;num2<10;num2++) - { + 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) */ + DLT_LOG(context_macro_test[1], DLT_LOG_INFO, DLT_STRING("int16"), DLT_INT16(INT16_MIN)); /* (-32767-1) */ + DLT_LOG(context_macro_test[1], DLT_LOG_INFO, DLT_STRING("int32"), DLT_INT32(INT32_MIN)); /* (-2147483647-1) */ + DLT_LOG(context_macro_test[1], DLT_LOG_INFO, DLT_STRING("int64"), DLT_INT64(INT64_MIN)); /* (-__INT64_C(9223372036854775807)-1) */ + DLT_LOG(context_macro_test[1], DLT_LOG_INFO, DLT_STRING("uint"), DLT_UINT(UINT32_MAX)); /* (4294967295U) */ + DLT_LOG(context_macro_test[1], DLT_LOG_INFO, DLT_STRING("uint8"), DLT_UINT8(UINT8_MAX)); /* (255) */ + DLT_LOG(context_macro_test[1], DLT_LOG_INFO, DLT_STRING("uint16"), DLT_UINT16(UINT16_MAX)); /* (65535) */ + DLT_LOG(context_macro_test[1], DLT_LOG_INFO, DLT_STRING("uint32"), DLT_UINT32(UINT32_MAX)); /* (4294967295U) */ + DLT_LOG(context_macro_test[1], DLT_LOG_INFO, DLT_STRING("uint64"), DLT_UINT64(UINT64_MAX)); /* (__UINT64_C(18446744073709551615)) */ + DLT_LOG(context_macro_test[1], DLT_LOG_INFO, DLT_STRING("float32"), DLT_FLOAT32(FLT_MIN), DLT_FLOAT32(FLT_MAX)); + DLT_LOG(context_macro_test[1], DLT_LOG_INFO, DLT_STRING("float64"), DLT_FLOAT64(DBL_MIN), DLT_FLOAT64(DBL_MAX)); + + for (num2 = 0; num2 < 10; num2++) buffer[num2] = num2; - } - DLT_LOG(context_macro_test[1],DLT_LOG_INFO,DLT_STRING("raw"),DLT_RAW(buffer,10)); + DLT_LOG(context_macro_test[1], DLT_LOG_INFO, DLT_STRING("raw"), DLT_RAW(buffer, 10)); /* wait 2 second before next test */ sleep(2); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test2: (Macro IF) finished")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Test2: (Macro IF) finished")); return 0; } @@ -424,38 +406,46 @@ int test3m(void) /* Test 3: (Macro IF) Test all variable types (non-verbose) */ printf("Test3m: (Macro IF) Test all variable types (non-verbose)\n"); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test3: (Macro IF) Test all variable types (non-verbose)")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Test3: (Macro IF) Test all variable types (non-verbose)")); DLT_NONVERBOSE_MODE(); - 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++) - { + 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++) buffer[num2] = num2; - } - DLT_LOG_ID(context_macro_test[2],DLT_LOG_INFO,14,DLT_STRING("raw"),DLT_RAW(buffer,10)); + + DLT_LOG_ID(context_macro_test[2], DLT_LOG_INFO, 14, DLT_STRING("raw"), DLT_RAW(buffer, 10)); DLT_VERBOSE_MODE(); /* wait 2 second before next test */ sleep(2); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test3: (Macro IF) finished")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Test3: (Macro IF) finished")); return 0; } @@ -465,23 +455,21 @@ int test4m(void) char buffer[1024]; int num; - for(num=0;num<1024;num++) - { + for (num = 0; num < 1024; num++) buffer[num] = num; - } /* Test 4: (Macro IF) Message size test */ printf("Test4m: (Macro IF) Test different message sizes\n"); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test4: (Macro IF) Test different message sizes")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Test4: (Macro IF) Test different message sizes")); - DLT_LOG(context_macro_test[3],DLT_LOG_INFO,DLT_STRING("1"),DLT_RAW(buffer,1)); - DLT_LOG(context_macro_test[3],DLT_LOG_INFO,DLT_STRING("16"),DLT_RAW(buffer,16)); - DLT_LOG(context_macro_test[3],DLT_LOG_INFO,DLT_STRING("256"),DLT_RAW(buffer,256)); - DLT_LOG(context_macro_test[3],DLT_LOG_INFO,DLT_STRING("1024"),DLT_RAW(buffer,1024)); + DLT_LOG(context_macro_test[3], DLT_LOG_INFO, DLT_STRING("1"), DLT_RAW(buffer, 1)); + DLT_LOG(context_macro_test[3], DLT_LOG_INFO, DLT_STRING("16"), DLT_RAW(buffer, 16)); + DLT_LOG(context_macro_test[3], DLT_LOG_INFO, DLT_STRING("256"), DLT_RAW(buffer, 256)); + DLT_LOG(context_macro_test[3], DLT_LOG_INFO, DLT_STRING("1024"), DLT_RAW(buffer, 1024)); /* wait 2 second before next test */ sleep(2); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test4: (Macro IF) finished")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Test4: (Macro IF) finished")); return 0; } @@ -494,58 +482,52 @@ int test5m(void) void *ptr = malloc(sizeof(int)); - for(num=0;num<32;num++) - { + for (num = 0; num < 32; num++) buffer[num] = num; - } /* Test 5: (Macro IF) Test high-level API */ printf("Test5m: (Macro IF) Test high-level API\n"); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test5: (Macro IF) Test high-level API")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Test5: (Macro IF) Test high-level API")); - DLT_LOG(context_macro_test[4],DLT_LOG_INFO,DLT_STRING("Next line: DLT_LOG_INT")); + DLT_LOG(context_macro_test[4], DLT_LOG_INFO, DLT_STRING("Next line: DLT_LOG_INT")); DLT_LOG_INT(context_macro_test[4], DLT_LOG_INFO, -42); - DLT_LOG(context_macro_test[4],DLT_LOG_INFO,DLT_STRING("Next line: DLT_LOG_UINT")); + DLT_LOG(context_macro_test[4], DLT_LOG_INFO, DLT_STRING("Next line: DLT_LOG_UINT")); DLT_LOG_UINT(context_macro_test[4], DLT_LOG_INFO, 42); - DLT_LOG(context_macro_test[4],DLT_LOG_INFO,DLT_STRING("Next line: DLT_LOG_STRING")); + DLT_LOG(context_macro_test[4], DLT_LOG_INFO, DLT_STRING("Next line: DLT_LOG_STRING")); DLT_LOG_STRING(context_macro_test[4], DLT_LOG_INFO, "String output"); - DLT_LOG(context_macro_test[4],DLT_LOG_INFO,DLT_STRING("Next line: DLT_LOG_RAW")); - DLT_LOG_RAW(context_macro_test[4],DLT_LOG_INFO, buffer,16); + DLT_LOG(context_macro_test[4], DLT_LOG_INFO, DLT_STRING("Next line: DLT_LOG_RAW")); + DLT_LOG_RAW(context_macro_test[4], DLT_LOG_INFO, buffer, 16); - DLT_LOG(context_macro_test[4],DLT_LOG_INFO,DLT_STRING("Next line: DLT_LOG_STRING_INT")); + DLT_LOG(context_macro_test[4], DLT_LOG_INFO, DLT_STRING("Next line: DLT_LOG_STRING_INT")); DLT_LOG_STRING_INT(context_macro_test[4], DLT_LOG_INFO, "String output: ", -42); - DLT_LOG(context_macro_test[4],DLT_LOG_INFO,DLT_STRING("Next line: DLT_LOG_STRING_UINT")); - DLT_LOG_STRING_UINT(context_macro_test[4], DLT_LOG_INFO,"String output: ", 42); + DLT_LOG(context_macro_test[4], DLT_LOG_INFO, DLT_STRING("Next line: DLT_LOG_STRING_UINT")); + DLT_LOG_STRING_UINT(context_macro_test[4], DLT_LOG_INFO, "String output: ", 42); - DLT_LOG(context_macro_test[4],DLT_LOG_INFO,DLT_STRING("Next line: DLT_LOG_PTR")); - DLT_LOG(context_macro_test[4],DLT_LOG_INFO,DLT_PTR(ptr)); + DLT_LOG(context_macro_test[4], DLT_LOG_INFO, DLT_STRING("Next line: DLT_LOG_PTR")); + DLT_LOG(context_macro_test[4], DLT_LOG_INFO, DLT_PTR(ptr)); - DLT_LOG(context_macro_test[4],DLT_LOG_INFO,DLT_STRING("Next lines: DLT_IS_LOG_LEVEL_ENABLED")); - for (i = DLT_LOG_FATAL; i < DLT_LOG_MAX; i++) - { - if (DLT_IS_LOG_LEVEL_ENABLED(context_macro_test[4],i)) - { + DLT_LOG(context_macro_test[4], DLT_LOG_INFO, DLT_STRING("Next lines: DLT_IS_LOG_LEVEL_ENABLED")); + + for (i = DLT_LOG_FATAL; i < DLT_LOG_MAX; i++) { + if (DLT_IS_LOG_LEVEL_ENABLED(context_macro_test[4], i)) DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Loglevel is enabled: "), DLT_STRING(loglevelstr[i])); - } else - { DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Loglevel is disabled: "), DLT_STRING(loglevelstr[i])); - } } /* wait 2 second before next test */ sleep(2); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test5: (Macro IF) finished")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Test5: (Macro IF) finished")); free(ptr); return 0; @@ -563,9 +545,9 @@ int test6m(void) DLT_DISABLE_LOCAL_PRINT(); DLT_LOG_STRING(context_macro_test[5], DLT_LOG_INFO, "Message (invisible: not locally printed)"); - /* wait 2 second before next test */ + /* wait 2 second before next test */ sleep(2); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test6: (Macro IF) finished")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Test6: (Macro IF) finished")); return 0; } @@ -575,10 +557,8 @@ int test7m(void) char buffer[32]; int num; - for(num=0;num<32;num++) - { + for (num = 0; num < 32; num++) buffer[num] = num; - } /* Show all log messages and traces */ DLT_SET_APPLICATION_LL_TS_LIMIT(DLT_LOG_VERBOSE, DLT_TRACE_STATUS_ON); @@ -595,7 +575,7 @@ int test7m(void) /* wait 2 second before next test */ sleep(2); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test7: (Macro IF) finished")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Test7: (Macro IF) finished")); DLT_SET_APPLICATION_LL_TS_LIMIT(DLT_LOG_DEFAULT, DLT_TRACE_STATUS_DEFAULT); sleep(2); @@ -605,13 +585,11 @@ int test7m(void) int test8m(void) { - char buffer[1024*5]; + char buffer[1024 * 5]; int num; - for(num=0;num<1024*5;num++) - { + for (num = 0; num < 1024 * 5; num++) buffer[num] = num; - } /* Show all log messages and traces */ DLT_SET_APPLICATION_LL_TS_LIMIT(DLT_LOG_VERBOSE, DLT_TRACE_STATUS_ON); @@ -621,14 +599,14 @@ int test8m(void) DLT_LOG_STRING(context_info, DLT_LOG_INFO, "Test 8: (Macro IF) Test truncated network trace"); /* Dummy messages: 16 byte header, 5k payload */ - DLT_TRACE_NETWORK_TRUNCATED(context_macro_test[7], DLT_NW_TRACE_IPC, 16, buffer, 1024*5, buffer); - DLT_TRACE_NETWORK_TRUNCATED(context_macro_test[7], DLT_NW_TRACE_CAN, 16, buffer, 1024*5, buffer); - DLT_TRACE_NETWORK_TRUNCATED(context_macro_test[7], DLT_NW_TRACE_FLEXRAY, 16, buffer, 1024*5, buffer); - DLT_TRACE_NETWORK_TRUNCATED(context_macro_test[7], DLT_NW_TRACE_MOST, 16, buffer, 1024*5, buffer); + DLT_TRACE_NETWORK_TRUNCATED(context_macro_test[7], DLT_NW_TRACE_IPC, 16, buffer, 1024 * 5, buffer); + DLT_TRACE_NETWORK_TRUNCATED(context_macro_test[7], DLT_NW_TRACE_CAN, 16, buffer, 1024 * 5, buffer); + DLT_TRACE_NETWORK_TRUNCATED(context_macro_test[7], DLT_NW_TRACE_FLEXRAY, 16, buffer, 1024 * 5, buffer); + DLT_TRACE_NETWORK_TRUNCATED(context_macro_test[7], DLT_NW_TRACE_MOST, 16, buffer, 1024 * 5, buffer); /* wait 2 second before next test */ sleep(2); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test8: (Macro IF) finished")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Test8: (Macro IF) finished")); DLT_SET_APPLICATION_LL_TS_LIMIT(DLT_LOG_DEFAULT, DLT_TRACE_STATUS_DEFAULT); sleep(2); @@ -638,13 +616,11 @@ int test8m(void) int test9m(void) { - char buffer[1024*5]; + char buffer[1024 * 5]; int num; - for(num=0;num<1024*5;num++) - { + for (num = 0; num < 1024 * 5; num++) buffer[num] = num; - } /* Show all log messages and traces */ DLT_SET_APPLICATION_LL_TS_LIMIT(DLT_LOG_VERBOSE, DLT_TRACE_STATUS_ON); @@ -654,14 +630,14 @@ int test9m(void) DLT_LOG_STRING(context_info, DLT_LOG_INFO, "Test 9: (Macro IF) Test segmented network trace"); /* Dummy messages: 16 byte header, 5k payload */ - DLT_TRACE_NETWORK_SEGMENTED(context_macro_test[8], DLT_NW_TRACE_IPC, 16, buffer, 1024*5, buffer); - DLT_TRACE_NETWORK_SEGMENTED(context_macro_test[8], DLT_NW_TRACE_CAN, 16, buffer, 1024*5, buffer); - DLT_TRACE_NETWORK_SEGMENTED(context_macro_test[8], DLT_NW_TRACE_FLEXRAY, 16, buffer, 1024*5, buffer); - DLT_TRACE_NETWORK_SEGMENTED(context_macro_test[8], DLT_NW_TRACE_MOST, 16, buffer, 1024*5, buffer); + DLT_TRACE_NETWORK_SEGMENTED(context_macro_test[8], DLT_NW_TRACE_IPC, 16, buffer, 1024 * 5, buffer); + DLT_TRACE_NETWORK_SEGMENTED(context_macro_test[8], DLT_NW_TRACE_CAN, 16, buffer, 1024 * 5, buffer); + DLT_TRACE_NETWORK_SEGMENTED(context_macro_test[8], DLT_NW_TRACE_FLEXRAY, 16, buffer, 1024 * 5, buffer); + DLT_TRACE_NETWORK_SEGMENTED(context_macro_test[8], DLT_NW_TRACE_MOST, 16, buffer, 1024 * 5, buffer); /* wait 2 second before next test */ sleep(2); - DLT_LOG(context_info,DLT_LOG_INFO,DLT_STRING("Test9: (Macro IF) finished")); + DLT_LOG(context_info, DLT_LOG_INFO, DLT_STRING("Test9: (Macro IF) finished")); DLT_SET_APPLICATION_LL_TS_LIMIT(DLT_LOG_DEFAULT, DLT_TRACE_STATUS_DEFAULT); sleep(2); @@ -673,48 +649,47 @@ int test1f(void) { /* Test 1: (Function IF) Test all log levels */ printf("Test1f: (Function IF) Test all log levels\n"); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test1: (Function IF) Test all log levels"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test1: (Function IF) Test all log levels"); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[0]),&context_data,DLT_LOG_FATAL)>0) - { - dlt_user_log_write_string(&context_data,"fatal"); + if (dlt_user_log_write_start(&(context_function_test[0]), &context_data, DLT_LOG_FATAL) > 0) { + dlt_user_log_write_string(&context_data, "fatal"); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[0]),&context_data,DLT_LOG_ERROR)>0) - { - dlt_user_log_write_string(&context_data,"error"); + + if (dlt_user_log_write_start(&(context_function_test[0]), &context_data, DLT_LOG_ERROR) > 0) { + dlt_user_log_write_string(&context_data, "error"); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[0]),&context_data,DLT_LOG_WARN)>0) - { - dlt_user_log_write_string(&context_data,"warn"); + + if (dlt_user_log_write_start(&(context_function_test[0]), &context_data, DLT_LOG_WARN) > 0) { + dlt_user_log_write_string(&context_data, "warn"); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[0]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"info"); + + if (dlt_user_log_write_start(&(context_function_test[0]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "info"); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[0]),&context_data,DLT_LOG_DEBUG)>0) - { - dlt_user_log_write_string(&context_data,"debug"); + + if (dlt_user_log_write_start(&(context_function_test[0]), &context_data, DLT_LOG_DEBUG) > 0) { + dlt_user_log_write_string(&context_data, "debug"); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[0]),&context_data,DLT_LOG_VERBOSE)>0) - { - dlt_user_log_write_string(&context_data,"verbose"); + + if (dlt_user_log_write_start(&(context_function_test[0]), &context_data, DLT_LOG_VERBOSE) > 0) { + dlt_user_log_write_string(&context_data, "verbose"); dlt_user_log_write_finish(&context_data); } /* wait 2 second before next test */ sleep(2); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test1: (Function IF) finished"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test1: (Function IF) finished"); dlt_user_log_write_finish(&context_data); } @@ -728,113 +703,106 @@ int test2f(void) /* Test 2: (Function IF) Test all variable types (verbose) */ printf("Test2f: (Function IF) Test all variable types (verbose)\n"); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test2: (Function IF) Test all variable types (verbose)"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test2: (Function IF) Test all variable types (verbose)"); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"bool"); - dlt_user_log_write_bool(&context_data,1); + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "bool"); + dlt_user_log_write_bool(&context_data, 1); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"int"); - dlt_user_log_write_int(&context_data,INT32_MIN); /* (-2147483647-1) */ + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "int"); + dlt_user_log_write_int(&context_data, INT32_MIN); /* (-2147483647-1) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"int8"); - dlt_user_log_write_int8(&context_data,INT8_MIN); /* (-128) */ + + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "int8"); + dlt_user_log_write_int8(&context_data, INT8_MIN); /* (-128) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"int16"); - dlt_user_log_write_int16(&context_data,INT16_MIN); /* (-32767-1) */ + + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "int16"); + dlt_user_log_write_int16(&context_data, INT16_MIN); /* (-32767-1) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"int32"); - dlt_user_log_write_int32(&context_data,INT32_MIN); /* (-2147483647-1) */ + + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "int32"); + dlt_user_log_write_int32(&context_data, INT32_MIN); /* (-2147483647-1) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"int64"); - dlt_user_log_write_int64(&context_data,INT64_MIN); /* (-__INT64_C(9223372036854775807)-1) */ + + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "int64"); + dlt_user_log_write_int64(&context_data, INT64_MIN); /* (-__INT64_C(9223372036854775807)-1) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"uint"); - dlt_user_log_write_uint(&context_data,UINT32_MAX); /* (4294967295U) */ + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "uint"); + dlt_user_log_write_uint(&context_data, UINT32_MAX); /* (4294967295U) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"uint8"); - dlt_user_log_write_uint8(&context_data,UINT8_MAX); /* (255) */ + + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "uint8"); + dlt_user_log_write_uint8(&context_data, UINT8_MAX); /* (255) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"uint16"); - dlt_user_log_write_uint16(&context_data,UINT16_MAX); /* (65535) */ + + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "uint16"); + dlt_user_log_write_uint16(&context_data, UINT16_MAX); /* (65535) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"uint32"); - dlt_user_log_write_uint32(&context_data,UINT32_MAX); /* (4294967295U) */ + + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "uint32"); + dlt_user_log_write_uint32(&context_data, UINT32_MAX); /* (4294967295U) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"uint64"); - dlt_user_log_write_uint64(&context_data,UINT64_MAX); /* (__UINT64_C(18446744073709551615)) */ + + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "uint64"); + dlt_user_log_write_uint64(&context_data, UINT64_MAX); /* (__UINT64_C(18446744073709551615)) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"float32"); - dlt_user_log_write_float32(&context_data,FLT_MIN); - dlt_user_log_write_float32(&context_data,FLT_MAX); + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "float32"); + dlt_user_log_write_float32(&context_data, FLT_MIN); + dlt_user_log_write_float32(&context_data, FLT_MAX); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"float64"); - dlt_user_log_write_float64(&context_data,DBL_MIN); - dlt_user_log_write_float64(&context_data,DBL_MAX); + + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "float64"); + dlt_user_log_write_float64(&context_data, DBL_MIN); + dlt_user_log_write_float64(&context_data, DBL_MAX); dlt_user_log_write_finish(&context_data); } - for(num2=0;num2<10;num2++) - { + for (num2 = 0; num2 < 10; num2++) buffer[num2] = num2; - } - if (dlt_user_log_write_start(&(context_function_test[1]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"raw"); - dlt_user_log_write_raw(&context_data,buffer,10); + if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "raw"); + dlt_user_log_write_raw(&context_data, buffer, 10); dlt_user_log_write_finish(&context_data); } /* wait 2 second before next test */ sleep(2); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test2: (Function IF) finished"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test2: (Function IF) finished"); dlt_user_log_write_finish(&context_data); } @@ -848,107 +816,100 @@ int test3f(void) /* Test 3: (Function IF) Test all variable types (non-verbose) */ printf("Test3f: (Function IF) Test all variable types (non-verbose)\n"); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test3: (Function IF) Test all variable types (non-verbose)"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test3: (Function IF) Test all variable types (non-verbose)"); dlt_user_log_write_finish(&context_data); } dlt_nonverbose_mode(); - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,1)>0) // bug mb: we have to compare against >0. in case of error -1 is returned! - { - dlt_user_log_write_string(&context_data,"bool"); - dlt_user_log_write_bool(&context_data,1); + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 1) > 0) { /* bug mb: we have to compare against >0. in case of error -1 is returned! */ + dlt_user_log_write_string(&context_data, "bool"); + dlt_user_log_write_bool(&context_data, 1); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,2)>0) - { - dlt_user_log_write_string(&context_data,"int"); - dlt_user_log_write_int(&context_data,INT32_MIN); /* (-2147483647-1) */ + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 2) > 0) { + dlt_user_log_write_string(&context_data, "int"); + dlt_user_log_write_int(&context_data, INT32_MIN); /* (-2147483647-1) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,3)>0) - { - dlt_user_log_write_string(&context_data,"int8"); - dlt_user_log_write_int8(&context_data,INT8_MIN); /* (-128) */ + + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 3) > 0) { + dlt_user_log_write_string(&context_data, "int8"); + dlt_user_log_write_int8(&context_data, INT8_MIN); /* (-128) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,4)>0) - { - dlt_user_log_write_string(&context_data,"int16"); - dlt_user_log_write_int16(&context_data,INT16_MIN); /* (-32767-1) */ + + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 4) > 0) { + dlt_user_log_write_string(&context_data, "int16"); + dlt_user_log_write_int16(&context_data, INT16_MIN); /* (-32767-1) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,5)>0) - { - dlt_user_log_write_string(&context_data,"int32"); - dlt_user_log_write_int32(&context_data,INT32_MIN); /* (-2147483647-1) */ + + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 5) > 0) { + dlt_user_log_write_string(&context_data, "int32"); + dlt_user_log_write_int32(&context_data, INT32_MIN); /* (-2147483647-1) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,6)>0) - { - dlt_user_log_write_string(&context_data,"int64"); - dlt_user_log_write_int64(&context_data,INT64_MIN); /* (-__INT64_C(9223372036854775807)-1) */ + + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 6) > 0) { + dlt_user_log_write_string(&context_data, "int64"); + dlt_user_log_write_int64(&context_data, INT64_MIN); /* (-__INT64_C(9223372036854775807)-1) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,7)>0) - { - dlt_user_log_write_string(&context_data,"uint"); - dlt_user_log_write_uint(&context_data,UINT32_MAX); /* (4294967295U) */ + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 7) > 0) { + dlt_user_log_write_string(&context_data, "uint"); + dlt_user_log_write_uint(&context_data, UINT32_MAX); /* (4294967295U) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,8)>0) - { - dlt_user_log_write_string(&context_data,"uint8"); - dlt_user_log_write_uint8(&context_data,UINT8_MAX); /* (255) */ + + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 8) > 0) { + dlt_user_log_write_string(&context_data, "uint8"); + dlt_user_log_write_uint8(&context_data, UINT8_MAX); /* (255) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,9)>0) - { - dlt_user_log_write_string(&context_data,"uint16"); - dlt_user_log_write_uint16(&context_data,UINT16_MAX); /* (65535) */ + + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 9) > 0) { + dlt_user_log_write_string(&context_data, "uint16"); + dlt_user_log_write_uint16(&context_data, UINT16_MAX); /* (65535) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,10)>0) - { - dlt_user_log_write_string(&context_data,"uint32"); - dlt_user_log_write_uint32(&context_data,UINT32_MAX); /* (4294967295U) */ + + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 10) > 0) { + dlt_user_log_write_string(&context_data, "uint32"); + dlt_user_log_write_uint32(&context_data, UINT32_MAX); /* (4294967295U) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,11)>0) - { - dlt_user_log_write_string(&context_data,"uint64"); - dlt_user_log_write_uint64(&context_data,UINT64_MAX); /* (__UINT64_C(18446744073709551615)) */ + + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 11) > 0) { + dlt_user_log_write_string(&context_data, "uint64"); + dlt_user_log_write_uint64(&context_data, UINT64_MAX); /* (__UINT64_C(18446744073709551615)) */ dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,12)>0) - { - dlt_user_log_write_string(&context_data,"float32"); - dlt_user_log_write_float32(&context_data,FLT_MIN); - dlt_user_log_write_float32(&context_data,FLT_MAX); + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 12) > 0) { + dlt_user_log_write_string(&context_data, "float32"); + dlt_user_log_write_float32(&context_data, FLT_MIN); + dlt_user_log_write_float32(&context_data, FLT_MAX); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,13)>0) - { - dlt_user_log_write_string(&context_data,"float64"); - dlt_user_log_write_float64(&context_data,DBL_MIN); - dlt_user_log_write_float64(&context_data,DBL_MAX); + + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 13) > 0) { + dlt_user_log_write_string(&context_data, "float64"); + dlt_user_log_write_float64(&context_data, DBL_MIN); + dlt_user_log_write_float64(&context_data, DBL_MAX); dlt_user_log_write_finish(&context_data); } - for(num2=0;num2<10;num2++) - { + for (num2 = 0; num2 < 10; num2++) buffer[num2] = num2; - } - if (dlt_user_log_write_start_id(&(context_function_test[2]),&context_data,DLT_LOG_INFO,14)>0) - { - dlt_user_log_write_string(&context_data,"raw"); - dlt_user_log_write_raw(&context_data,buffer,10); + if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 14) > 0) { + dlt_user_log_write_string(&context_data, "raw"); + dlt_user_log_write_raw(&context_data, buffer, 10); dlt_user_log_write_finish(&context_data); } @@ -956,9 +917,9 @@ int test3f(void) /* wait 2 second before next test */ sleep(2); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test3: (Function IF) finished"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test3: (Function IF) finished"); dlt_user_log_write_finish(&context_data); } @@ -970,49 +931,46 @@ int test4f(void) char buffer[1024]; int num; - for(num=0;num<1024;num++) - { + for (num = 0; num < 1024; num++) buffer[num] = num; - } /* Test 4: (Function IF) Message size test */ printf("Test4f: (Function IF) Test different message sizes\n"); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test4: (Function IF) Test different message sizes"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test4: (Function IF) Test different message sizes"); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[3]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"1"); - dlt_user_log_write_raw(&context_data,buffer,1); + if (dlt_user_log_write_start(&(context_function_test[3]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "1"); + dlt_user_log_write_raw(&context_data, buffer, 1); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[3]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"16"); - dlt_user_log_write_raw(&context_data,buffer,16); + + if (dlt_user_log_write_start(&(context_function_test[3]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "16"); + dlt_user_log_write_raw(&context_data, buffer, 16); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[3]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"256"); - dlt_user_log_write_raw(&context_data,buffer,256); + + if (dlt_user_log_write_start(&(context_function_test[3]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "256"); + dlt_user_log_write_raw(&context_data, buffer, 256); dlt_user_log_write_finish(&context_data); } - if (dlt_user_log_write_start(&(context_function_test[3]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"1024"); - dlt_user_log_write_raw(&context_data,buffer,1024); + + if (dlt_user_log_write_start(&(context_function_test[3]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "1024"); + dlt_user_log_write_raw(&context_data, buffer, 1024); dlt_user_log_write_finish(&context_data); } /* wait 2 second before next test */ sleep(2); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test4: (Function IF) finished"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test4: (Function IF) finished"); dlt_user_log_write_finish(&context_data); } @@ -1026,51 +984,47 @@ int test5f(void) int i; char log[DLT_USER_BUF_MAX_SIZE]; - for(num=0;num<32;num++) - { + for (num = 0; num < 32; num++) buffer[num] = num; - } /* Test 5: (Function IF) Test high-level API */ printf("Test5f: (Function IF) Test high-level API\n"); - dlt_log_string(&context_info,DLT_LOG_INFO,"Test5: (Function IF) Test high-level API"); + dlt_log_string(&context_info, DLT_LOG_INFO, "Test5: (Function IF) Test high-level API"); - dlt_log_string(&(context_function_test[4]),DLT_LOG_INFO,"Next line: dlt_log_int()"); - dlt_log_int(&(context_function_test[4]),DLT_LOG_INFO, -42); + dlt_log_string(&(context_function_test[4]), DLT_LOG_INFO, "Next line: dlt_log_int()"); + dlt_log_int(&(context_function_test[4]), DLT_LOG_INFO, -42); - dlt_log_string(&(context_function_test[4]),DLT_LOG_INFO,"Next line: dlt_log_uint()"); - dlt_log_uint(&(context_function_test[4]),DLT_LOG_INFO, 42); + dlt_log_string(&(context_function_test[4]), DLT_LOG_INFO, "Next line: dlt_log_uint()"); + dlt_log_uint(&(context_function_test[4]), DLT_LOG_INFO, 42); - dlt_log_string(&(context_function_test[4]),DLT_LOG_INFO,"Next line: dlt_log_string()"); - dlt_log_string(&(context_function_test[4]),DLT_LOG_INFO, "String output"); + dlt_log_string(&(context_function_test[4]), DLT_LOG_INFO, "Next line: dlt_log_string()"); + dlt_log_string(&(context_function_test[4]), DLT_LOG_INFO, "String output"); - dlt_log_string(&(context_function_test[4]),DLT_LOG_INFO,"Next line: dlt_log_raw()"); - dlt_log_raw(&(context_function_test[4]),DLT_LOG_INFO, buffer,16); + dlt_log_string(&(context_function_test[4]), DLT_LOG_INFO, "Next line: dlt_log_raw()"); + dlt_log_raw(&(context_function_test[4]), DLT_LOG_INFO, buffer, 16); - dlt_log_string(&(context_function_test[4]),DLT_LOG_INFO,"Next line: dlt_log_string_int()"); + dlt_log_string(&(context_function_test[4]), DLT_LOG_INFO, "Next line: dlt_log_string_int()"); dlt_log_string_int(&(context_function_test[4]), DLT_LOG_INFO, "String output: ", -42); - dlt_log_string(&(context_function_test[4]),DLT_LOG_INFO,"Next line: dlt_log_string_uint()"); - dlt_log_string_uint(&(context_function_test[4]), DLT_LOG_INFO,"String output: ", 42); + dlt_log_string(&(context_function_test[4]), DLT_LOG_INFO, "Next line: dlt_log_string_uint()"); + dlt_log_string_uint(&(context_function_test[4]), DLT_LOG_INFO, "String output: ", 42); - dlt_log_string(&(context_function_test[4]),DLT_LOG_INFO, "Next lines: dlt_user_is_logLevel_enabled"); - for (i = DLT_LOG_FATAL; i < DLT_LOG_MAX; i++) - { - if (dlt_user_is_logLevel_enabled(&(context_function_test[4]),i) == DLT_RETURN_TRUE) - { + dlt_log_string(&(context_function_test[4]), DLT_LOG_INFO, "Next lines: dlt_user_is_logLevel_enabled"); + + for (i = DLT_LOG_FATAL; i < DLT_LOG_MAX; i++) { + if (dlt_user_is_logLevel_enabled(&(context_function_test[4]), i) == DLT_RETURN_TRUE) { snprintf(log, DLT_USER_BUF_MAX_SIZE, "Loglevel is enabled: %s", loglevelstr[i]); - dlt_log_string(&(context_function_test[4]),DLT_LOG_INFO, log); + dlt_log_string(&(context_function_test[4]), DLT_LOG_INFO, log); } - else - { + else { snprintf(log, DLT_USER_BUF_MAX_SIZE, "Loglevel is disabled: %s", loglevelstr[i]); - dlt_log_string(&(context_function_test[4]),DLT_LOG_INFO, log); + dlt_log_string(&(context_function_test[4]), DLT_LOG_INFO, log); } } /* wait 2 second before next test */ sleep(2); - dlt_log_string(&context_info,DLT_LOG_INFO,"Test5: (Function IF) finished"); + dlt_log_string(&context_info, DLT_LOG_INFO, "Test5: (Function IF) finished"); return 0; } @@ -1079,31 +1033,31 @@ int test6f(void) { /* Test 6: (Function IF) Test local printing */ printf("Test6f: (Function IF) Test local printing\n"); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test 6: (Function IF) Test local printing"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test 6: (Function IF) Test local printing"); dlt_user_log_write_finish(&context_data); } dlt_enable_local_print(); - if (dlt_user_log_write_start(&(context_function_test[5]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Message (visible: locally printed)"); + + if (dlt_user_log_write_start(&(context_function_test[5]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Message (visible: locally printed)"); dlt_user_log_write_finish(&context_data); } dlt_disable_local_print(); - if (dlt_user_log_write_start(&(context_function_test[5]),&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Message (invisible: not locally printed)"); + + if (dlt_user_log_write_start(&(context_function_test[5]), &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Message (invisible: not locally printed)"); dlt_user_log_write_finish(&context_data); } - /* wait 2 second before next test */ + /* wait 2 second before next test */ sleep(2); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test6: (Function IF) finished"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test6: (Function IF) finished"); dlt_user_log_write_finish(&context_data); } @@ -1115,19 +1069,17 @@ int test7f(void) char buffer[32]; int num; - for(num=0;num<32;num++) - { + for (num = 0; num < 32; num++) buffer[num] = num; - } /* Show all log messages and traces */ dlt_set_application_ll_ts_limit(DLT_LOG_VERBOSE, DLT_TRACE_STATUS_ON); /* Test 7: (Function IF) Test network trace */ printf("Test7f: (Function IF) Test network trace\n"); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test 7: (Function IF) Test network trace"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test 7: (Function IF) Test network trace"); dlt_user_log_write_finish(&context_data); } @@ -1139,9 +1091,9 @@ int test7f(void) /* wait 2 second before next test */ sleep(2); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test7: (Function IF) finished"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test7: (Function IF) finished"); dlt_user_log_write_finish(&context_data); } @@ -1153,36 +1105,35 @@ int test7f(void) int test8f(void) { - char buffer[1024*5]; + char buffer[1024 * 5]; int num; - for(num=0;num<1024*5;num++) - { + for (num = 0; num < 1024 * 5; num++) buffer[num] = num; - } /* Show all log messages and traces */ dlt_set_application_ll_ts_limit(DLT_LOG_VERBOSE, DLT_TRACE_STATUS_ON); /* Test 8: (Function IF) Test truncated network trace */ printf("Test8f: (Function IF) Test truncated network trace\n"); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test 8: (Function IF) Test truncated network trace"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test 8: (Function IF) Test truncated network trace"); dlt_user_log_write_finish(&context_data); } /* Dummy message: 16 byte header, 32 byte payload */ - dlt_user_trace_network_truncated(&(context_function_test[7]), DLT_NW_TRACE_IPC, 16, buffer, 1024*5, buffer, 1); - dlt_user_trace_network_truncated(&(context_function_test[7]), DLT_NW_TRACE_CAN, 16, buffer, 1024*5, buffer, 1); - dlt_user_trace_network_truncated(&(context_function_test[7]), DLT_NW_TRACE_FLEXRAY, 16, buffer, 1024*5, buffer, 1); - dlt_user_trace_network_truncated(&(context_function_test[7]), DLT_NW_TRACE_MOST, 16, buffer, 1024*5, buffer, 1); + dlt_user_trace_network_truncated(&(context_function_test[7]), DLT_NW_TRACE_IPC, 16, buffer, 1024 * 5, buffer, 1); + dlt_user_trace_network_truncated(&(context_function_test[7]), DLT_NW_TRACE_CAN, 16, buffer, 1024 * 5, buffer, 1); + dlt_user_trace_network_truncated(&(context_function_test[7]), DLT_NW_TRACE_FLEXRAY, 16, buffer, 1024 * 5, buffer, + 1); + dlt_user_trace_network_truncated(&(context_function_test[7]), DLT_NW_TRACE_MOST, 16, buffer, 1024 * 5, buffer, 1); /* wait 2 second before next test */ sleep(2); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test8: (Function IF) finished"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test8: (Function IF) finished"); dlt_user_log_write_finish(&context_data); } @@ -1194,36 +1145,34 @@ int test8f(void) int test9f(void) { - char buffer[1024*5]; + char buffer[1024 * 5]; int num; - for(num=0;num<1024*5;num++) - { + for (num = 0; num < 1024 * 5; num++) buffer[num] = num; - } /* Show all log messages and traces */ dlt_set_application_ll_ts_limit(DLT_LOG_VERBOSE, DLT_TRACE_STATUS_ON); /* Test 9: (Function IF) Test segmented network trace */ printf("Test9f: (Function IF) Test segmented network trace\n"); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test 9: (Function IF) Test segmented network trace"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test 9: (Function IF) Test segmented network trace"); dlt_user_log_write_finish(&context_data); } /* Dummy message: 16 byte header, 5k payload */ - dlt_user_trace_network_segmented(&(context_function_test[8]), DLT_NW_TRACE_IPC, 16, buffer, 1024*5, buffer); - dlt_user_trace_network_segmented(&(context_function_test[8]), DLT_NW_TRACE_CAN, 16, buffer, 1024*5, buffer); - dlt_user_trace_network_segmented(&(context_function_test[8]), DLT_NW_TRACE_FLEXRAY, 16, buffer, 1024*5, buffer); - dlt_user_trace_network_segmented(&(context_function_test[8]), DLT_NW_TRACE_MOST, 16, buffer, 1024*5, buffer); + dlt_user_trace_network_segmented(&(context_function_test[8]), DLT_NW_TRACE_IPC, 16, buffer, 1024 * 5, buffer); + dlt_user_trace_network_segmented(&(context_function_test[8]), DLT_NW_TRACE_CAN, 16, buffer, 1024 * 5, buffer); + dlt_user_trace_network_segmented(&(context_function_test[8]), DLT_NW_TRACE_FLEXRAY, 16, buffer, 1024 * 5, buffer); + dlt_user_trace_network_segmented(&(context_function_test[8]), DLT_NW_TRACE_MOST, 16, buffer, 1024 * 5, buffer); /* wait 2 second before next test */ sleep(2); - if (dlt_user_log_write_start(&context_info,&context_data,DLT_LOG_INFO)>0) - { - dlt_user_log_write_string(&context_data,"Test9: (Function IF) finished"); + + if (dlt_user_log_write_start(&context_info, &context_data, DLT_LOG_INFO) > 0) { + dlt_user_log_write_string(&context_data, "Test9: (Function IF) finished"); dlt_user_log_write_finish(&context_data); } @@ -1237,15 +1186,15 @@ int test_injection_macro_callback(uint32_t service_id, void *data, uint32_t leng { char text[1024]; - memset(text,0,1024); - snprintf(text,1024,"Injection received (macro IF). ID: 0x%.4x, Length: %d",service_id,length); + memset(text, 0, 1024); + snprintf(text, 1024, "Injection received (macro IF). ID: 0x%.4x, Length: %d", service_id, length); printf("%s \n", text); - DLT_LOG(context_macro_callback, DLT_LOG_INFO, DLT_STRING("Injection received (macro IF). ID: "), DLT_UINT32(service_id),DLT_STRING("Data:"),DLT_STRING(text)); - memset(text,0,1024); + DLT_LOG(context_macro_callback, DLT_LOG_INFO, DLT_STRING("Injection received (macro IF). ID: "), + DLT_UINT32(service_id), DLT_STRING("Data:"), DLT_STRING(text)); + memset(text, 0, 1024); - if (length>0) - { - dlt_print_mixed_string(text,1024,data,length,0); + if (length > 0) { + dlt_print_mixed_string(text, 1024, data, length, 0); printf("%s \n", text); } @@ -1256,16 +1205,16 @@ int test_injection_function_callback(uint32_t service_id, void *data, uint32_t l { char text[1024]; - memset(text,0,1024); + memset(text, 0, 1024); - snprintf(text,1024,"Injection received (function IF). ID: 0x%.4x, Length: %d",service_id,length); + snprintf(text, 1024, "Injection received (function IF). ID: 0x%.4x, Length: %d", service_id, length); printf("%s \n", text); - DLT_LOG(context_function_callback, DLT_LOG_INFO, DLT_STRING("Injection received (function IF). ID: "), DLT_UINT32(service_id),DLT_STRING("Data:"),DLT_STRING(text)); - memset(text,0,1024); + DLT_LOG(context_function_callback, DLT_LOG_INFO, DLT_STRING("Injection received (function IF). ID: "), + DLT_UINT32(service_id), DLT_STRING("Data:"), DLT_STRING(text)); + memset(text, 0, 1024); - if (length>0) - { - dlt_print_mixed_string(text,1024,data,length,0); + if (length > 0) { + dlt_print_mixed_string(text, 1024, data, length, 0); printf("%s \n", text); } |