maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Converted calloc to malloc in ITTI to save some time

Browse Source 
- Added vcd signal for alloc of message

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4551 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Cedric Roux
2013-12-02 08:58:32 +00:00
parent cd22e69f5e
commit 499ec0753a
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils/itti/intertask_interface.c
+9 -1
View File
@@ -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); 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) if (origin_task_id == TASK_UNKNOWN)
{ {
/* Try to identify real origin task ID */ /* Try to identify real origin task ID */
origin_task_id = itti_get_current_task_id(); origin_task_id = itti_get_current_task_id();
} }
temp = calloc (1, sizeof(MessageHeader) + size); temp = malloc (sizeof(MessageHeader) + size);
DevAssert(temp != NULL); DevAssert(temp != NULL);
temp->ittiMsgHeader.messageId = message_id; temp->ittiMsgHeader.messageId = message_id;
temp->ittiMsgHeader.originTaskId = origin_task_id; temp->ittiMsgHeader.originTaskId = origin_task_id;
temp->ittiMsgHeader.ittiMsgSize = size; 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; return temp;
} }
common/utils/itti/intertask_interface_dump.c
+3 -3
View File
@@ -312,7 +312,7 @@ int itti_dump_queue_message(message_number_t message_number,
DevAssert(message_name != NULL); DevAssert(message_name != NULL);
DevAssert(message_p != 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) { if (new == NULL) {
ITTI_DUMP_ERROR("Failed to allocate memory (%s:%d)\n", 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; return -1;
} }
memcpy(new->data, message_p, message_size); memcpy(new->data, message_p, message_size);
new->data_size = message_size; new->data_size = message_size;
new->message_number = message_number; new->message_number = message_number;
message_name_length = strlen(message_name) + 1; message_name_length = strlen(message_name) + 1;
DevCheck(message_name_length <= SIGNAL_NAME_LENGTH, message_name_length, DevCheck(message_name_length <= SIGNAL_NAME_LENGTH, message_name_length,
openair2/UTIL/LOG/vcd_signal_dumper.c
+2 -1
View File
@@ -85,7 +85,8 @@ const char* eurecomVariablesNames[] = {
"itti_poll_msg", "itti_poll_msg",
"itti_poll_msg_end", "itti_poll_msg_end",
"itti_recv_msg", "itti_recv_msg",
"itti_recv_msg_end" "itti_recv_msg_end",
"itti_alloc_msg"
}; };
const char* eurecomFunctionsNames[] = { const char* eurecomFunctionsNames[] = {
openair2/UTIL/LOG/vcd_signal_dumper.h
+1
View File
@@ -55,6 +55,7 @@ typedef enum
VCD_SIGNAL_DUMPER_VARIABLE_ITTI_POLL_MSG_END, VCD_SIGNAL_DUMPER_VARIABLE_ITTI_POLL_MSG_END,
VCD_SIGNAL_DUMPER_VARIABLE_ITTI_RECV_MSG, VCD_SIGNAL_DUMPER_VARIABLE_ITTI_RECV_MSG,
VCD_SIGNAL_DUMPER_VARIABLE_ITTI_RECV_MSG_END, VCD_SIGNAL_DUMPER_VARIABLE_ITTI_RECV_MSG_END,
VCD_SIGNAL_DUMPER_VARIABLE_ITTI_ALLOC_MSG,
VCD_SIGNAL_DUMPER_VARIABLES_LAST, VCD_SIGNAL_DUMPER_VARIABLES_LAST,
VCD_SIGNAL_DUMPER_VARIABLES_END = VCD_SIGNAL_DUMPER_VARIABLES_LAST, VCD_SIGNAL_DUMPER_VARIABLES_END = VCD_SIGNAL_DUMPER_VARIABLES_LAST,
} vcd_signal_dump_variables; } vcd_signal_dump_variables;