Added result check for calls to itti_free.
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4782 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
@@ -315,7 +315,8 @@ int itti_send_broadcast_message(MessageDef *message_p) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@@ -460,7 +461,8 @@ int itti_send_msg_to_task(task_id_t destination_task_id, instance_t instance, Me
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/* This is a debug message to TASK_UNKNOWN, we can release safely release it */
|
/* This is a debug message to TASK_UNKNOWN, we can release safely release it */
|
||||||
itti_free(origin_task_id, message);
|
int result = itti_free(origin_task_id, message);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(OAI_EMU) || defined(RTAI)
|
#if defined(OAI_EMU) || defined(RTAI)
|
||||||
@@ -585,6 +587,7 @@ static inline void itti_receive_msg_internal_event_fd(task_id_t task_id, uint8_t
|
|||||||
struct message_list_s *message = NULL;
|
struct message_list_s *message = NULL;
|
||||||
eventfd_t sem_counter;
|
eventfd_t sem_counter;
|
||||||
ssize_t read_ret;
|
ssize_t read_ret;
|
||||||
|
int result;
|
||||||
|
|
||||||
/* Read will always return 1 */
|
/* Read will always return 1 */
|
||||||
read_ret = read (itti_desc.threads[thread_id].task_event_fd, &sem_counter, sizeof(sem_counter));
|
read_ret = read (itti_desc.threads[thread_id].task_event_fd, &sem_counter, sizeof(sem_counter));
|
||||||
@@ -601,7 +604,9 @@ static inline void itti_receive_msg_internal_event_fd(task_id_t task_id, uint8_t
|
|||||||
}
|
}
|
||||||
AssertFatal(message != NULL, "Message from message queue is NULL!\n");
|
AssertFatal(message != NULL, "Message from message queue is NULL!\n");
|
||||||
*received_msg = message->msg;
|
*received_msg = message->msg;
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(*received_msg), message);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(*received_msg), message);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
|
|
||||||
/* Mark that the event has been processed */
|
/* Mark that the event has been processed */
|
||||||
itti_desc.threads[thread_id].events[i].events &= ~EPOLLIN;
|
itti_desc.threads[thread_id].events[i].events &= ~EPOLLIN;
|
||||||
return;
|
return;
|
||||||
@@ -655,8 +660,11 @@ void itti_poll_msg(task_id_t task_id, MessageDef **received_msg) {
|
|||||||
|
|
||||||
if (lfds611_queue_dequeue (itti_desc.tasks[task_id].message_queue, (void **) &message) == 1)
|
if (lfds611_queue_dequeue (itti_desc.tasks[task_id].message_queue, (void **) &message) == 1)
|
||||||
{
|
{
|
||||||
|
int result;
|
||||||
|
|
||||||
*received_msg = message->msg;
|
*received_msg = message->msg;
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(*received_msg), message);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(*received_msg), message);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -266,19 +266,23 @@ static void itti_dump_user_data_delete_function(void *user_data, void *user_stat
|
|||||||
{
|
{
|
||||||
itti_dump_queue_item_t *item;
|
itti_dump_queue_item_t *item;
|
||||||
task_id_t task_id;
|
task_id_t task_id;
|
||||||
|
int result;
|
||||||
|
|
||||||
item = (itti_dump_queue_item_t *)user_data;
|
item = (itti_dump_queue_item_t *)user_data;
|
||||||
|
|
||||||
if (item->data != NULL)
|
if (item->data != NULL)
|
||||||
{
|
{
|
||||||
|
|
||||||
task_id = ITTI_MSG_ORIGIN_ID(item->data);
|
task_id = ITTI_MSG_ORIGIN_ID(item->data);
|
||||||
itti_free(task_id, item->data);
|
result = itti_free(task_id, item->data);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
task_id = TASK_UNKNOWN;
|
task_id = TASK_UNKNOWN;
|
||||||
}
|
}
|
||||||
itti_free(task_id, item);
|
result = itti_free(task_id, item);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -170,7 +170,7 @@ void *nas_ue_task(void *args_p) {
|
|||||||
|
|
||||||
/* TODO checks if NAS will free the nas message, better to do it there anyway! */
|
/* TODO checks if NAS will free the nas message, better to do it there anyway! */
|
||||||
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), NAS_CONN_ESTABLI_CNF(msg_p).nasMsg.data);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), NAS_CONN_ESTABLI_CNF(msg_p).nasMsg.data);
|
||||||
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory!\n");
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -198,9 +198,11 @@ void *nas_ue_task(void *args_p) {
|
|||||||
|
|
||||||
nas_proc_dl_transfer_ind (NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.data, NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.length);
|
nas_proc_dl_transfer_ind (NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.data, NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.length);
|
||||||
|
|
||||||
|
if (0) {
|
||||||
/* TODO checks if NAS will free the nas message, better to do it there anyway! */
|
/* TODO checks if NAS will free the nas message, better to do it there anyway! */
|
||||||
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.data);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.data);
|
||||||
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory!\n");
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
@@ -208,7 +210,8 @@ void *nas_ue_task(void *args_p) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
msg_p = NULL;
|
msg_p = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -225,17 +225,21 @@ void s1ap_eNB_handle_sctp_association_resp(instance_t instance, sctp_new_associa
|
|||||||
static
|
static
|
||||||
void s1ap_eNB_handle_sctp_data_ind(sctp_data_ind_t *sctp_data_ind)
|
void s1ap_eNB_handle_sctp_data_ind(sctp_data_ind_t *sctp_data_ind)
|
||||||
{
|
{
|
||||||
|
int result;
|
||||||
|
|
||||||
DevAssert(sctp_data_ind != NULL);
|
DevAssert(sctp_data_ind != NULL);
|
||||||
|
|
||||||
s1ap_eNB_handle_message(sctp_data_ind->assoc_id, sctp_data_ind->stream,
|
s1ap_eNB_handle_message(sctp_data_ind->assoc_id, sctp_data_ind->stream,
|
||||||
sctp_data_ind->buffer, sctp_data_ind->buffer_length);
|
sctp_data_ind->buffer, sctp_data_ind->buffer_length);
|
||||||
|
|
||||||
itti_free(TASK_UNKNOWN, sctp_data_ind->buffer);
|
result = itti_free(TASK_UNKNOWN, sctp_data_ind->buffer);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
|
|
||||||
void *s1ap_eNB_task(void *arg)
|
void *s1ap_eNB_task(void *arg)
|
||||||
{
|
{
|
||||||
MessageDef *received_msg = NULL;
|
MessageDef *received_msg = NULL;
|
||||||
|
int result;
|
||||||
|
|
||||||
S1AP_DEBUG("Starting S1AP layer\n");
|
S1AP_DEBUG("Starting S1AP layer\n");
|
||||||
|
|
||||||
@@ -288,7 +292,8 @@ void *s1ap_eNB_task(void *arg)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(received_msg), received_msg);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(received_msg), received_msg);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
|
|
||||||
received_msg = NULL;
|
received_msg = NULL;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -528,6 +528,7 @@ void *sctp_eNB_task(void *arg)
|
|||||||
int nb_events;
|
int nb_events;
|
||||||
struct epoll_event *events;
|
struct epoll_event *events;
|
||||||
MessageDef *received_msg = NULL;
|
MessageDef *received_msg = NULL;
|
||||||
|
int result;
|
||||||
|
|
||||||
SCTP_DEBUG("Starting SCTP layer\n");
|
SCTP_DEBUG("Starting SCTP layer\n");
|
||||||
|
|
||||||
@@ -560,7 +561,8 @@ void *sctp_eNB_task(void *arg)
|
|||||||
ITTI_MSG_ID(received_msg), ITTI_MSG_NAME(received_msg));
|
ITTI_MSG_ID(received_msg), ITTI_MSG_NAME(received_msg));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
itti_free(ITTI_MSG_ORIGIN_ID(received_msg), received_msg);
|
result = itti_free(ITTI_MSG_ORIGIN_ID(received_msg), received_msg);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
received_msg = NULL;
|
received_msg = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3519,6 +3519,7 @@ void phy_procedures_eNB_lte(unsigned char last_slot, unsigned char next_slot,PHY
|
|||||||
const char *msg_name;
|
const char *msg_name;
|
||||||
instance_t instance;
|
instance_t instance;
|
||||||
unsigned int Mod_id;
|
unsigned int Mod_id;
|
||||||
|
int result;
|
||||||
#endif
|
#endif
|
||||||
/*
|
/*
|
||||||
if (phy_vars_eNB->frame >= 1000)
|
if (phy_vars_eNB->frame >= 1000)
|
||||||
@@ -3545,7 +3546,8 @@ void phy_procedures_eNB_lte(unsigned char last_slot, unsigned char next_slot,PHY
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
} while(msg_p != NULL);
|
} while(msg_p != NULL);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -38,6 +38,7 @@
|
|||||||
* \warning
|
* \warning
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "assertions.h"
|
||||||
#include "defs.h"
|
#include "defs.h"
|
||||||
#include "PHY/defs.h"
|
#include "PHY/defs.h"
|
||||||
#include "PHY/extern.h"
|
#include "PHY/extern.h"
|
||||||
@@ -3173,6 +3174,7 @@ int phy_procedures_RN_UE_RX(u8 last_slot, u8 next_slot, relaying_type_t r_type)
|
|||||||
const char *msg_name;
|
const char *msg_name;
|
||||||
instance_t instance;
|
instance_t instance;
|
||||||
unsigned int Mod_id;
|
unsigned int Mod_id;
|
||||||
|
int result;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#undef DEBUG_PHY_PROC
|
#undef DEBUG_PHY_PROC
|
||||||
@@ -3219,7 +3221,8 @@ int phy_procedures_RN_UE_RX(u8 last_slot, u8 next_slot, relaying_type_t r_type)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
} while(msg_p != NULL);
|
} while(msg_p != NULL);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -322,6 +322,8 @@ void *eNB_app_task(void *args_p)
|
|||||||
MessageDef *msg_p;
|
MessageDef *msg_p;
|
||||||
const char *msg_name;
|
const char *msg_name;
|
||||||
instance_t instance;
|
instance_t instance;
|
||||||
|
int result;
|
||||||
|
|
||||||
itti_mark_task_ready (TASK_ENB_APP);
|
itti_mark_task_ready (TASK_ENB_APP);
|
||||||
|
|
||||||
# if defined(ENABLE_USE_MME)
|
# if defined(ENABLE_USE_MME)
|
||||||
@@ -406,9 +408,9 @@ void *eNB_app_task(void *args_p)
|
|||||||
if (timer_setup (ENB_REGISTER_RETRY_DELAY, 0, TASK_ENB_APP, INSTANCE_DEFAULT, TIMER_ONE_SHOT,
|
if (timer_setup (ENB_REGISTER_RETRY_DELAY, 0, TASK_ENB_APP, INSTANCE_DEFAULT, TIMER_ONE_SHOT,
|
||||||
NULL, &enb_register_retry_timer_id) < 0)
|
NULL, &enb_register_retry_timer_id) < 0)
|
||||||
{
|
{
|
||||||
LOG_E(ENB_APP, " Can not start eNB register retry timer, use \"usleep\" instead!\n");
|
LOG_E(ENB_APP, " Can not start eNB register retry timer, use \"sleep\" instead!\n");
|
||||||
|
|
||||||
usleep(ENB_REGISTER_RETRY_DELAY * 1000000);
|
sleep(ENB_REGISTER_RETRY_DELAY);
|
||||||
/* Restart the registration process */
|
/* Restart the registration process */
|
||||||
registered_enb = 0;
|
registered_enb = 0;
|
||||||
register_enb_pending = eNB_app_register ();
|
register_enb_pending = eNB_app_register ();
|
||||||
@@ -441,7 +443,8 @@ void *eNB_app_task(void *args_p)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
} while (1);
|
} while (1);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,7 @@
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "assertions.h"
|
||||||
#include "PHY/defs.h"
|
#include "PHY/defs.h"
|
||||||
#include "PHY/extern.h"
|
#include "PHY/extern.h"
|
||||||
|
|
||||||
@@ -4233,6 +4234,7 @@ void eNB_dlsch_ulsch_scheduler(u8 Mod_id,u8 cooperation_flag, u32 frame, u8 subf
|
|||||||
MessageDef *msg_p;
|
MessageDef *msg_p;
|
||||||
const char *msg_name;
|
const char *msg_name;
|
||||||
instance_t instance;
|
instance_t instance;
|
||||||
|
int result;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DCI_PDU *DCI_pdu= &eNB_mac_inst[Mod_id].DCI_pdu;
|
DCI_PDU *DCI_pdu= &eNB_mac_inst[Mod_id].DCI_pdu;
|
||||||
@@ -4250,6 +4252,10 @@ void eNB_dlsch_ulsch_scheduler(u8 Mod_id,u8 cooperation_flag, u32 frame, u8 subf
|
|||||||
instance = ITTI_MSG_INSTANCE (msg_p);
|
instance = ITTI_MSG_INSTANCE (msg_p);
|
||||||
|
|
||||||
switch (ITTI_MSG_ID(msg_p)) {
|
switch (ITTI_MSG_ID(msg_p)) {
|
||||||
|
case MESSAGE_TEST:
|
||||||
|
LOG_D(MAC, "Received %s\n", ITTI_MSG_NAME(msg_p));
|
||||||
|
break;
|
||||||
|
|
||||||
case RRC_MAC_BCCH_DATA_REQ:
|
case RRC_MAC_BCCH_DATA_REQ:
|
||||||
LOG_D(MAC, "Received %s from %s: instance %d, frame %d, eNB_index %d\n",
|
LOG_D(MAC, "Received %s from %s: instance %d, frame %d, eNB_index %d\n",
|
||||||
msg_name, ITTI_MSG_ORIGIN_NAME(msg_p), instance,
|
msg_name, ITTI_MSG_ORIGIN_NAME(msg_p), instance,
|
||||||
@@ -4281,7 +4287,8 @@ void eNB_dlsch_ulsch_scheduler(u8 Mod_id,u8 cooperation_flag, u32 frame, u8 subf
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
} while(msg_p != NULL);
|
} while(msg_p != NULL);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -1287,6 +1287,7 @@ UE_L2_STATE_t ue_scheduler(u8 Mod_id,u32 frame, u8 subframe, lte_subframe_t dire
|
|||||||
MessageDef *msg_p;
|
MessageDef *msg_p;
|
||||||
const char *msg_name;
|
const char *msg_name;
|
||||||
instance_t instance;
|
instance_t instance;
|
||||||
|
int result;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SCHEDULER, VCD_FUNCTION_IN);
|
vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SCHEDULER, VCD_FUNCTION_IN);
|
||||||
@@ -1315,7 +1316,8 @@ UE_L2_STATE_t ue_scheduler(u8 Mod_id,u32 frame, u8 subframe, lte_subframe_t dire
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
} while(msg_p != NULL);
|
} while(msg_p != NULL);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -525,6 +525,7 @@ void pdcp_run (u32_t frame, u8 eNB_flag, u8 UE_index, u8 eNB_index) {
|
|||||||
MessageDef *msg_p;
|
MessageDef *msg_p;
|
||||||
const char *msg_name;
|
const char *msg_name;
|
||||||
instance_t instance;
|
instance_t instance;
|
||||||
|
int result;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCP_RUN, VCD_FUNCTION_IN);
|
vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCP_RUN, VCD_FUNCTION_IN);
|
||||||
@@ -551,7 +552,8 @@ void pdcp_run (u32_t frame, u8 eNB_flag, u8 UE_index, u8 eNB_index) {
|
|||||||
RRC_DCCH_DATA_REQ (msg_p).sdu_p, RRC_DCCH_DATA_REQ (msg_p).mode);
|
RRC_DCCH_DATA_REQ (msg_p).sdu_p, RRC_DCCH_DATA_REQ (msg_p).mode);
|
||||||
|
|
||||||
// Message buffer has been processed, free it now.
|
// Message buffer has been processed, free it now.
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), RRC_DCCH_DATA_REQ (msg_p).sdu_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), RRC_DCCH_DATA_REQ (msg_p).sdu_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
@@ -559,7 +561,8 @@ void pdcp_run (u32_t frame, u8 eNB_flag, u8 UE_index, u8 eNB_index) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
} while(msg_p != NULL);
|
} while(msg_p != NULL);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -36,6 +36,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#include "assertions.h"
|
||||||
#include "defs.h"
|
#include "defs.h"
|
||||||
#include "PHY/TOOLS/dB_routines.h"
|
#include "PHY/TOOLS/dB_routines.h"
|
||||||
#include "extern.h"
|
#include "extern.h"
|
||||||
@@ -2408,6 +2409,7 @@ void *rrc_ue_task(void *args_p) {
|
|||||||
const char *msg_name;
|
const char *msg_name;
|
||||||
instance_t instance;
|
instance_t instance;
|
||||||
unsigned int Mod_id;
|
unsigned int Mod_id;
|
||||||
|
int result;
|
||||||
SRB_INFO *srb_info_p;
|
SRB_INFO *srb_info_p;
|
||||||
|
|
||||||
itti_mark_task_ready (TASK_RRC_UE);
|
itti_mark_task_ready (TASK_RRC_UE);
|
||||||
@@ -2497,7 +2499,8 @@ void *rrc_ue_task(void *args_p) {
|
|||||||
RRC_DCCH_DATA_IND (msg_p).eNB_index);
|
RRC_DCCH_DATA_IND (msg_p).eNB_index);
|
||||||
|
|
||||||
// Message buffer has been processed, free it now.
|
// Message buffer has been processed, free it now.
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), RRC_DCCH_DATA_IND (msg_p).sdu_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), RRC_DCCH_DATA_IND (msg_p).sdu_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
# if defined(ENABLE_USE_MME)
|
# if defined(ENABLE_USE_MME)
|
||||||
@@ -2609,6 +2612,7 @@ void *rrc_ue_task(void *args_p) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
msg_p = NULL;
|
msg_p = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3024,6 +3024,7 @@ void *rrc_enb_task(void *args_p) {
|
|||||||
MessageDef *msg_p;
|
MessageDef *msg_p;
|
||||||
const char *msg_name;
|
const char *msg_name;
|
||||||
instance_t instance;
|
instance_t instance;
|
||||||
|
int result;
|
||||||
SRB_INFO *srb_info_p;
|
SRB_INFO *srb_info_p;
|
||||||
|
|
||||||
itti_mark_task_ready (TASK_RRC_ENB);
|
itti_mark_task_ready (TASK_RRC_ENB);
|
||||||
@@ -3067,7 +3068,8 @@ void *rrc_enb_task(void *args_p) {
|
|||||||
RRC_DCCH_DATA_IND (msg_p).sdu_size);
|
RRC_DCCH_DATA_IND (msg_p).sdu_size);
|
||||||
|
|
||||||
// Message buffer has been processed, free it now.
|
// Message buffer has been processed, free it now.
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), RRC_DCCH_DATA_IND (msg_p).sdu_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), RRC_DCCH_DATA_IND (msg_p).sdu_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if defined(ENABLE_USE_MME)
|
#if defined(ENABLE_USE_MME)
|
||||||
@@ -3104,7 +3106,8 @@ void *rrc_enb_task(void *args_p) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
msg_p = NULL;
|
msg_p = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -298,6 +298,7 @@ int dummy_tx_buffer[3840*4] __attribute__((aligned(16)));
|
|||||||
void *l2l1_task(void *arg)
|
void *l2l1_task(void *arg)
|
||||||
{
|
{
|
||||||
MessageDef *message_p = NULL;
|
MessageDef *message_p = NULL;
|
||||||
|
int result;
|
||||||
|
|
||||||
itti_set_task_real_time(TASK_L2L1);
|
itti_set_task_real_time(TASK_L2L1);
|
||||||
itti_mark_task_ready(TASK_L2L1);
|
itti_mark_task_ready(TASK_L2L1);
|
||||||
@@ -306,7 +307,8 @@ void *l2l1_task(void *arg)
|
|||||||
/* Wait for the initialize message */
|
/* Wait for the initialize message */
|
||||||
do {
|
do {
|
||||||
if (message_p != NULL) {
|
if (message_p != NULL) {
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
itti_receive_msg (TASK_L2L1, &message_p);
|
itti_receive_msg (TASK_L2L1, &message_p);
|
||||||
|
|
||||||
@@ -326,7 +328,8 @@ void *l2l1_task(void *arg)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} while (ITTI_MSG_ID(message_p) != INITIALIZE_MESSAGE);
|
} while (ITTI_MSG_ID(message_p) != INITIALIZE_MESSAGE);
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
|
|
||||||
do {
|
do {
|
||||||
@@ -348,7 +351,8 @@ void *l2l1_task(void *arg)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
} while(1);
|
} while(1);
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|||||||
@@ -475,6 +475,7 @@ void *emos_thread (void *arg)
|
|||||||
void *l2l1_task(void *arg)
|
void *l2l1_task(void *arg)
|
||||||
{
|
{
|
||||||
MessageDef *message_p = NULL;
|
MessageDef *message_p = NULL;
|
||||||
|
int result;
|
||||||
|
|
||||||
itti_set_task_real_time(TASK_L2L1);
|
itti_set_task_real_time(TASK_L2L1);
|
||||||
itti_mark_task_ready(TASK_L2L1);
|
itti_mark_task_ready(TASK_L2L1);
|
||||||
@@ -483,7 +484,8 @@ void *l2l1_task(void *arg)
|
|||||||
/* Wait for the initialize message */
|
/* Wait for the initialize message */
|
||||||
do {
|
do {
|
||||||
if (message_p != NULL) {
|
if (message_p != NULL) {
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
itti_receive_msg (TASK_L2L1, &message_p);
|
itti_receive_msg (TASK_L2L1, &message_p);
|
||||||
|
|
||||||
@@ -503,7 +505,8 @@ void *l2l1_task(void *arg)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} while (ITTI_MSG_ID(message_p) != INITIALIZE_MESSAGE);
|
} while (ITTI_MSG_ID(message_p) != INITIALIZE_MESSAGE);
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
|
|
||||||
do {
|
do {
|
||||||
@@ -525,7 +528,8 @@ void *l2l1_task(void *arg)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
} while(1);
|
} while(1);
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|||||||
@@ -469,6 +469,7 @@ void *l2l1_task(void *args_p) {
|
|||||||
|
|
||||||
#if defined(ENABLE_ITTI)
|
#if defined(ENABLE_ITTI)
|
||||||
MessageDef *message_p = NULL;
|
MessageDef *message_p = NULL;
|
||||||
|
int result;
|
||||||
|
|
||||||
itti_mark_task_ready (TASK_L2L1);
|
itti_mark_task_ready (TASK_L2L1);
|
||||||
|
|
||||||
@@ -476,7 +477,8 @@ void *l2l1_task(void *args_p) {
|
|||||||
/* Wait for the initialize message */
|
/* Wait for the initialize message */
|
||||||
do {
|
do {
|
||||||
if (message_p != NULL) {
|
if (message_p != NULL) {
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
itti_receive_msg (TASK_L2L1, &message_p);
|
itti_receive_msg (TASK_L2L1, &message_p);
|
||||||
|
|
||||||
@@ -501,7 +503,8 @@ void *l2l1_task(void *args_p) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} while (ITTI_MSG_ID(message_p) != INITIALIZE_MESSAGE);
|
} while (ITTI_MSG_ID(message_p) != INITIALIZE_MESSAGE);
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -535,7 +538,8 @@ void *l2l1_task(void *args_p) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
result = itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p);
|
||||||
|
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
|
||||||
}
|
}
|
||||||
} while(message_p != NULL);
|
} while(message_p != NULL);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user