dlt-client: logging: Extended the receiver buffer size

 - dlt-control couldn't receive all the GET_LOG_INFO response message
when many applications and contexts are registered.
Therefore the receiver buffer size was extended to 65K.
Also the receive buffer size macros are reduced to one variable.

 - Code cleanup and improvements

Signed-off-by: Saya Sugiura <ssugiura@jp.adit-jv.com>

3 files changed, 16 insertions, 16 deletions

diff --git a/src/console/dlt-control-common.c b/src/console/dlt-control-common.c
index 127eb4b..37c5a62 100644
--- a/src/console/dlt-control-common.c
+++ b/src/console/dlt-control-common.c
@@ -160,10 +160,10 @@ void set_timeout(long t)
 int dlt_parse_config_param(char *config_id, char **config_data)
 {
     FILE * pFile = NULL;
-    int value_length = DLT_RECEIVE_TEXTBUFSIZE;
-    char line[DLT_RECEIVE_TEXTBUFSIZE-1] = {0};
-    char token[DLT_RECEIVE_TEXTBUFSIZE] = {0};
-    char value[DLT_RECEIVE_TEXTBUFSIZE] = {0};
+    int value_length = DLT_LINE_LEN;
+    char line[DLT_LINE_LEN-1] = {0};
+    char token[DLT_LINE_LEN] = {0};
+    char value[DLT_LINE_LEN] = {0};
     char *pch = NULL;
     const char *filename = NULL;
 
@@ -524,7 +524,7 @@ static void *dlt_control_listen_to_daemon(void *data)
  */
 static int dlt_control_callback(DltMessage *message, void *data)
 {
-    char text[DLT_RECEIVE_TEXTBUFSIZE] = { 0 };
+    char text[DLT_RECEIVE_BUFSIZE] = { 0 };
     (void) data;
 
     if (message == NULL)
@@ -543,11 +543,11 @@ static int dlt_control_callback(DltMessage *message, void *data)
         dlt_set_storageheader(message->storageheader, "LCTL");
     }
 
-    dlt_message_header(message, text, DLT_RECEIVE_TEXTBUFSIZE, get_verbosity());
+    dlt_message_header(message, text, DLT_RECEIVE_BUFSIZE, get_verbosity());
 
     /* Extracting payload */
     dlt_message_payload(message, text,
-                        DLT_RECEIVE_TEXTBUFSIZE,
+                        DLT_RECEIVE_BUFSIZE,
                         DLT_OUTPUT_ASCII,
                         get_verbosity());
 
diff --git a/src/console/dlt-control.c b/src/console/dlt-control.c
index d5d08fb..f291afa 100644
--- a/src/console/dlt-control.c
+++ b/src/console/dlt-control.c
@@ -703,7 +703,7 @@ int main(int argc, char* argv[])
 
 int dlt_receive_message_callback(DltMessage *message, void *data)
 {
-    static char resp_text[DLT_RECEIVE_TEXTBUFSIZE];
+    static char resp_text[DLT_RECEIVE_BUFSIZE];
     int ret = DLT_RETURN_ERROR;
 
     /* parameter check */
@@ -725,7 +725,7 @@ int dlt_receive_message_callback(DltMessage *message, void *data)
     }
 
     /* get response data */
-    ret = dlt_message_header(message, resp_text, DLT_RECEIVE_TEXTBUFSIZE, 0);
+    ret = dlt_message_header(message, resp_text, DLT_RECEIVE_BUFSIZE, 0);
     if (ret < 0)
     {
         fprintf(stderr, "GET_LOG_INFO message_header result failed..\n");
@@ -733,7 +733,7 @@ int dlt_receive_message_callback(DltMessage *message, void *data)
         return -1;
     }
 
-    ret = dlt_message_payload(message, resp_text, DLT_RECEIVE_TEXTBUFSIZE, DLT_OUTPUT_ASCII, 0);
+    ret = dlt_message_payload(message, resp_text, DLT_RECEIVE_BUFSIZE, DLT_OUTPUT_ASCII, 0);
     if (ret < 0)
     {
         fprintf(stderr, "GET_LOG_INFO message_payload result failed..\n");
diff --git a/src/console/dlt-receive.c b/src/console/dlt-receive.c
index fd19f83..200add1 100644
--- a/src/console/dlt-receive.c
+++ b/src/console/dlt-receive.c
@@ -556,7 +556,7 @@ int main(int argc, char* argv[])
 int dlt_receive_message_callback(DltMessage *message, void *data)
 {
 	DltReceiveData *dltdata;
-    static char text[DLT_RECEIVE_TEXTBUFSIZE];
+    static char text[DLT_RECEIVE_BUFSIZE];
 
 	struct iovec iov[2];
     int bytes_written;
@@ -584,27 +584,27 @@ int dlt_receive_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_RECEIVE_TEXTBUFSIZE,dltdata->vflag);
+            dlt_message_print_hex(message,text,DLT_RECEIVE_BUFSIZE,dltdata->vflag);
         }
         else if (dltdata->aflag)
         {
 
-            dlt_message_header(message,text,DLT_RECEIVE_TEXTBUFSIZE,dltdata->vflag);
+            dlt_message_header(message,text,DLT_RECEIVE_BUFSIZE,dltdata->vflag);
 
             printf("%s ",text);
 
-            dlt_message_payload(message,text,DLT_RECEIVE_TEXTBUFSIZE,DLT_OUTPUT_ASCII,dltdata->vflag);
+            dlt_message_payload(message,text,DLT_RECEIVE_BUFSIZE,DLT_OUTPUT_ASCII,dltdata->vflag);
 
             printf("[%s]\n",text);
         }
         else if (dltdata->mflag)
         {
-            dlt_message_print_mixed_plain(message,text,DLT_RECEIVE_TEXTBUFSIZE,dltdata->vflag);
+            dlt_message_print_mixed_plain(message,text,DLT_RECEIVE_BUFSIZE,dltdata->vflag);
         }
         else if (dltdata->sflag)
         {
 
-            dlt_message_header(message,text,DLT_RECEIVE_TEXTBUFSIZE,dltdata->vflag);
+            dlt_message_header(message,text,DLT_RECEIVE_BUFSIZE,dltdata->vflag);
 
             printf("%s \n",text);
         }