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-275] Part -4 classifying of logs of sch folder
[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
364157b
..
13ef272
100644
(file)
--- a/
src/du_app/du_mgr_main.c
+++ b/
src/du_app/du_mgr_main.c
@@
-61,9
+61,9
@@
DuCfgParams duCfgParam;
* ****************************************************************/
uint8_t duAppInit(SSTskId sysTskId)
{
* ****************************************************************/
uint8_t duAppInit(SSTskId sysTskId)
{
-
/* Register DU APP TAPA Task for DU */
-
if(ODU_REG_TTSK((Ent)ENTDUAPP, (Inst)DU_INST, (Ttype)TTNORM, (Prior)PRIOR0,
-
duActvInit, (ActvTsk)duActvTsk) != ROK)
+ /* Register DU APP TAPA Task for DU */
+ if(ODU_REG_TTSK((Ent)ENTDUAPP, (Inst)DU_INST, (Ttype)TTNORM, (Prior)PRIOR0,
+ duActvInit, (ActvTsk)duActvTsk) != ROK)
{
return RFAILED;
}
{
return RFAILED;
}
@@
-73,7
+73,7
@@
uint8_t duAppInit(SSTskId sysTskId)
return RFAILED;
}
return RFAILED;
}
- DU_LOG("\nDU_APP : DU APP created and registered \
+ DU_LOG("\n
INFO -->
DU_APP : DU APP created and registered \
to %d sys task", sysTskId);
return ROK;
}
to %d sys task", sysTskId);
return ROK;
}
@@
-109,7
+109,7
@@
uint8_t egtpInit(SSTskId sysTskId)
return RFAILED;
}
return RFAILED;
}
- DU_LOG("\nDU_APP : EGTP created and registered \
+ DU_LOG("\n
INFO -->
DU_APP : EGTP created and registered \
to %d sys task", sysTskId);
return ROK;
}
to %d sys task", sysTskId);
return ROK;
}
@@
-145,7
+145,7
@@
uint8_t sctpInit(SSTskId sysTskId)
return RFAILED;
}
return RFAILED;
}
- DU_LOG("\nDU_APP : SCTP TAPA task created and registered to %d sys task",
+ DU_LOG("\n
INFO -->
DU_APP : SCTP TAPA task created and registered to %d sys task",
sysTskId);
return ROK;
}
sysTskId);
return ROK;
}
@@
-191,7
+191,7
@@
uint8_t rlcDlInit(SSTskId sysTskId)
return RFAILED;
}
return RFAILED;
}
- DU_LOG("\nDU_APP : RLC DL and MAC TAPA task created and registered to \
+ DU_LOG("\n
INFO -->
DU_APP : RLC DL and MAC TAPA task created and registered to \
%d sys task", sysTskId);
return ROK;
}
%d sys task", sysTskId);
return ROK;
}
@@
-225,7
+225,7
@@
uint8_t rlcUlInit(SSTskId sysTskId)
{
return RFAILED;
}
{
return RFAILED;
}
- DU_LOG("\nDU_APP : RLC UL TAPA task created and registered to \
+ DU_LOG("\n
INFO -->
DU_APP : RLC UL TAPA task created and registered to \
%d sys task", sysTskId);
return ROK;
}
%d sys task", sysTskId);
return ROK;
}
@@
-260,7
+260,7
@@
uint8_t lwrMacInit(SSTskId sysTskId)
return RFAILED;
}
return RFAILED;
}
- DU_LOG("\nDU_APP : LWR MAC TAPA task created and registered to %d sys task",
+ DU_LOG("\n
INFO -->
DU_APP : LWR MAC TAPA task created and registered to %d sys task",
sysTskId);
return ROK;
}
sysTskId);
return ROK;
}
@@
-284,88
+284,96
@@
uint8_t lwrMacInit(SSTskId sysTskId)
uint8_t commonInit()
{
/* Declare system task Ids */
uint8_t commonInit()
{
/* Declare system task Ids */
- SSTskId du_app_stsk, sctp_stsk, rlc_ul_stsk, rlc_mac_cl_stsk, lwr_mac_stsk;
+ SSTskId du_app_stsk,
egtp_stsk,
sctp_stsk, rlc_ul_stsk, rlc_mac_cl_stsk, lwr_mac_stsk;
pthread_attr_t attr;
ODU_SET_PROC_ID(DU_PROC);
/* system task for DU APP */
pthread_attr_t attr;
ODU_SET_PROC_ID(DU_PROC);
/* system task for DU APP */
- if(
SCreateSTsk
(PRIOR0, &du_app_stsk) != ROK)
+ if(
ODU_CREATE_TASK
(PRIOR0, &du_app_stsk) != ROK)
{
{
- DU_LOG("\nDU_APP : System Task creation for DU APP failed");
+ DU_LOG("\n
ERROR -->
DU_APP : System Task creation for DU APP failed");
return RFAILED;
}
ODU_SET_THREAD_AFFINITY(&du_app_stsk, SS_AFFINITY_MODE_EXCL, 15, 0);
return RFAILED;
}
ODU_SET_THREAD_AFFINITY(&du_app_stsk, SS_AFFINITY_MODE_EXCL, 15, 0);
+ /* system task for EGTP */
+ if(ODU_CREATE_TASK(PRIOR0, &egtp_stsk) != ROK)
+ {
+ DU_LOG("\nERROR --> DU_APP : System Task creation for EGTP failed");
+ return RFAILED;
+ }
+ ODU_SET_THREAD_AFFINITY(&egtp_stsk, SS_AFFINITY_MODE_EXCL, 16, 0);
+
/* system task for RLC_DL and MAC */
/* system task for RLC_DL and MAC */
- if(
SCreateSTsk
(PRIOR0, &rlc_mac_cl_stsk) != ROK)
+ if(
ODU_CREATE_TASK
(PRIOR0, &rlc_mac_cl_stsk) != ROK)
{
{
- DU_LOG("\nDU_APP : System Task creation for RLC DL/MAC failed");
+ DU_LOG("\n
ERROR -->
DU_APP : System Task creation for RLC DL/MAC failed");
return RFAILED;
}
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
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, 1
6
, 0);
+ ODU_SET_THREAD_AFFINITY(&rlc_mac_cl_stsk, SS_AFFINITY_MODE_EXCL, 1
7
, 0);
/* system task for RLC UL */
/* system task for RLC UL */
- if(
SCreateSTsk
(PRIOR1, &rlc_ul_stsk) != ROK)
+ if(
ODU_CREATE_TASK
(PRIOR1, &rlc_ul_stsk) != ROK)
{
{
- DU_LOG("\nDU_APP : System Task creation for RLC UL failed");
+ DU_LOG("\n
ERROR -->
DU_APP : System Task creation for RLC UL failed");
return RFAILED;
}
return RFAILED;
}
- ODU_SET_THREAD_AFFINITY(&rlc_ul_stsk, SS_AFFINITY_MODE_EXCL, 1
7
, 0);
+ ODU_SET_THREAD_AFFINITY(&rlc_ul_stsk, SS_AFFINITY_MODE_EXCL, 1
8
, 0);
/* system task for SCTP receiver thread */
/* system task for SCTP receiver thread */
- if(
SCreateSTsk
(PRIOR0, &sctp_stsk) != ROK)
+ if(
ODU_CREATE_TASK
(PRIOR0, &sctp_stsk) != ROK)
{
{
- DU_LOG("\nDU_APP : System Task creation for SCTP failed");
+ DU_LOG("\n
ERROR -->
DU_APP : System Task creation for SCTP failed");
return RFAILED;
}
return RFAILED;
}
- ODU_SET_THREAD_AFFINITY(&sctp_stsk, SS_AFFINITY_MODE_EXCL, 1
8
, 0);
+ ODU_SET_THREAD_AFFINITY(&sctp_stsk, SS_AFFINITY_MODE_EXCL, 1
9
, 0);
/* system task for lower-mac receiver thread */
/* system task for lower-mac receiver thread */
- if(
SCreateSTsk
(PRIOR0, &lwr_mac_stsk) != ROK)
+ if(
ODU_CREATE_TASK
(PRIOR0, &lwr_mac_stsk) != ROK)
{
{
- DU_LOG("\nDU_APP : System Task creation for Lower MAC failed");
+ DU_LOG("\n
ERROR -->
DU_APP : System Task creation for Lower MAC failed");
return RFAILED;
}
return RFAILED;
}
- ODU_SET_THREAD_AFFINITY(&lwr_mac_stsk, SS_AFFINITY_MODE_EXCL,
19
, 0);
+ ODU_SET_THREAD_AFFINITY(&lwr_mac_stsk, SS_AFFINITY_MODE_EXCL,
20
, 0);
/* Create TAPA tasks */
if(duAppInit(du_app_stsk) != ROK)
{
/* Create TAPA tasks */
if(duAppInit(du_app_stsk) != ROK)
{
- DU_LOG("\nDU_APP : DU APP TAPA Task initialization failed");
+ DU_LOG("\n
ERROR -->
DU_APP : DU APP TAPA Task initialization failed");
return RFAILED;
}
return RFAILED;
}
- if(egtpInit(
du_ap
p_stsk) != ROK)
+ if(egtpInit(
egt
p_stsk) != ROK)
{
{
- DU_LOG("\nDU_APP : EGTP TAPA Task initialization failed");
+ DU_LOG("\n
ERROR -->
DU_APP : EGTP TAPA Task initialization failed");
return RFAILED;
}
if(sctpInit(sctp_stsk) != ROK)
{
return RFAILED;
}
if(sctpInit(sctp_stsk) != ROK)
{
- DU_LOG("\nDU_APP : SCTP TAPA Task initialization failed");
+ DU_LOG("\n
ERROR -->
DU_APP : SCTP TAPA Task initialization failed");
return RFAILED;
}
if(rlcDlInit(rlc_mac_cl_stsk) != ROK)
{
return RFAILED;
}
if(rlcDlInit(rlc_mac_cl_stsk) != ROK)
{
- DU_LOG("\nDU_APP : RLC DL Tapa Task initialization failed");
+ DU_LOG("\n
ERROR -->
DU_APP : RLC DL Tapa Task initialization failed");
return RFAILED;
}
if(rlcUlInit(rlc_ul_stsk) != ROK)
{
return RFAILED;
}
if(rlcUlInit(rlc_ul_stsk) != ROK)
{
- DU_LOG("\nDU_APP : RLC UL Tapa Task initialization failed");
+ DU_LOG("\n
ERROR -->
DU_APP : RLC UL Tapa Task initialization failed");
return RFAILED;
}
if(lwrMacInit(lwr_mac_stsk) != ROK)
{
return RFAILED;
}
if(lwrMacInit(lwr_mac_stsk) != ROK)
{
- DU_LOG("\nDU_APP : Lower MAC Tapa Task initialization failed");
+ DU_LOG("\n
ERROR -->
DU_APP : Lower MAC Tapa Task initialization failed");
return RFAILED;
}
return RFAILED;
}
@@
-396,7
+404,6
@@
uint8_t duInit()
{
ret = RFAILED;
}
{
ret = RFAILED;
}
-
return ret;
}
return ret;
}
@@
-404,6
+411,7
@@
void init_log()
{
openlog("ODU",LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1);
}
{
openlog("ODU",LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1);
}
+
/*******************************************************************
*
* @brief Entry point for the DU APP
/*******************************************************************
*
* @brief Entry point for the DU APP
@@
-423,15
+431,14
@@
void init_log()
* ****************************************************************/
uint8_t tst(void)
{
* ****************************************************************/
uint8_t tst(void)
{
-
init_log();
+ init_log();
-
//Initialize TAPA layers
-
if(duInit() != ROK)
-
{
+ //Initialize TAPA layers
+ if(duInit() != ROK)
+ {
return RFAILED;
}
return RFAILED;
}
-
//Read all the configs from du_utils.c into duCfgParams
duReadCfg();
//Read all the configs from du_utils.c into duCfgParams
duReadCfg();