From eee8159546a8805ca5912d9572c165bfb3954c00 Mon Sep 17 00:00:00 2001 From: Saya Sugiura Date: Thu, 17 Jan 2019 17:44:27 +0900 Subject: network trace: Define package ID macro Signed-off-by: Saya Sugiura --- include/dlt/dlt_common.h | 8 ++++++++ src/lib/dlt_user.c | 8 ++++---- src/tests/dlt-test-client.c | 16 ++++++++-------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h index cab860d..a82d5fd 100644 --- a/include/dlt/dlt_common.h +++ b/include/dlt/dlt_common.h @@ -377,6 +377,14 @@ enum { */ # define DLT_LINE_LEN 1024 +/** + * Macros for network trace + */ +#define DLT_TRACE_NW_TRUNCATED "NWTR" +#define DLT_TRACE_NW_START "NWST" +#define DLT_TRACE_NW_SEGMENT "NWCH" +#define DLT_TRACE_NW_END "NWEN" + /** * Provision to test static function */ diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index 9ca8112..657df44 100644 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -2712,7 +2712,7 @@ DltReturnValue dlt_user_trace_network_segmented_start(uint32_t *id, *id = tv.tv_usec; /* Write identifier */ - if (dlt_user_log_write_string(&log, "NWST") < 0) { + if (dlt_user_log_write_string(&log, DLT_TRACE_NW_START) < 0) { dlt_user_free_buffer(&(log.buffer)); return DLT_RETURN_ERROR; } @@ -2811,7 +2811,7 @@ DltReturnValue dlt_user_trace_network_segmented_segment(uint32_t id, log.size = 0; /* Write identifier */ - if (dlt_user_log_write_string(&log, "NWCH") < DLT_RETURN_OK) { + if (dlt_user_log_write_string(&log, DLT_TRACE_NW_SEGMENT) < DLT_RETURN_OK) { dlt_user_free_buffer(&(log.buffer)); return DLT_RETURN_ERROR; } @@ -2880,7 +2880,7 @@ DltReturnValue dlt_user_trace_network_segmented_end(uint32_t id, DltContext *han log.size = 0; /* Write identifier */ - if (dlt_user_log_write_string(&log, "NWEN") < DLT_RETURN_OK) { + if (dlt_user_log_write_string(&log, DLT_TRACE_NW_END) < DLT_RETURN_OK) { dlt_user_free_buffer(&(log.buffer)); return DLT_RETURN_ERROR; } @@ -3154,7 +3154,7 @@ DltReturnValue dlt_user_trace_network_truncated(DltContext *handle, /* If truncation is allowed, check if we must do it */ if ((allow_truncate > 0) && ((header_len + payload_len + sizeof(uint16_t)) > dlt_user.log_buf_len)) { /* Identify as truncated */ - if (dlt_user_log_write_string(&log, "NWTR") < DLT_RETURN_OK) { + if (dlt_user_log_write_string(&log, DLT_TRACE_NW_END) < DLT_RETURN_OK) { dlt_user_free_buffer(&(log.buffer)); return DLT_RETURN_ERROR; } diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c index 2cd39c5..aa51cdd 100644 --- a/src/tests/dlt-test-client.c +++ b/src/tests/dlt-test-client.c @@ -1175,7 +1175,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) 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, DLT_TRACE_NW_TRUNCATED) == 0) dltdata->test_counter_macro[7]++; DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t); @@ -1280,7 +1280,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) 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, DLT_TRACE_NW_START) == 0) dltdata->test_counter_macro[8]++; /* Streahandle */ @@ -1377,7 +1377,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) 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, DLT_TRACE_NW_SEGMENT) == 0) dltdata->test_counter_macro[8]++; /* handle */ @@ -1439,7 +1439,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) 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, DLT_TRACE_NW_END) == 0) dltdata->test_counter_macro[8]++; /* handle */ @@ -2199,7 +2199,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) 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, DLT_TRACE_NW_TRUNCATED) == 0) dltdata->test_counter_function[7]++; DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t); @@ -2304,7 +2304,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) 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, DLT_TRACE_NW_START) == 0) dltdata->test_counter_function[8]++; /* Streahandle */ @@ -2401,7 +2401,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) 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, DLT_TRACE_NW_SEGMENT) == 0) dltdata->test_counter_function[8]++; /* handle */ @@ -2463,7 +2463,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) 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, DLT_TRACE_NW_END) == 0) dltdata->test_counter_function[8]++; /* handle */ -- cgit v1.2.1