Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[ JIRA Id - ODUHIGH-606 ] Fixing null memory size allocation issue
[o-du/l2.git]
/
src
/
du_app
/
du_mgr_main.c
diff --git
a/src/du_app/du_mgr_main.c
b/src/du_app/du_mgr_main.c
index
b545555
..
aff984f
100644
(file)
--- a/
src/du_app/du_mgr_main.c
+++ b/
src/du_app/du_mgr_main.c
@@
-33,6
+33,8
@@
#include "du_egtp.h"
#include "du_cell_mgr.h"
#include "du_f1ap_msg_hdl.h"
#include "du_egtp.h"
#include "du_cell_mgr.h"
#include "du_f1ap_msg_hdl.h"
+/* global variables */
+DuCb duCb;
#ifdef O1_ENABLE
#ifdef O1_ENABLE
@@
-573,7
+575,7
@@
uint8_t phyStubInit(SSTskId sysTskId)
uint8_t commonInit()
{
/* Declare system task Ids */
uint8_t commonInit()
{
/* Declare system task Ids */
- SSTskId
du_app_stsk, egtp_stsk, sctp_stsk, rlc_ul_stsk, rlc_mac_cl_stsk, sch_stsk, lwr_mac_stsk, phy_stub_slot_ind_stsk
;
+ SSTskId
phyStubSlotIndSTskId
;
pthread_attr_t attr;
pthread_attr_t attr;
@@
-581,66
+583,59
@@
uint8_t commonInit()
/* Intel L1 using core 0-15. ODU-High using 16-21 */
/* system task for DU APP */
/* Intel L1 using core 0-15. ODU-High using 16-21 */
/* system task for DU APP */
- if(ODU_CREATE_TASK(PRIOR0, &du
_app_stsk
) != ROK)
+ if(ODU_CREATE_TASK(PRIOR0, &du
CfgParam.threadInfo.duAppSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : System Task creation for DU APP failed");
return RFAILED;
}
{
DU_LOG("\nERROR --> DU_APP : System Task creation for DU APP failed");
return RFAILED;
}
- ODU_SET_THREAD_AFFINITY(&du_app_stsk, SS_AFFINITY_MODE_EXCL, 16, 0);
/* system task for EGTP */
/* system task for EGTP */
- if(ODU_CREATE_TASK(PRIOR0, &
egtp_stsk
) != ROK)
+ if(ODU_CREATE_TASK(PRIOR0, &
duCfgParam.threadInfo.egtpSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : System Task creation for EGTP failed");
return RFAILED;
}
{
DU_LOG("\nERROR --> DU_APP : System Task creation for EGTP failed");
return RFAILED;
}
- ODU_SET_THREAD_AFFINITY(&egtp_stsk, SS_AFFINITY_MODE_EXCL, 27, 0);
/* system task for RLC_DL and MAC */
/* system task for RLC_DL and MAC */
- if(ODU_CREATE_TASK(PRIOR0, &
rlc_mac_cl_stsk
) != ROK)
+ if(ODU_CREATE_TASK(PRIOR0, &
duCfgParam.threadInfo.rlcMacSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : System Task creation for RLC DL/MAC failed");
return RFAILED;
}
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
{
DU_LOG("\nERROR --> DU_APP : System Task creation for RLC DL/MAC failed");
return RFAILED;
}
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
- ODU_SET_THREAD_AFFINITY(&rlc_mac_cl_stsk, SS_AFFINITY_MODE_EXCL, 18, 0);
/* system task for RLC UL */
/* system task for RLC UL */
- if(ODU_CREATE_TASK(PRIOR1, &
rlc_ul_stsk
) != ROK)
+ if(ODU_CREATE_TASK(PRIOR1, &
duCfgParam.threadInfo.rlcUlSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : System Task creation for RLC UL failed");
return RFAILED;
}
{
DU_LOG("\nERROR --> DU_APP : System Task creation for RLC UL failed");
return RFAILED;
}
- ODU_SET_THREAD_AFFINITY(&rlc_ul_stsk, SS_AFFINITY_MODE_EXCL, 22, 0);
/* system task for SCH */
/* system task for SCH */
- if(ODU_CREATE_TASK(PRIOR1, &
sch_stsk
) != ROK)
+ if(ODU_CREATE_TASK(PRIOR1, &
duCfgParam.threadInfo.schSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : System Task creation for SCH failed");
return RFAILED;
}
{
DU_LOG("\nERROR --> DU_APP : System Task creation for SCH failed");
return RFAILED;
}
- ODU_SET_THREAD_AFFINITY(&sch_stsk, SS_AFFINITY_MODE_EXCL, 22, 0);
/* system task for SCTP receiver thread */
/* system task for SCTP receiver thread */
- if(ODU_CREATE_TASK(PRIOR0, &
sctp_stsk
) != ROK)
+ if(ODU_CREATE_TASK(PRIOR0, &
duCfgParam.threadInfo.sctpSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : System Task creation for SCTP failed");
return RFAILED;
}
{
DU_LOG("\nERROR --> DU_APP : System Task creation for SCTP failed");
return RFAILED;
}
- ODU_SET_THREAD_AFFINITY(&sctp_stsk, SS_AFFINITY_MODE_EXCL, 25, 0);
/* system task for lower-mac receiver thread */
/* system task for lower-mac receiver thread */
- if(ODU_CREATE_TASK(PRIOR0, &
lwr_mac_stsk
) != ROK)
+ if(ODU_CREATE_TASK(PRIOR0, &
duCfgParam.threadInfo.lwrMacSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : System Task creation for Lower MAC failed");
return RFAILED;
}
{
DU_LOG("\nERROR --> DU_APP : System Task creation for Lower MAC failed");
return RFAILED;
}
- ODU_SET_THREAD_AFFINITY(&lwr_mac_stsk, SS_AFFINITY_MODE_EXCL, 21, 0);
#ifndef INTEL_WLS_MEM
/* system task for phy stub's slot indication generator thread */
#ifndef INTEL_WLS_MEM
/* system task for phy stub's slot indication generator thread */
- if(ODU_CREATE_TASK(PRIOR0, &phy
_stub_slot_ind_stsk
) != ROK)
+ if(ODU_CREATE_TASK(PRIOR0, &phy
StubSlotIndSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : System Task creation for Phy stub slot indication generator failed. MAX STSK [%d]", SS_MAX_STSKS);
return RFAILED;
{
DU_LOG("\nERROR --> DU_APP : System Task creation for Phy stub slot indication generator failed. MAX STSK [%d]", SS_MAX_STSKS);
return RFAILED;
@@
-649,50
+644,50
@@
uint8_t commonInit()
#endif
/* Create TAPA tasks */
#endif
/* Create TAPA tasks */
- if(duAppInit(du
_app_stsk
) != ROK)
+ if(duAppInit(du
CfgParam.threadInfo.duAppSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : DU APP TAPA Task initialization failed");
return RFAILED;
}
{
DU_LOG("\nERROR --> DU_APP : DU APP TAPA Task initialization failed");
return RFAILED;
}
- if(egtpInit(
egtp_stsk
) != ROK)
+ if(egtpInit(
duCfgParam.threadInfo.egtpSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : EGTP TAPA Task initialization failed");
return RFAILED;
}
{
DU_LOG("\nERROR --> DU_APP : EGTP TAPA Task initialization failed");
return RFAILED;
}
- if(sctpInit(
sctp_stsk
) != ROK)
+ if(sctpInit(
duCfgParam.threadInfo.sctpSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : SCTP TAPA Task initialization failed");
return RFAILED;
}
{
DU_LOG("\nERROR --> DU_APP : SCTP TAPA Task initialization failed");
return RFAILED;
}
- if(rlcDlInit(
rlc_mac_cl_stsk
) != ROK)
+ if(rlcDlInit(
duCfgParam.threadInfo.rlcMacSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : RLC DL Tapa Task initialization failed");
return RFAILED;
}
{
DU_LOG("\nERROR --> DU_APP : RLC DL Tapa Task initialization failed");
return RFAILED;
}
- if(rlcUlInit(
rlc_ul_stsk
) != ROK)
+ if(rlcUlInit(
duCfgParam.threadInfo.rlcUlSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : RLC UL Tapa Task initialization failed");
return RFAILED;
}
{
DU_LOG("\nERROR --> DU_APP : RLC UL Tapa Task initialization failed");
return RFAILED;
}
- if(schInit(
sch_stsk
) != ROK)
+ if(schInit(
duCfgParam.threadInfo.schSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : SCH Tapa Task initialization failed");
return RFAILED;
}
{
DU_LOG("\nERROR --> DU_APP : SCH Tapa Task initialization failed");
return RFAILED;
}
- if(lwrMacInit(
lwr_mac_stsk
) != ROK)
+ if(lwrMacInit(
duCfgParam.threadInfo.lwrMacSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : Lower MAC Tapa Task initialization failed");
return RFAILED;
}
#ifndef INTEL_WLS_MEM
{
DU_LOG("\nERROR --> DU_APP : Lower MAC Tapa Task initialization failed");
return RFAILED;
}
#ifndef INTEL_WLS_MEM
- if(phyStubInit(phy
_stub_slot_ind_stsk
) != ROK)
+ if(phyStubInit(phy
StubSlotIndSTskId
) != ROK)
{
DU_LOG("\nERROR --> DU_APP : PHY stub slot indication Tapa Task initialization failed");
return RFAILED;
{
DU_LOG("\nERROR --> DU_APP : PHY stub slot indication Tapa Task initialization failed");
return RFAILED;
@@
-759,6
+754,9
@@
uint8_t tst(void)
if(start_O1_module() != ROK)
return RFAILED;
#endif
if(start_O1_module() != ROK)
return RFAILED;
#endif
+
+ memset(&duCfgParam, 0, sizeof(DuCfgParams));
+
//Initialize TAPA layers
if(duInit() != ROK)
{
//Initialize TAPA layers
if(duInit() != ROK)
{