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

Added result check for calls to itti_free.

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4782 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
winckel
2013-12-20 10:41:27 +00:00
parent 7a2fcccc26
commit 5a6de28863
16 changed files with 126 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/ENB_APP/enb_app.c
+7 -4
View File
@@ -321,7 +321,9 @@ void *eNB_app_task(void *args_p)
# endif
MessageDef *msg_p;
const char *msg_name;
instance_t instance;
instance_t instance;
int result;
itti_mark_task_ready (TASK_ENB_APP);
# 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,
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 */
registered_enb = 0;
register_enb_pending = eNB_app_register ();
@@ -441,7 +443,8 @@ void *eNB_app_task(void *args_p)
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);
#endif
openair2/LAYER2/MAC/eNB_scheduler.c
+11 -4
View File
@@ -36,6 +36,7 @@
*/
#include "assertions.h"
#include "PHY/defs.h"
#include "PHY/extern.h"
@@ -4230,9 +4231,10 @@ void eNB_dlsch_ulsch_scheduler(u8 Mod_id,u8 cooperation_flag, u32 frame, u8 subf
int ret;
#endif
#if defined(ENABLE_ITTI)
MessageDef *msg_p;
const char *msg_name;
instance_t instance;
MessageDef *msg_p;
const char *msg_name;
instance_t instance;
int result;
#endif
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);
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:
LOG_D(MAC, "Received %s from %s: instance %d, frame %d, eNB_index %d\n",
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;
}
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);
#endif
openair2/LAYER2/MAC/ue_procedures.c
+6 -4
View File
@@ -1284,9 +1284,10 @@ UE_L2_STATE_t ue_scheduler(u8 Mod_id,u32 frame, u8 subframe, lte_subframe_t dire
int ret;
#endif
#if defined(ENABLE_ITTI)
MessageDef *msg_p;
const char *msg_name;
instance_t instance;
MessageDef *msg_p;
const char *msg_name;
instance_t instance;
int result;
#endif
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;
}
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);
#endif
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+8 -5
View File
@@ -522,9 +522,10 @@ BOOL pdcp_data_ind(u8 eNB_id, u8 UE_id, u32_t frame, u8_t eNB_flag, u8_t MBMS_fl
void pdcp_run (u32_t frame, u8 eNB_flag, u8 UE_index, u8 eNB_index) {
//-----------------------------------------------------------------------------
#if defined(ENABLE_ITTI)
MessageDef *msg_p;
const char *msg_name;
instance_t instance;
MessageDef *msg_p;
const char *msg_name;
instance_t instance;
int result;
#endif
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);
// 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;
default:
@@ -559,7 +561,8 @@ void pdcp_run (u32_t frame, u8 eNB_flag, u8 UE_index, u8 eNB_index) {
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);
#endif
openair2/RRC/LITE/rrc_UE.c
+9 -5
View File
@@ -36,6 +36,7 @@
*/
#include "assertions.h"
#include "defs.h"
#include "PHY/TOOLS/dB_routines.h"
#include "extern.h"
@@ -2404,11 +2405,12 @@ EXPORT_SYMBOL(Rlc_info_am_config);
#if defined(ENABLE_ITTI)
void *rrc_ue_task(void *args_p) {
MessageDef *msg_p;
const char *msg_name;
instance_t instance;
MessageDef *msg_p;
const char *msg_name;
instance_t instance;
unsigned int Mod_id;
SRB_INFO *srb_info_p;
int result;
SRB_INFO *srb_info_p;
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);
// 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;
# 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);
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
msg_p = NULL;
}
}
openair2/RRC/LITE/rrc_eNB.c
+9 -6
View File
@@ -3021,10 +3021,11 @@ int rrc_eNB_decode_dcch (u8 Mod_id, u32 frame, u8 Srb_id, u8 UE_index,
#if defined(ENABLE_ITTI)
/*------------------------------------------------------------------------------*/
void *rrc_enb_task(void *args_p) {
MessageDef *msg_p;
const char *msg_name;
instance_t instance;
SRB_INFO *srb_info_p;
MessageDef *msg_p;
const char *msg_name;
instance_t instance;
int result;
SRB_INFO *srb_info_p;
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);
// 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;
#if defined(ENABLE_USE_MME)
@@ -3104,7 +3106,8 @@ void *rrc_enb_task(void *args_p) {
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;
}
}