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
Merge "[Issue Id- ODUHIGH-451] Fixes in F1 Setup procedure and UE attach call flow"
[o-du/l2.git]
/
src
/
5gnrsch
/
rg_sch_utl.c
diff --git
a/src/5gnrsch/rg_sch_utl.c
b/src/5gnrsch/rg_sch_utl.c
index
e9a8923
..
0e0e037
100755
(executable)
--- a/
src/5gnrsch/rg_sch_utl.c
+++ b/
src/5gnrsch/rg_sch_utl.c
@@
-38,6
+38,7
@@
#include "lrg.h"
#include "rgr.h"
#include "tfu.h"
#include "lrg.h"
#include "rgr.h"
#include "tfu.h"
+#include "sch_utils.h"
#include "rg_env.h"
#include "rg_sch_err.h"
#include "rg_sch_inf.h"
#include "rg_env.h"
#include "rg_sch_err.h"
#include "rg_sch_inf.h"
@@
-3989,8
+3990,8
@@
Size size /* size */
#ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */
MS_BUF_ADD_ALLOC_CALLER();
#endif /* */
#ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */
MS_BUF_ADD_ALLOC_CALLER();
#endif /* */
- if (SGetSBuf(rgSchCb[inst].rgSchInit.region, rgSchCb[inst].rgSchInit.pool,
-
pData, size) != ROK
)
+ SCH_ALLOC(pData, size);
+
if(pData == NULLP
)
{
RgUstaDgn dgn; /* Alarm diagnostics structure */
dgn.type = LRG_USTA_DGNVAL_MEM;
{
RgUstaDgn dgn; /* Alarm diagnostics structure */
dgn.type = LRG_USTA_DGNVAL_MEM;
@@
-4033,8
+4034,6
@@
Size size /* size */
)
{
)
{
- S16 ret;
-
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
return;
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
return;
@@
-4045,10
+4044,9
@@
Size size /* size */
MS_BUF_ADD_CALLER();
#endif /* */
/* Deallocate buffer */
MS_BUF_ADD_CALLER();
#endif /* */
/* Deallocate buffer */
- ret = SPutSBuf(rgSchCb[inst].rgSchInit.region,
- rgSchCb[inst].rgSchInit.pool, (*data), size);
+ SCH_FREE((*data), size);
- if (
ret != ROK
)
+ if (
data ==NULLP
)
{
DU_LOG("\nERROR --> SCH : rgSCHUtlFreeSBuf failed");
return;
{
DU_LOG("\nERROR --> SCH : rgSCHUtlFreeSBuf failed");
return;
@@
-4085,7
+4083,7
@@
Void rgSCHUtlFreeWarningSiSeg(Region reg,Pool pool,CmLListCp *siPduLst)
pdu = (Buffer *)node->node;
cmLListDelFrm(siPduLst, node);
RGSCH_FREE_MSG(pdu);
pdu = (Buffer *)node->node;
cmLListDelFrm(siPduLst, node);
RGSCH_FREE_MSG(pdu);
- S
PutSBuf(reg, pool, (Data *)
node,sizeof(CmLList));
+ S
CH_FREE(
node,sizeof(CmLList));
node = NULLP;
}
node = NULLP;
}
@@
-8331,10
+8329,10
@@
S16 rgSCHUtlUpdAvgPrbUsage(RgSchCellCb *cell)
numUlSf = cell->prbUsage.rprtPeriod;
#endif
numUlSf = cell->prbUsage.rprtPeriod;
#endif
- if(SGetSBuf(cell->rgmSap->sapCfg.sapPst.region,
- cell->rgmSap->sapCfg.sapPst.pool, (Data**)&prbRprtInd,
- sizeof(RgmPrbRprtInd)) != ROK)
+ SCH_ALLOC(prbRprtInd, sizeof(RgmPrbRprtInd));
+ if(prbRprtInd == NULLP)
{
{
+ DU_LOG("\nERROR --> SCH : Failed to allocate memory for prbRprtInd");
return RFAILED;
}
return RFAILED;
}