From 499ec0753a8dc06722b7c21974cb6f322fa0bb5b Mon Sep 17 00:00:00 2001 From: Cedric Roux Date: Mon, 2 Dec 2013 08:58:32 +0000 Subject: [PATCH] - Converted calloc to malloc in ITTI to save some time - Added vcd signal for alloc of message git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4551 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- common/utils/itti/intertask_interface.c | 10 +++++++++- common/utils/itti/intertask_interface_dump.c | 6 +++--- openair2/UTIL/LOG/vcd_signal_dumper.c | 3 ++- openair2/UTIL/LOG/vcd_signal_dumper.h | 1 + 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/common/utils/itti/intertask_interface.c b/common/utils/itti/intertask_interface.c index 0c1e03c409..64c39aa3a8 100644 --- a/common/utils/itti/intertask_interface.c +++ b/common/utils/itti/intertask_interface.c @@ -254,19 +254,27 @@ inline MessageDef *itti_alloc_new_message_sized(task_id_t origin_task_id, Messag DevCheck(message_id < itti_desc.messages_id_max, message_id, itti_desc.messages_id_max, 0); +#if defined(OAI_EMU) || defined(RTAI) + vcd_signal_dumper_dump_variable_by_name(VCD_SIGNAL_DUMPER_VARIABLE_ITTI_ALLOC_MSG, size); +#endif + if (origin_task_id == TASK_UNKNOWN) { /* Try to identify real origin task ID */ origin_task_id = itti_get_current_task_id(); } - temp = calloc (1, sizeof(MessageHeader) + size); + temp = malloc (sizeof(MessageHeader) + size); DevAssert(temp != NULL); temp->ittiMsgHeader.messageId = message_id; temp->ittiMsgHeader.originTaskId = origin_task_id; temp->ittiMsgHeader.ittiMsgSize = size; +#if defined(OAI_EMU) || defined(RTAI) + vcd_signal_dumper_dump_variable_by_name(VCD_SIGNAL_DUMPER_VARIABLE_ITTI_ALLOC_MSG, 0); +#endif + return temp; } diff --git a/common/utils/itti/intertask_interface_dump.c b/common/utils/itti/intertask_interface_dump.c index b1fc3705ab..e90a5cb542 100644 --- a/common/utils/itti/intertask_interface_dump.c +++ b/common/utils/itti/intertask_interface_dump.c @@ -312,7 +312,7 @@ int itti_dump_queue_message(message_number_t message_number, DevAssert(message_name != NULL); DevAssert(message_p != NULL); - new = calloc(1, sizeof(itti_dump_queue_item_t)); + new = malloc(sizeof(itti_dump_queue_item_t)); if (new == NULL) { ITTI_DUMP_ERROR("Failed to allocate memory (%s:%d)\n", @@ -328,8 +328,8 @@ int itti_dump_queue_message(message_number_t message_number, return -1; } memcpy(new->data, message_p, message_size); - new->data_size = message_size; - new->message_number = message_number; + new->data_size = message_size; + new->message_number = message_number; message_name_length = strlen(message_name) + 1; DevCheck(message_name_length <= SIGNAL_NAME_LENGTH, message_name_length, diff --git a/openair2/UTIL/LOG/vcd_signal_dumper.c b/openair2/UTIL/LOG/vcd_signal_dumper.c index 3e2ab78bae..791c64858b 100644 --- a/openair2/UTIL/LOG/vcd_signal_dumper.c +++ b/openair2/UTIL/LOG/vcd_signal_dumper.c @@ -85,7 +85,8 @@ const char* eurecomVariablesNames[] = { "itti_poll_msg", "itti_poll_msg_end", "itti_recv_msg", - "itti_recv_msg_end" + "itti_recv_msg_end", + "itti_alloc_msg" }; const char* eurecomFunctionsNames[] = { diff --git a/openair2/UTIL/LOG/vcd_signal_dumper.h b/openair2/UTIL/LOG/vcd_signal_dumper.h index 0635b886f1..b5e1ede512 100644 --- a/openair2/UTIL/LOG/vcd_signal_dumper.h +++ b/openair2/UTIL/LOG/vcd_signal_dumper.h @@ -55,6 +55,7 @@ typedef enum VCD_SIGNAL_DUMPER_VARIABLE_ITTI_POLL_MSG_END, VCD_SIGNAL_DUMPER_VARIABLE_ITTI_RECV_MSG, VCD_SIGNAL_DUMPER_VARIABLE_ITTI_RECV_MSG_END, + VCD_SIGNAL_DUMPER_VARIABLE_ITTI_ALLOC_MSG, VCD_SIGNAL_DUMPER_VARIABLES_LAST, VCD_SIGNAL_DUMPER_VARIABLES_END = VCD_SIGNAL_DUMPER_VARIABLES_LAST, } vcd_signal_dump_variables;