X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fss_msg.c;h=87e10376c3509803cca5db352b776c2d928bc137;hb=65780c0e397afca1bc67923de1a19a420a0e86f3;hp=55f75654296697445ce74f6c00bfc6ba3560dff3;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git diff --git a/src/mt/ss_msg.c b/src/mt/ss_msg.c index 55f756542..87e10376c 100644 --- a/src/mt/ss_msg.c +++ b/src/mt/ss_msg.c @@ -91,8 +91,8 @@ #endif /* SS_SEUM_CAVIUM */ #include #ifdef XEON_SPECIFIC_CHANGES -U32 startMemLeak=0; -extern pthread_mutex_t memLock; +uint32_t startMemLeak=0; +pthread_mutex_t memLock; #endif #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF)) @@ -104,23 +104,23 @@ extern pthread_mutex_t memLock; #include "mt_plat_t33.x" #endif /* forward declarations */ -PUBLIC S16 ssGetDBufOfSize ARGS((Region region, Size size, Buffer **dBuf)); -PUBLIC S16 SIncMsgRef(Buffer *srcBuf,Region dstRegion, Pool dstPool,Buffer **dstBuf); +S16 ssGetDBufOfSize ARGS((Region region, Size size, Buffer **dBuf)); +S16 SIncMsgRef(Buffer *srcBuf,Region dstRegion, Pool dstPool,Buffer **dstBuf); #ifdef SSI_STATIC_MEM_LEAK_DETECTION -EXTERN PUBLIC U32 GetNextFreeIdx ARGS((StaticMemAllocInfo * memAllocInfo)); -EXTERN PUBLIC void LogForStaticMemLeak ARGS((StaticMemAllocInfo* memAllocInfo, char* - file, U32 line, U32 size, void* ptr, U32 idx)); -EXTERN PUBLIC void FreeIdx ARGS((U8* ptr, U32 idx, StaticMemAllocInfo* - memAllocInfo,U32 size, char* file, U32 line)); +uint32_t GetNextFreeIdx ARGS((StaticMemAllocInfo * memAllocInfo)); +void LogForStaticMemLeak ARGS((StaticMemAllocInfo* memAllocInfo, char* + file, uint32_t line, uint32_t size, void* ptr, uint32_t idx)); +void FreeIdx ARGS((uint8_t* ptr, uint32_t idx, StaticMemAllocInfo* + memAllocInfo,uint32_t size, char* file, uint32_t line)); #endif #ifdef SS_USE_ZBC_MEMORY #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 SPutZbcDBufNew ARGS((Region region, Buffer *buf,char*,U32)); +static S16 SPutZbcDBufNew ARGS((Region region, Buffer *buf,char*,uint32_t)); #else -PRIVATE S16 SPutZbcDBuf ARGS((Region region, Buffer *buf)); -PUBLIC S16 SAttachPtrToBuf ARGS(( Region region, Pool pool, Data *ptr, +static S16 SPutZbcDBuf ARGS((Region region, Buffer *buf)); +S16 SAttachPtrToBuf ARGS(( Region region, Pool pool, Data *ptr, MsgLen totalLen, Buffer** mBuf)); #endif #endif @@ -129,35 +129,35 @@ PUBLIC S16 SAttachPtrToBuf ARGS(( Region region, Pool pool, Data *ptr, #ifdef SS_M_PROTO_REGION #ifdef T2K_MEM_LEAK_DBG #define DupMsg(region,buffer) DupMsgNew(region,buffer,file,line) -PRIVATE Buffer *DupMsgNew ARGS((Region region, Buffer *buffer,char*,U32)); +static Buffer *DupMsgNew ARGS((Region region, Buffer *buffer,char*,uint32_t)); #else #ifdef INTEL_WLS #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SAttachPtrToMBuf1 ARGS(( Region region, Pool pool, Data *ptr, MsgLen totalLen, - MsgLen ptrLen, Buffer** mBuf, char* file, U32 line)); +S16 SAttachPtrToMBuf1 ARGS(( Region region, Pool pool, Data *ptr, MsgLen totalLen, + MsgLen ptrLen, Buffer** mBuf, char* file, uint32_t line)); #else -PUBLIC S16 SAttachPtrToMBuf ARGS(( Region region, Pool pool, Data *ptr, MsgLen totalLen, +S16 SAttachPtrToMBuf ARGS(( Region region, Pool pool, Data *ptr, MsgLen totalLen, MsgLen ptrLen, Buffer** mBuf)); #endif #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SAttachWlsPtrToMBuf1 ARGS(( Region region, Pool pool, Data *ptr, +S16 SAttachWlsPtrToMBuf1 ARGS(( Region region, Pool pool, Data *ptr, Data *readPtr, MsgLen totalLen, - MsgLen ptrLen, Buffer** mBuf, char* file, U32 line)); + MsgLen ptrLen, Buffer** mBuf, char* file, uint32_t line)); -PUBLIC S16 SAttachWlsPtrToMBuf ARGS(( Region region, Pool pool, Data *ptr, +S16 SAttachWlsPtrToMBuf ARGS(( Region region, Pool pool, Data *ptr, Data *readPtr, MsgLen totalLen, MsgLen ptrLen, Buffer** mBuf)); #endif #ifdef TENB_DPDK_BUF -PUBLIC S16 SDetachDpdkPtrFrmMBuf ARGS((Buffer *mBuf, Data **ptr)); -PUBLIC S16 SDetachDpdkPtrFrmDBuf ARGS((Buffer *mBuf, Data **ptr)); -PUBLIC S16 SPutSBufDpdk ARGS(( Data *ptr)); +S16 SDetachDpdkPtrFrmMBuf ARGS((Buffer *mBuf, Data **ptr)); +S16 SDetachDpdkPtrFrmDBuf ARGS((Buffer *mBuf, Data **ptr)); +S16 SPutSBufDpdk ARGS(( Data *ptr)); #endif /* TENB_DPDK_BUF */ #endif /* INTEL_WLS */ -PRIVATE Buffer *DupMsg ARGS((Region region, Buffer *buffer)); +static Buffer *DupMsg ARGS((Region region, Buffer *buffer)); #endif #endif /* SS_M_PROTO_REGION */ @@ -213,10 +213,10 @@ PRIVATE Buffer *DupMsg ARGS((Region region, Buffer *buffer)); } -EXTERN pthread_t tmpRegTidMap[20]; +pthread_t tmpRegTidMap[20]; #define CM_MEM_GET_REGION(_region) \ { \ - U8 _regCnt; \ + uint8_t _regCnt; \ _region = 0xFF; \ \ for(_regCnt = 0; _regCnt < 12; _regCnt++) \ @@ -230,7 +230,7 @@ EXTERN pthread_t tmpRegTidMap[20]; } #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF) || defined(L2_OPTMZ)) -extern S32 clusterMode; +S32 clusterMode; #endif /* * @@ -251,68 +251,59 @@ extern S32 clusterMode; * */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 ssGetDBufOfSizeNew +S16 ssGetDBufOfSizeNew ( Region region, Size size, Buffer **dBuf, char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 ssGetDBufOfSize +S16 ssGetDBufOfSize ( Region region, Size size, Buffer **dBuf ) -#else -PUBLIC S16 ssGetDBufOfSize(region, size, dBuf) -Region region; -Size size; -Buffer **dBuf; -#endif #endif { Size mdsize; Data *data; SsDblk *dptr; - TRC1(ssGetDBufOfSize) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ if (!dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS047, ERRZERO, "ssGetDBufOfSize : Null\ Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS048, ERRZERO, "ssGetDBufOfSize : Invalid\ region id"); - RETVALUE(RFAILED); + return RFAILED; } if (size <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS049, ERRZERO, "ssGetDBufOfSize : Invalid\ size"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss006.301 : optmized this function */ mdsize = MDBSIZE + size; #ifdef SS_HISTOGRAM_SUPPORT - if (SAlloc(region, &mdsize, 0, (Data **) dBuf, __LINE__, (U8*) __FILE__, ENTNC) != ROK) + if (SAlloc(region, &mdsize, 0, (Data **) dBuf, __LINE__, (uint8_t*) __FILE__, ENTNC) != ROK) #else if (SAlloc(region, &mdsize, 0, (Data **) dBuf) != ROK) #endif /* SS_HISTOGRAM_SUPPORT */ { - RETVALUE(ROUTRES); + return (ROUTRES); } data = (Data *) (*dBuf) + MDBSIZE; size = mdsize - MDBSIZE; @@ -327,7 +318,7 @@ Buffer **dBuf; } #endif - RETVALUE(ROK); + return ROK; } /* ssGetDBufOfSize */ @@ -350,47 +341,31 @@ Buffer **dBuf; */ /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT -#ifdef ANSI -PUBLIC S16 SGetMsgNew +S16 SGetMsgNew ( Region region, /* region id */ Pool pool, /* pool id */ Buffer **mBuf, /* pointer to message buffer */ -U32 line, -U8 *fileName +uint32_t line, +uint8_t *fileName ) -#else -PUBLIC S16 SGetMsgNew(region, pool, mBuf, line, fileName) -Region region; /* region id */ -Pool pool; /* pool id */ -Buffer **mBuf; /* pointer to message buffer */ -U32 line; -U8 *fileName; -#endif #else /* SS_HISTOGRAM_SUPPORT */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SGetMsgNew +S16 SGetMsgNew ( Region region, /* region id */ Pool pool, /* pool id */ Buffer **mBuf, /* pointer to message buffer */ char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SGetMsg +S16 SGetMsg ( Region region, /* region id */ Pool pool, /* pool id */ Buffer **mBuf /* pointer to message buffer */ ) -#else -PUBLIC S16 SGetMsg(region, pool, mBuf) -Region region; /* region id */ -Pool pool; /* pool id */ -Buffer **mBuf; /* pointer to message buffer */ -#endif #endif #endif /* SS_HISTOGRAM_SUPPORT */ { @@ -411,8 +386,6 @@ Buffer **mBuf; /* pointer to message buffer */ #endif - TRC1(SGetMsgNew) - #ifdef XEON_SPECIFIC_CHANGES region = 0; pool = 0; @@ -423,19 +396,19 @@ Buffer **mBuf; /* pointer to message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS050, ERRZERO, "SGetMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS051, ERRZERO, "SGetMsg : Invalid region\ id"); - RETVALUE(RFAILED); + return RFAILED; } if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS052, ERRZERO, "SGetMsg : Invalid pool id"); - RETVALUE(RFAILED); + return RFAILED; } /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -452,7 +425,7 @@ Buffer **mBuf; /* pointer to message buffer */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif #endif @@ -468,12 +441,12 @@ Buffer **mBuf; /* pointer to message buffer */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS054, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif SSLOGERROR(ERRCLS_INT_PAR, ESS055, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -483,7 +456,7 @@ Buffer **mBuf; /* pointer to message buffer */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS056, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -504,7 +477,7 @@ Buffer **mBuf; /* pointer to message buffer */ #endif /* SS_HISTOGRAM_SUPPORT */ { SSLOGERROR(ERRCLS_DEBUG, ESS058, ERRZERO, "SGetMsg:Failed in SAlloc"); - RETVALUE(ROUTRES); + return (ROUTRES); } #else /* SS_M_PROTO_REGION */ /* ss001.301: additions */ @@ -515,7 +488,7 @@ Buffer **mBuf; /* pointer to message buffer */ #endif /* SS_HISTOGRAM_SUPPORT */ { SSLOGERROR(ERRCLS_DEBUG, ESS059, ERRZERO, "SGetMsg:Failed in SAlloc"); - RETVALUE(ROUTRES); + return (ROUTRES); } #endif /* SS_M_PROTO_REGION */ @@ -546,7 +519,7 @@ Buffer **mBuf; /* pointer to message buffer */ } } #endif - RETVALUE(ROK); + return ROK; } #ifdef RGL_SPECIFIC_CHANGES @@ -558,7 +531,7 @@ S16 SSetMBufPool(Buffer *mBuf, Pool pool) minfo = (SsMsgInfo*) mBuf->b_rptr; minfo->pool = pool; - RETVALUE(ROK); + return ROK; } #endif @@ -581,44 +554,32 @@ S16 SSetMBufPool(Buffer *mBuf, Pool pool) */ /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT -#ifdef ANSI -PUBLIC S16 SPutMsgNew +S16 SPutMsgNew ( Buffer *mBuf, -U32 line, -U8 *fileName +uint32_t line, +uint8_t *fileName ) -#else -PUBLIC S16 SPutMsgNew(mBuf, line, fileName) -Buffer *mBuf; -U32 line; -U8 *fileName; -#endif #else /* SS_HISTOGRAM_SUPPORT */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SPutMsgNew +S16 SPutMsgNew ( Buffer *mBuf, char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SPutMsg +S16 SPutMsg ( Buffer *mBuf ) -#else -PUBLIC S16 SPutMsg(mBuf) -Buffer *mBuf; -#endif #endif #endif /* SS_HISTOGRAM_SUPPORT */ { Buffer *tmp; SsMsgInfo *minfo; #ifdef SS_MEM_WL_DEBUG - U8 tmpThrReg; + uint8_t tmpThrReg; #endif /* ss001.301: additions */ @@ -626,8 +587,6 @@ Buffer *mBuf; Ent entId = 0; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC1(SPutMsgNew) - #ifdef L2_OPTMZ //#ifdef RADIO_CLUSTER if(clusterMode == RADIO_CLUSTER_MODE) @@ -638,14 +597,14 @@ Buffer *mBuf; } if (mBuf->refCnt > 0) { - RETVALUE(ROK); + return ROK; } } #endif #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF)) { - extern pthread_t gMacTId,gRlcTId; - extern S32 clusterMode; + pthread_t gMacTId,gRlcTId; + S32 clusterMode; if(clusterMode == RADIO_CLUSTER_MODE) { @@ -655,7 +614,7 @@ Buffer *mBuf; { if(ROK == mtAddBufToRing(SS_RNG_BUF_MAC_FREE_RING,(Void *)mBuf,0)) { - RETVALUE(ROK); + return ROK; } } #endif @@ -664,7 +623,7 @@ Buffer *mBuf; { if(ROK == mtAddBufToRing(SS_RNG_BUF_RLC_FREE_RING,(Void *)mBuf,0)) { - RETVALUE(ROK); + return ROK; } } #endif @@ -676,13 +635,13 @@ Buffer *mBuf; if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS060, ERRZERO, "SPutMsg: Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS061, ERRZERO, "SPutMsg: Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -690,8 +649,10 @@ Buffer *mBuf; CM_MEM_GET_REGION(tmpThrReg) if(tmpThrReg == 0xFF) { +#ifdef ERROR_PRINT printf("\n Not able to get region \n"); - RETVALUE(RFAILED); +#endif + return RFAILED; } #endif @@ -726,7 +687,7 @@ Buffer *mBuf; if (SFree(minfo->region, (Data *) mBuf, MSGSIZE) == RFAILED) #endif #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(RFAILED); + return RFAILED; #else /* SS_M_PROTO_REGION */ /* ss021.103 - Addition to check return value of SFree */ #ifdef SS_HISTOGRAM_SUPPORT @@ -734,10 +695,10 @@ Buffer *mBuf; #else if (SFree(minfo->region, (Data *) mBuf, MSGSIZE) == RFAILED) #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(RFAILED); + return RFAILED; #endif /* SS_M_PROTO_REGION */ - RETVALUE(ROK); + return ROK; } #ifdef SS_LOCKLESS_MEMORY @@ -758,71 +719,60 @@ Buffer *mBuf; */ /* ss001.301: additions */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SPutStaticBufferNew +S16 SPutStaticBufferNew ( Region region, /* region ID */ Pool pool, /* pool ID */ Data *ptr, /* pointer to buffer */ Size size, /* size */ -U8 memType, /* memory type used if shareable or not */ +uint8_t memType, /* memory type used if shareable or not */ char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SPutStaticBuffer +S16 SPutStaticBuffer ( Region region, /* region ID */ Pool pool, /* pool ID */ Data *ptr, /* pointer to buffer */ Size size, /* size */ -U8 memType /* memory type used if shareable or not */ +uint8_t memType /* memory type used if shareable or not */ ) -#else -PUBLIC S16 SPutStaticBuffer(region, pool, ptr, size) -Region region; /* region ID */ -Pool pool; /* pool ID */ -Data *ptr; /* pointer to buffer */ -Size size; /* size */ -U8 memType; /* memory type used if shareable or not */ -#endif #endif { S16 ret = RFAILED; - TRC1(SPutStaticBuffer); - #if (ERRCLASS & ERRCLS_INT_PAR) /* validate region ID */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS220, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate pool ID */ if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS221, pool, "Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } /* validate data pointer */ if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS223, (ErrVal)0, "NULL data pointe"); - RETVALUE(RFAILED); + return RFAILED; } /* validate size */ if (size <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS224, size, "Invalid size"); - RETVALUE(RFAILED); + return RFAILED; } #endif #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF)) { - extern pthread_t gMacTId,gRlcTId; + pthread_t gMacTId,gRlcTId; if(clusterMode == RADIO_CLUSTER_MODE) { @@ -832,7 +782,7 @@ U8 memType; /* memory type used if shareable or not */ { if(ROK == mtAddBufToRing(SS_RNG_BUF_MAC_FREE_RING,(Void *)ptr,1)) { - RETVALUE(ROK); + return ROK; } } #endif @@ -841,7 +791,7 @@ U8 memType; /* memory type used if shareable or not */ { if(ROK == mtAddBufToRing(SS_RNG_BUF_RLC_FREE_RING,(Void *)ptr,1)) { - RETVALUE(ROK); + return ROK; } } } @@ -859,7 +809,7 @@ U8 memType; /* memory type used if shareable or not */ (osCp.dynRegionTbl[region].used == FALSE))) { SSLOGERROR(ERRCLS_INT_PAR, ESS218, region, "Region not registered"); - RETVALUE(ret); + return (ret); } #endif @@ -891,7 +841,7 @@ U8 memType; /* memory type used if shareable or not */ } #endif - RETVALUE(ret); + return (ret); } /* @@ -913,67 +863,56 @@ U8 memType; /* memory type used if shareable or not */ * */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SGetStaticBufferNew +S16 SGetStaticBufferNew ( Region region, /* region ID */ Pool pool, /* pool ID */ Data **ptr, /* pointer to buffer */ Size size, /* size requested */ -U8 memType, /* memory type used if shareable or not */ +uint8_t memType, /* memory type used if shareable or not */ char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SGetStaticBuffer +S16 SGetStaticBuffer ( Region region, /* region ID */ Pool pool, /* pool ID */ Data **ptr, /* pointer to buffer */ Size size, /* size requested */ -U8 memType /* memory type used if shareable or not */ +uint8_t memType /* memory type used if shareable or not */ ) -#else -PUBLIC S16 SGetStaticBuffer(region, pool, ptr, size) -Region region; /* region ID */ -Pool pool; /* pool ID */ -Data **ptr; /* pointer to buffer */ -Size size; /* size requested */ -U8 memType; /* memory type used if shareable or not */ -#endif #endif { S16 ret = RFAILED; - U32 flags; - - TRC1(SGetStaticBuffer); + uint32_t flags; #if (ERRCLASS & ERRCLS_INT_PAR) /* validate region ID */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS211, region, "Invalid region"); - RETVALUE(ret); + return (ret); } /* validate pool ID */ if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS212, pool, "Invalid pool"); - RETVALUE(ret); + return (ret); } /* validate data pointer */ if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS214, (ErrVal)0 , "NULL data pointer"); - RETVALUE(ret); + return (ret); } /* validate size */ if (size <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS215, size, "Invalid size"); - RETVALUE(ret); + return (ret); } #endif @@ -985,7 +924,7 @@ U8 memType; /* memory type used if shareable or not */ (osCp.dynRegionTbl[region].used == FALSE))) { SSLOGERROR(ERRCLS_INT_PAR, ESS218, region, "Region not registered"); - RETVALUE(ret); + return (ret); } #endif @@ -1023,77 +962,59 @@ U8 memType; /* memory type used if shareable or not */ } #endif - RETVALUE(ret); + return (ret); } #endif /* SS_LOCKLESS_MEMORY */ -#ifdef INTEL_WLS +#ifdef INTEL_WLS_MEM #ifndef SS_LOCKLESS_MEMORY -#ifdef ANSI -PUBLIC S16 SGetStaticBuffer +S16 SGetStaticBuffer ( Region region, /* region ID */ Pool pool, /* pool ID */ Data **ptr, /* pointer to buffer */ Size size, /* size requested */ -U8 memType /* memory type used if shareable or not */ +uint8_t memType /* memory type used if shareable or not */ ) -#else -PUBLIC S16 SGetStaticBuffer(region, pool, ptr, size) -Region region; /* region ID */ -Pool pool; /* pool ID */ -Data **ptr; /* pointer to buffer */ -Size size; /* size requested */ -U8 memType; /* memory type used if shareable or not */ -#endif { S16 ret; ret = SGetSBuf(region, pool, ptr, size); - RETVALUE(ret); + return (ret); } -#ifdef ANSI -PUBLIC S16 SPutStaticBuffer +S16 SPutStaticBuffer ( Region region, /* region ID */ Pool pool, /* pool ID */ Data *ptr, /* pointer to buffer */ Size size, /* size */ -U8 memType /* memory type used if shareable or not */ +uint8_t memType /* memory type used if shareable or not */ ) -#else -PUBLIC S16 SPutStaticBuffer(region, pool, ptr, size) -Region region; /* region ID */ -Pool pool; /* pool ID */ -Data *ptr; /* pointer to buffer */ -Size size; /* size */ -U8 memType; /* memory type used if shareable or not */ -#endif { S16 ret; ret = SPutSBuf(region, pool, ptr, size); - RETVALUE(ret); + return (ret); } #endif #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SGetSBufWls1 +S16 SGetSBufWls1 ( Region region, /* region ID */ Pool pool, /* pool ID */ Data **ptr, /* pointer to buffer */ Size size, /* size requested */ char* file, -U32 line +uint32_t line ) #else -PUBLIC S16 SGetSBufWls +S16 SGetSBufWls ( Region region, /* region ID */ Pool pool, /* pool ID */ @@ -1103,7 +1024,9 @@ Size size /* size requested */ #endif { S16 ret; - U32 flags = 0; +#ifndef SS_LOCKLESS_MEMORY + uint32_t flags = 0; +#endif #ifdef SS_LOCKLESS_MEMORY region = SS_GET_THREAD_MEM_REGION(); @@ -1119,21 +1042,21 @@ Size size /* size requested */ #endif #endif - RETVALUE(ret); + return (ret); } #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SPutSBufWls1 +S16 SPutSBufWls1 ( Region region, /* region ID */ Pool pool, /* pool ID */ Data *ptr, /* pointer to buffer */ Size size, /* size */ char* file, -U32 line +uint32_t line ) #else -PUBLIC S16 SPutSBufWls +S16 SPutSBufWls ( Region region, /* region ID */ Pool pool, /* pool ID */ @@ -1156,7 +1079,7 @@ Size size /* size */ #endif #endif - RETVALUE(ret); + return (ret); } #endif /* INTEL_WLS */ @@ -1181,67 +1104,39 @@ Size size /* size */ */ /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT -#ifdef ANSI -PUBLIC S16 SGetSBufNew +S16 SGetSBufNew ( Region region, /* region ID */ Pool pool, /* pool ID */ Data **ptr, /* pointer to buffer */ Size size, /* size requested */ -U32 line, -U8 *fileName +uint32_t line, +uint8_t *fileName ) -#else -PUBLIC S16 SGetSBufNew(region, pool, ptr, size, line, fileName) -Region region; /* region ID */ -Pool pool; /* pool ID */ -Data **ptr; /* pointer to buffer */ -Size size; /* size requested */ -U32 line; -U8 *fileName; -#endif #else /* SS_HISTOGRAM_SUPPORT */ #if (defined(SSI_STATIC_MEM_LEAK_DETECTION) || defined(T2K_MEM_LEAK_DBG)) -#ifdef ANSI -PUBLIC S16 SGetSBuf1 +S16 SGetSBuf1 ( Region region, /* region ID */ Pool pool, /* pool ID */ Data **ptr, /* pointer to buffer */ Size size, /* size requested */ char* file, -U32 line +uint32_t line ) #else -PUBLIC S16 SGetSBuf1(region, pool, ptr, size, file, line) -Region region; /* region ID */ -Pool pool; /* pool ID */ -Data **ptr; /* pointer to buffer */ -Size size; /* size requested */ -char* file; -U32 line; -#endif -#else -#ifdef ANSI -PUBLIC S16 SGetSBuf +S16 SGetSBuf ( Region region, /* region ID */ Pool pool, /* pool ID */ Data **ptr, /* pointer to buffer */ Size size /* size requested */ ) -#else -PUBLIC S16 SGetSBuf(region, pool, ptr, size) -Region region; /* region ID */ -Pool pool; /* pool ID */ -Data **ptr; /* pointer to buffer */ -Size size; /* size requested */ -#endif #endif #endif /* SS_HISTOGRAM_SUPPORT */ { S16 ret; - U32 flags; + uint32_t flags; #ifdef SSI_STATIC_MEM_LEAK_DETECTION Size tmpSize; #endif @@ -1251,7 +1146,6 @@ Size size; /* size requested */ Bool hstReg = FALSE; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC1(SGetSBufNew); region = SS_GET_THREAD_MEM_REGION(); #ifdef INTEL_WLS @@ -1263,28 +1157,28 @@ Size size; /* size requested */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS211, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate pool ID */ if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS212, pool, "Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } /* ss008.13: addition */ /* validate data pointer */ if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS214, (ErrVal)0 , "NULL data pointer"); - RETVALUE(RFAILED); + return RFAILED; } /* validate size */ if (size <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS215, size, "Invalid size"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -1303,7 +1197,7 @@ Size size; /* size requested */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1320,12 +1214,12 @@ Size size; /* size requested */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS217, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS218, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -1377,18 +1271,18 @@ Size size; /* size requested */ #endif /*size = tmpSize - 4;*/ { - /*printf("ptr = %p *ptr = %p\n",ptr,*ptr);*/ + /*printf("\nptr = %p *ptr = %p\n",ptr,*ptr);*/ #ifdef XEON_SPECIFIC_CHANGES pthread_mutex_lock(&(memLock)); #endif - U32 idx = GetNextFreeIdx(&SMemLeakInfo[region]); - U8* allocatedPtr = *ptr; + uint32_t idx = GetNextFreeIdx(&SMemLeakInfo[region]); + uint8_t* allocatedPtr = *ptr; void* actualPtr = allocatedPtr + 4; *ptr = actualPtr; /* store the index in the memory allocated itself */ - /**((U32*)*((U32*)allocatedPtr)) = idx;*/ - *((U32*)allocatedPtr) = idx; - /*printf("region = %d idx = %d ptr = %p *ptr = %p actual = %p allocated = %p content = %d\n",region, idx, ptr, *ptr, actualPtr, allocatedPtr, *((U32*)allocatedPtr));*/ + /**((uint32_t*)*((uint32_t*)allocatedPtr)) = idx;*/ + *((uint32_t*)allocatedPtr) = idx; + /*printf("\nregion = %d idx = %d ptr = %p *ptr = %p actual = %p allocated = %p content = %d\n",region, idx, ptr, *ptr, actualPtr, allocatedPtr, *((uint32_t*)allocatedPtr));*/ LogForStaticMemLeak(&SMemLeakInfo[region], file, @@ -1423,7 +1317,7 @@ Size size; /* size requested */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS219, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -1437,7 +1331,7 @@ Size size; /* size requested */ } #endif /* SSI_DEBUG_LEVEL1 */ - RETVALUE(ret); + return (ret); } @@ -1458,62 +1352,34 @@ Size size; /* size requested */ */ /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT -#ifdef ANSI -PUBLIC S16 SPutSBufNew +S16 SPutSBufNew ( Region region, /* region ID */ Pool pool, /* pool ID */ Data *ptr, /* pointer to buffer */ Size size, /* size */ -U32 line, -U8 *fileName +uint32_t line, +uint8_t *fileName ) -#else -PUBLIC S16 SPutSBufNew(region, pool, ptr, size, line, fileName) -Region region; /* region ID */ -Pool pool; /* pool ID */ -Data *ptr; /* pointer to buffer */ -Size size; /* size */ -U32 line; -U8 *fileName; -#endif #else /* SS_HISTOGRAM_SUPPORT */ #if (defined(SSI_STATIC_MEM_LEAK_DETECTION) || defined(T2K_MEM_LEAK_DBG)) -#ifdef ANSI -PUBLIC S16 SPutSBuf1 +S16 SPutSBuf1 ( Region region, /* region ID */ Pool pool, /* pool ID */ Data *ptr, /* pointer to buffer */ Size size, /* size */ char* file, -U32 line +uint32_t line ) #else -PUBLIC S16 SPutSBuf1(region, pool, ptr, size, file, line) -Region region; /* region ID */ -Pool pool; /* pool ID */ -Data *ptr; /* pointer to buffer */ -Size size; /* size */ -char* file; -U32 line; -#endif -#else -#ifdef ANSI -PUBLIC S16 SPutSBuf +S16 SPutSBuf ( Region region, /* region ID */ Pool pool, /* pool ID */ Data *ptr, /* pointer to buffer */ Size size /* size */ ) -#else -PUBLIC S16 SPutSBuf(region, pool, ptr, size) -Region region; /* region ID */ -Pool pool; /* pool ID */ -Data *ptr; /* pointer to buffer */ -Size size; /* size */ -#endif #endif #endif /* SS_HISTOGRAM_SUPPORT */ { @@ -1524,9 +1390,6 @@ Size size; /* size */ Bool hstReg = FALSE; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC1(SPutSBufNew); - - region = SS_GET_THREAD_MEM_REGION(); #if (!defined(SS_LOCKLESS_MEMORY) && defined(INTEL_WLS)) region = 1; @@ -1537,28 +1400,28 @@ Size size; /* size */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS220, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate pool ID */ if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS221, pool, "Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } /* ss008.13: addition */ /* validate data pointer */ if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS223, (ErrVal)0, "NULL data pointe"); - RETVALUE(RFAILED); + return RFAILED; } /* validate size */ if (size <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS224, size, "Invalid size"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -1576,7 +1439,7 @@ Size size; /* size */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1592,12 +1455,12 @@ Size size; /* size */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS226, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif SSLOGERROR(ERRCLS_INT_PAR, ESS227, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1607,7 +1470,7 @@ Size size; /* size */ #ifdef XEON_SPECIFIC_CHANGES pthread_mutex_lock(&(memLock)); #endif - U32 idx = *((U32*)((U8 *)ptr - 4)); + uint32_t idx = *((uint32_t*)((uint8_t *)ptr - 4)); FreeIdx(ptr,idx,&SMemLeakInfo[region],size,file,line); #ifdef XEON_SPECIFIC_CHANGES pthread_mutex_unlock(&(memLock)); @@ -1653,7 +1516,7 @@ Size size; /* size */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS228, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -1668,7 +1531,7 @@ Size size; /* size */ } #endif /* SSI_DEBUG_LEVEL1 */ - RETVALUE(ret); + return (ret); } @@ -1690,34 +1553,24 @@ Size size; /* size */ * */ -#ifdef ANSI -PUBLIC S16 SInitMsg -( -Buffer *mBuf -) -#else -PUBLIC S16 SInitMsg(mBuf) -Buffer *mBuf; -#endif +S16 SInitMsg(Buffer *mBuf) { SsMsgInfo *minfo; Buffer *tmp; - U8 tmpRegId; - - TRC1(SInitMsg) + uint8_t tmpRegId; #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS062, ERRZERO, "SInitMsg: Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS063, ERRZERO, "SInitMsg: Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1727,7 +1580,7 @@ Buffer *mBuf; CM_MEM_GET_REGION(tmpRegId); if(tmpRegId == 0xFF) { - RETVALUE(RFAILED); + return RFAILED; } #endif minfo = (SsMsgInfo*) mBuf->b_rptr; @@ -1740,7 +1593,7 @@ Buffer *mBuf; #if 1 #ifdef T2K_MEM_LEAK_DBG char * file = __FILE__; - U32 line = __LINE__; + uint32_t line = __LINE__; #endif (Void) SPutDBuf(tmpRegId, minfo->pool, tmp); @@ -1754,7 +1607,7 @@ Buffer *mBuf; minfo->endptr = NULLP; minfo->next = NULLP; - RETVALUE(ROK); + return ROK; } /* ss016.301 - Added a new API - SAddPreMsgMultInOrder. This preserves the @@ -1781,19 +1634,12 @@ Buffer *mBuf; * File: ss_msg.c * */ -#ifdef ANSI -PUBLIC S16 SAddPreMsgMultInOrder +S16 SAddPreMsgMultInOrder ( - Data *src, - MsgLen cnt, - Buffer *mBuf - ) -#else -PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf) - Data *src; - MsgLen cnt; - Buffer *mBuf; -#endif +Data *src, +MsgLen cnt, +Buffer *mBuf +) { SsMsgInfo *minfo; /* Message info */ Buffer *tmp; @@ -1805,7 +1651,6 @@ PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf) MsgLen offset; Data *rptr; Data *revSrc; - TRC1(SAddPreMsgMultInOrder) #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ @@ -1813,27 +1658,27 @@ PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS070, ERRZERO, "SAddPreMsgMultInOrder:\ Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check source */ if (src == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS071, ERRZERO, "SAddPreMsgMultInOrder:\ Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check count */ if (cnt <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS072, ERRZERO, "SAddPreMsgMultInOrder:\ Invalid count"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS073, ERRZERO, "SAddPreMsgMultInOrder:\ Incorrect buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1873,7 +1718,7 @@ PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf) if (!cnt) { minfo->len += len; - RETVALUE(ROK); + return ROK; } } newblk = prevblk = NULLP; @@ -1887,7 +1732,7 @@ PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf) prevblk = prevblk->b_cont; #ifdef T2K_MEM_LEAK_DBG char * file = __FILE__; - U32 line = __LINE__; + uint32_t line = __LINE__; #endif (Void) SPutDBuf(minfo->region, minfo->pool, curblk); @@ -1898,7 +1743,7 @@ PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf) tmp->b_rptr = tmp->b_datap->db_base + offset; } - RETVALUE(ROUTRES); + return (ROUTRES); } /* attach curblk in the newblk chain */ if (prevblk) @@ -1945,7 +1790,7 @@ PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf) /* update length of message */ minfo->len += len; - RETVALUE(ROK); + return ROK; } /* * @@ -1970,36 +1815,28 @@ PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf) */ -#ifdef ANSI -PUBLIC S16 SAddPreMsg +S16 SAddPreMsg ( Data data, Buffer *mBuf ) -#else -PUBLIC S16 SAddPreMsg (data, mBuf) -Data data; -Buffer *mBuf; -#endif { SsMsgInfo *minfo; Buffer *tmp; Buffer *newb; - TRC1(SAddPreMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS064, ERRZERO, "SAddPreMsg: Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS065, ERRZERO, "SAddPreMsg: Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2012,7 +1849,7 @@ Buffer *mBuf; if (minfo->len == 0x7FFF) #endif { - RETVALUE(ROUTRES); + return (ROUTRES); } /* @@ -2028,7 +1865,7 @@ Buffer *mBuf; { SSLOGERROR(ERRCLS_DEBUG, ESS066, ERRZERO, "SAddPreMsg:Failed in\ SGetDBuf"); - RETVALUE(ROUTRES); + return (ROUTRES); } /* set the read and write pointers to end of data buffer */ /* subsequent prepends have all the buffer to insert data into */ @@ -2048,7 +1885,7 @@ Buffer *mBuf; *--tmp->b_rptr = data; minfo->len++; - RETVALUE(ROK); + return ROK; } /* @@ -2074,36 +1911,28 @@ Buffer *mBuf; */ -#ifdef ANSI -PUBLIC S16 SAddPstMsg +S16 SAddPstMsg ( Data data, Buffer *mBuf ) -#else -PUBLIC S16 SAddPstMsg (data, mBuf) -Data data; -Buffer *mBuf; -#endif { SsMsgInfo *minfo; Buffer *tmp; Buffer *newb; - - TRC1(SAddPstMsg) #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS067, ERRZERO, "SAddPstMsg: Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS068, ERRZERO, "SAddPstMsg: Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2117,7 +1946,7 @@ Buffer *mBuf; { SSLOGERROR(ERRCLS_DEBUG, ESS069, ERRZERO, "SAddPstMsg: Failed in\ SGetDBuf()"); - RETVALUE(ROUTRES); + return (ROUTRES); } /* append newb to the end of the mBuf chain */ @@ -2135,7 +1964,7 @@ Buffer *mBuf; *tmp->b_wptr++ = data; minfo->len++; - RETVALUE(ROK); + return ROK; } /* @@ -2167,29 +1996,22 @@ Buffer *mBuf; */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SAddPreMsgMult1 +S16 SAddPreMsgMult1 ( Data *src, MsgLen cnt, Buffer *mBuf, char *file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SAddPreMsgMult +S16 SAddPreMsgMult ( Data *src, MsgLen cnt, Buffer *mBuf ) -#else -PUBLIC S16 SAddPreMsgMult(src, cnt, mBuf) -Data *src; -MsgLen cnt; -Buffer *mBuf; -#endif #endif { SsMsgInfo *minfo; /* Message info */ @@ -2202,33 +2024,31 @@ Buffer *mBuf; MsgLen offset; Data *rptr; - TRC1(SAddPreMsgMult) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS070, ERRZERO, "SAddPreMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check source */ if (src == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS071, ERRZERO, "SAddPreMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check count */ if (cnt <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS072, ERRZERO, "SAddPreMsgMult: Invalid\ count"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS073, ERRZERO, "SAddPreMsgMult: Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2258,7 +2078,7 @@ Buffer *mBuf; if (!cnt) { minfo->len += len; - RETVALUE(ROK); + return ROK; } } newblk = prevblk = NULLP; @@ -2278,7 +2098,7 @@ Buffer *mBuf; tmp->b_rptr = tmp->b_datap->db_base + offset; } - RETVALUE(ROUTRES); + return (ROUTRES); } /* attach curblk in the newblk chain */ if (prevblk) @@ -2314,7 +2134,7 @@ Buffer *mBuf; /* update length of message */ minfo->len += len; - RETVALUE(ROK); + return ROK; } /* @@ -2346,28 +2166,21 @@ Buffer *mBuf; */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SAddPstMsgMult1 +S16 SAddPstMsgMult1 ( Data *src, MsgLen cnt, Buffer *mBuf, char *file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SAddPstMsgMult +S16 SAddPstMsgMult ( Data *src, MsgLen cnt, Buffer *mBuf ) -#else -PUBLIC S16 SAddPstMsgMult(src, cnt, mBuf) -Data *src; -MsgLen cnt; -Buffer *mBuf; -#endif #endif { SsMsgInfo *minfo; @@ -2380,33 +2193,31 @@ Buffer *mBuf; MsgLen numBytes; Data *wptr; - TRC1(SAddPstMsgMult) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS074, ERRZERO, "SAddPstMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check source */ if (src == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS075, ERRZERO, "SAddPstMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check count */ if (cnt <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS076, ERRZERO, "SAddPstMsgMult:Invalid\ count"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS077, ERRZERO, "SAddPstMsgMult: Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2444,7 +2255,7 @@ Buffer *mBuf; if (!cnt) { minfo->len += len; - RETVALUE(ROK); + return ROK; } } @@ -2466,7 +2277,7 @@ Buffer *mBuf; tmp->b_wptr = tmp->b_datap->db_lim - offset; } - RETVALUE(ROUTRES); + return (ROUTRES); } /* insert curblk in the newblk chain */ @@ -2502,7 +2313,7 @@ Buffer *mBuf; /* update length */ minfo->len += len; - RETVALUE(ROK); + return ROK; } /* #ifdef SS_LOCKLESS_MEMORY */ @@ -2532,50 +2343,42 @@ Buffer *mBuf; */ -#ifdef ANSI -PUBLIC S16 SRemPreMsg +S16 SRemPreMsg ( Data *dataPtr, Buffer *mBuf ) -#else -PUBLIC S16 SRemPreMsg(dataPtr, mBuf) -Data *dataPtr; -Buffer *mBuf; -#endif { SsMsgInfo *minfo; Buffer *tmp; #ifdef T2K_MEM_LEAK_DBG char* file = __FILE__; - U32 line = __LINE__; + uint32_t line = __LINE__; #endif - TRC1(SRemPreMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (!dataPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS078, ERRZERO, "SRemPreMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS079, ERRZERO, "SRemPreMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS080, ERRZERO, "SRemPreMsg : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif if (!(tmp = mBuf->b_cont)) - RETVALUE(ROKDNA); + return (ROKDNA); /* get SsMsgInfo of mBuf */ minfo = (SsMsgInfo *) mBuf->b_rptr; @@ -2593,7 +2396,7 @@ Buffer *mBuf; if (!--minfo->len) minfo->endptr = NULLP; - RETVALUE(ROK); + return ROK; } /* @@ -2619,46 +2422,38 @@ Buffer *mBuf; */ -#ifdef ANSI -PUBLIC S16 SRemPstMsg +S16 SRemPstMsg ( Data *dataPtr, /* pointer to data */ Buffer *mBuf ) -#else -PUBLIC S16 SRemPstMsg(dataPtr, mBuf) -Data *dataPtr; /* pointer to data */ -Buffer *mBuf; /* message buffer */ -#endif { SsMsgInfo *minfo; Buffer *tmp; Buffer *last; #ifdef T2K_MEM_LEAK_DBG char* file = __FILE__; - U32 line = __LINE__; + uint32_t line = __LINE__; #endif - TRC1(SRemPstMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (dataPtr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS081, ERRZERO, "SRemPstMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS082, ERRZERO, "SRemPstMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS083, ERRZERO, "SRemPstMsg : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2666,7 +2461,7 @@ Buffer *mBuf; /* message buffer */ minfo = (SsMsgInfo*) mBuf->b_rptr; if (!(last = minfo->endptr)) - RETVALUE(ROKDNA); + return (ROKDNA); /* read databyte into dataPtr and decrement write ptr */ *dataPtr = *--last->b_wptr; @@ -2688,7 +2483,7 @@ Buffer *mBuf; /* message buffer */ /* update SsMsgInfo */ minfo->len--; - RETVALUE(ROK); + return ROK; } @@ -2721,29 +2516,21 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI -PUBLIC S16 SRemPreMsgMult +S16 SRemPreMsgMult ( Data *dst, /* destination */ MsgLen cnt, /* count */ Buffer *mBuf ) -#else -PUBLIC S16 SRemPreMsgMult(dst, cnt, mBuf) -Data *dst; /* destination */ -MsgLen cnt; /* count */ -Buffer *mBuf; /* message buffer */ -#endif { - SsMsgInfo *minfo; - Buffer *tmp; - MsgLen numBytes; + SsMsgInfo *minfo = NULLP; + Buffer *tmp = NULLP; + MsgLen numBytes =0; #ifdef T2K_MEM_LEAK_DBG char* file = __FILE__; - U32 line = __LINE__; + uint32_t line = __LINE__; #endif - TRC1(SRemPreMsgMult) /* ss023.103 - Modification of SRemPreMsgMult for bug fix */ @@ -2753,13 +2540,13 @@ Buffer *mBuf; /* message buffer */ { SSLOGERROR(ERRCLS_INT_PAR, ESS084, ERRZERO, "SRemPreMsgMult:Invalid\ count"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS085, ERRZERO, "SRemPreMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition to check for NULL pointer */ /* check data pointer */ @@ -2768,7 +2555,7 @@ Buffer *mBuf; /* message buffer */ { SSLOGERROR(ERRCLS_INT_PAR, ESS086, ERRZERO, "SRemPreMsgMult : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2777,7 +2564,7 @@ Buffer *mBuf; /* message buffer */ /* check if data present */ if (minfo->len < cnt) - RETVALUE(ROKDNA); + return (ROKDNA); else minfo->len -= cnt; @@ -2812,7 +2599,7 @@ Buffer *mBuf; /* message buffer */ if (!minfo->len) minfo->endptr = NULLP; - RETVALUE(ROK); + return ROK; } /* @@ -2844,19 +2631,12 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI -PUBLIC S16 SRemPstMsgMult +S16 SRemPstMsgMult ( Data *dst, /* destination */ MsgLen cnt, /* count */ Buffer *mBuf ) -#else -PUBLIC S16 SRemPstMsgMult(dst, cnt, mBuf) -Data *dst; /* destination */ -MsgLen cnt; /* count */ -Buffer *mBuf; /* message buffer */ -#endif { SsMsgInfo *minfo; Buffer *tmp; @@ -2866,10 +2646,9 @@ Buffer *mBuf; /* message buffer */ Data *cptr; #ifdef T2K_MEM_LEAK_DBG char* file = __FILE__; - U32 line = __LINE__; + uint32_t line = __LINE__; #endif - TRC1(SRemPstMsgMult) #if (ERRCLASS & ERRCLS_INT_PAR) /* check count */ @@ -2877,19 +2656,19 @@ Buffer *mBuf; /* message buffer */ { SSLOGERROR(ERRCLS_INT_PAR, ESS087, ERRZERO, "SRemPstMsgMult:Invalid\ count"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS088, ERRZERO, "SRemPstMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS089, ERRZERO, "SRemPstMsgMult : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition to check dst data pointer */ /* check data pointer */ @@ -2901,7 +2680,7 @@ Buffer *mBuf; /* message buffer */ /* check if data present */ if (minfo->len < cnt) - RETVALUE(ROKDNA); + return (ROKDNA); else { minfo->len -= cnt; @@ -2948,7 +2727,7 @@ Buffer *mBuf; /* message buffer */ else minfo->endptr = prev; - RETVALUE(ROK); + return ROK; } /* @@ -2979,49 +2758,40 @@ Buffer *mBuf; /* message buffer */ */ -#ifdef ANSI -PUBLIC S16 SExamMsg +S16 SExamMsg ( Data *dataPtr, /* pointer to data */ Buffer *mBuf, /* message buffer */ MsgLen idx ) -#else -PUBLIC S16 SExamMsg(dataPtr, mBuf, idx) -Data *dataPtr; /* pointer to data */ -Buffer *mBuf; /* message buffer */ -MsgLen idx; /* index */ -#endif { SsMsgInfo *minfo; Buffer *tmp; - TRC1(SExamMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (!dataPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS090, ERRZERO, "SExamMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS091, ERRZERO, "SExamMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check index */ if (idx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS092, ERRZERO, "SExamMsg : Invalid Index"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS093, ERRZERO, "SExamMsg : Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3030,7 +2800,7 @@ MsgLen idx; /* index */ if (minfo->len <= idx) { - RETVALUE(ROKDNA); + return (ROKDNA); } /* get the first SS_M_DATA blk */ @@ -3041,7 +2811,7 @@ MsgLen idx; /* index */ *dataPtr = *(tmp->b_rptr + idx); - RETVALUE(ROK); + return ROK; } @@ -3074,53 +2844,43 @@ MsgLen idx; /* index */ */ -#ifdef ANSI -PUBLIC S16 SGetDataFrmMsg +S16 SGetDataFrmMsg ( Buffer *mBuf, /* message buffer */ Data *dataPtr, /* pointer to data */ MsgLen idx, MsgLen dataLen ) -#else -PUBLIC S16 SGetDataFrmMsg(mBuf, dataPtr, idx, dataLen) -Buffer *mBuf; /* message buffer */ -Data *dataPtr; /* pointer to data */ -MsgLen idx; /* index */ -MsgLen dataLen; -#endif { SsMsgInfo *minfo; Buffer *tmp; MsgLen offSetLen; Data *tmpDataPtr = dataPtr; - TRC1(SGetDataFrmMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (!dataPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS090, ERRZERO, "SGetDataFrmMsg: Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS091, ERRZERO, "SGetDataFrmMsg: Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check index */ if (idx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS092, ERRZERO, "SGetDataFrmMsg: Invalid Index"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS093, ERRZERO, "SGetDataFrmMsg: Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3129,7 +2889,7 @@ MsgLen dataLen; if (minfo->len <= (idx + dataLen) ) { - RETVALUE(ROKDNA); + return (ROKDNA); } /* get the first SS_M_DATA blk */ @@ -3138,7 +2898,7 @@ MsgLen dataLen; /* determine offset */ if(tmp == NULLP) { - RETVALUE(ROKDNA); + return (ROKDNA); } else { @@ -3156,12 +2916,12 @@ MsgLen dataLen; } if( tmp == NULLP ) { - RETVALUE(ROKDNA); + return (ROKDNA); } SMemCpy((Void *)tmpDataPtr, (Void *)(tmp->b_rptr + idx), (size_t)dataLen); } - RETVALUE(ROK); + return ROK; } /* End of SGetDataFrmMsg() */ /* @@ -3182,40 +2942,32 @@ MsgLen dataLen; */ -#ifdef ANSI -PUBLIC S16 SFndLenMsg +S16 SFndLenMsg ( REG1 Buffer *mBuf, /* message buffer */ MsgLen *lngPtr ) -#else -PUBLIC S16 SFndLenMsg(mBuf, lngPtr) -REG1 Buffer *mBuf; /* message buffer */ -MsgLen *lngPtr; /* pointer to length */ -#endif { SsMsgInfo *minfo; - TRC1(SFndLenMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS094, ERRZERO, "SFndLenMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check length pointer */ if (lngPtr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS095, ERRZERO, "SFndLenMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS096, ERRZERO, "SFndLenMsg : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3225,7 +2977,7 @@ MsgLen *lngPtr; /* pointer to length */ /* read length */ *lngPtr = minfo->len; - RETVALUE(ROK); + return ROK; } @@ -3268,28 +3020,21 @@ MsgLen *lngPtr; /* pointer to length */ * */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SSegMsgNew +S16 SSegMsgNew ( Buffer *mBuf1, /* message 1 */ MsgLen idx, /* index */ Buffer **mBuf2, char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SSegMsg +S16 SSegMsg ( Buffer *mBuf1, /* message 1 */ MsgLen idx, /* index */ Buffer **mBuf2 ) -#else -PUBLIC S16 SSegMsg(mBuf1, idx, mBuf2) -Buffer *mBuf1; /* message 1 */ -MsgLen idx; /* index */ -Buffer **mBuf2; /* message 2 */ -#endif #endif { SsMsgInfo *minfo1; @@ -3298,31 +3043,30 @@ Buffer **mBuf2; /* message 2 */ Buffer *prev; Buffer *next; - TRC1(SSegMsg) #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer 1 */ if (mBuf1 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS097, ERRZERO, "SSegMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer 2 */ if (mBuf2 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS098, ERRZERO, "SSegMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (idx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS099, ERRZERO, "SSegMsg : Invalid index"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf1->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS100, ERRZERO, "SSegMsg : Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3336,13 +3080,13 @@ Buffer **mBuf2; /* message 2 */ if (idx >= minfo1->len) { *mBuf2 = NULLP; - RETVALUE(ROKDNA); + return (ROKDNA); } /* allocate message buffer */ if (SGetMsg(minfo1->region, minfo1->pool, mBuf2) != ROK) { SSLOGERROR(ERRCLS_DEBUG, ESS101, ERRZERO, "SSegMsg : SGetMsg failed"); - RETVALUE(RFAILED); + return RFAILED; } /* get the SsMsgInfo of mBuf2 */ @@ -3364,7 +3108,7 @@ Buffer **mBuf2; /* message 2 */ minfo1->endptr = NULLP; mBuf1->b_cont = NULLP; - RETVALUE(ROK); + return ROK; } /* get the first SS_M_DATA blk */ @@ -3394,7 +3138,7 @@ Buffer **mBuf2; /* message 2 */ /* reset length */ minfo1->len += minfo2->len; (Void) SPutMsg(*mBuf2); - RETVALUE(ROUTRES); + return (ROUTRES); } (*mBuf2)->b_cont = next; @@ -3432,7 +3176,7 @@ Buffer **mBuf2; /* message 2 */ /* reset length */ minfo1->len += minfo2->len; (Void) SPutMsg(*mBuf2); - RETVALUE(ROUTRES); + return (ROUTRES); } (*mBuf2)->b_cont = next; tmp->b_wptr = tmp->b_rptr + idx; @@ -3456,7 +3200,7 @@ Buffer **mBuf2; /* message 2 */ #endif /*SS_MULTICORE_SUPPORT*/ } - RETVALUE(ROK); + return ROK; } /* @@ -3475,8 +3219,7 @@ Buffer **mBuf2; /* message 2 */ * */ -#ifdef ANSI -PUBLIC S16 SCpyFixMsg +S16 SCpyFixMsg ( Data *srcBuf, /* source buffer */ Buffer *dstMbuf, /* destination message buffer */ @@ -3484,51 +3227,41 @@ MsgLen dstIdx, /* destination index */ MsgLen cnt, /* count */ MsgLen *cCnt ) -#else -PUBLIC S16 SCpyFixMsg(srcBuf, dstMbuf, dstIdx, cnt, cCnt) -Data *srcBuf; /* source buffer */ -Buffer *dstMbuf; /* destination message buffer */ -MsgLen dstIdx; /* destination index */ -MsgLen cnt; /* count */ -MsgLen *cCnt; /* copied count */ -#endif { S16 ret; SsMsgInfo *minfo; Buffer *right; - TRC1(SCpyFixMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check source message buffer */ if (srcBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS102, ERRZERO, "SCpyFixMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check destination message buffer */ if (dstMbuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS103, ERRZERO, "SCpyFixMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check copied count buffer */ if (cCnt == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS104, ERRZERO, "SCpyFixMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check copy count */ if (cnt <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS105, ERRZERO, "SCpyFixMsg : Invalid count"); - RETVALUE(RFAILED); + return RFAILED; } if (dstMbuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS106, ERRZERO, "SCpyFixMsg : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3539,7 +3272,7 @@ MsgLen *cCnt; /* copied count */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS107, ERRZERO, "SCpyFixMsg : Invalid Index"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition test if message length will exceed max msg length */ @@ -3553,7 +3286,7 @@ MsgLen *cCnt; /* copied count */ *cCnt = 0; SSLOGERROR(ERRCLS_INT_PAR, ESS108, ERRZERO, "SCpyFixMsg : msgLen + cnt > maxS16"); - RETVALUE(ROUTRES); + return (ROUTRES); } #endif @@ -3566,11 +3299,11 @@ MsgLen *cCnt; /* copied count */ SSLOGERROR(ERRCLS_DEBUG, ESS109, ERRZERO, "SCpyFixMsg : Failed in\ SAddPreMsgMult"); #endif - RETVALUE(ret); + return (ret); } *cCnt = cnt; - RETVALUE(ROK); + return ROK; } /* add data at the end of the dst buffer */ @@ -3578,17 +3311,17 @@ MsgLen *cCnt; /* copied count */ { if ((ret = SAddPstMsgMult(srcBuf, cnt, dstMbuf)) != ROK) { - RETVALUE(ret); + return (ret); } *cCnt = cnt; - RETVALUE(ROK); + return ROK; } /* segment the message into dstMbuf and right */ if ((ret = SSegMsg(dstMbuf, dstIdx, &right)) != ROK) { - RETVALUE(ret); + return (ret); } /* append data at the end of dstMbuf */ @@ -3596,7 +3329,7 @@ MsgLen *cCnt; /* copied count */ { /* ss020.103 - Addition for cleanup */ (Void) SPutMsg(right); - RETVALUE(ret); + return (ret); } /* cancatenate dstMbuf and right */ @@ -3604,14 +3337,14 @@ MsgLen *cCnt; /* copied count */ { /* ss020.103 - Addition for cleanup */ (Void) SPutMsg(right); - RETVALUE(ret); + return (ret); } *cCnt = cnt; (Void) SPutMsg(right); - RETVALUE(ROK); + return ROK; } /* @@ -3630,8 +3363,7 @@ MsgLen *cCnt; /* copied count */ * */ -#ifdef ANSI -PUBLIC S16 SCpyMsgFix +S16 SCpyMsgFix ( Buffer *srcMbuf, /* source message buffer */ MsgLen srcIdx, /* source index */ @@ -3639,56 +3371,46 @@ MsgLen cnt, /* count */ Data *dstBuf, /* destination buffer */ MsgLen *cCnt ) -#else -PUBLIC S16 SCpyMsgFix(srcMbuf, srcIdx, cnt, dstBuf, cCnt) -Buffer *srcMbuf; /* source message buffer */ -MsgLen srcIdx; /* source index */ -MsgLen cnt; /* count */ -Data *dstBuf; /* destination buffer */ -MsgLen *cCnt; /* copied count */ -#endif { - Data *cptr; - Buffer *tmp; - SsMsgInfo *minfo; - MsgLen numBytes; - - TRC1(SCpyMsgFix) + Data *cptr = NULLP; + Buffer *tmp = NULLP; + SsMsgInfo *minfo = NULLP; + MsgLen numBytes =0; #if (ERRCLASS & ERRCLS_INT_PAR) /* check source message buffer */ if (srcMbuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS110, ERRZERO, "SCpyMsgFix : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check destination message buffer */ if (dstBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS111, ERRZERO, "SCpyMsgFix : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (cnt <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS112, ERRZERO, "SCpyMsgFix : Invalid Index"); - RETVALUE(RFAILED); + return RFAILED; } if (srcIdx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS113, ERRZERO, "SCpyMsgFix : Invalid Index"); - RETVALUE(RFAILED); + return RFAILED; } if (!cCnt) { SSLOGERROR(ERRCLS_INT_PAR, ESS114, ERRZERO, "SCpyMsgFix : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (srcMbuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS115, ERRZERO, "SCpyMsgFix : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3698,7 +3420,7 @@ MsgLen *cCnt; /* copied count */ if ((srcIdx + cnt) > minfo->len) { *cCnt = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } /* get the first SS_M_DATA blk */ @@ -3739,7 +3461,7 @@ MsgLen *cCnt; /* copied count */ break; } - RETVALUE(ROK); + return ROK; } /* @@ -3760,31 +3482,23 @@ MsgLen *cCnt; /* copied count */ */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SCpyMsgMsgNew +S16 SCpyMsgMsgNew ( Buffer *srcBuf, Region dstRegion, Pool dstPool, Buffer **dstBuf, char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SCpyMsgMsg +S16 SCpyMsgMsg ( Buffer *srcBuf, Region dstRegion, Pool dstPool, Buffer **dstBuf ) -#else -PUBLIC S16 SCpyMsgMsg(srcBuf, dstRegion, dstPool, dstBuf) -Buffer *srcBuf; -Region dstRegion; -Pool dstPool; -Buffer **dstBuf; -#endif #endif { SsMsgInfo *minfo1; @@ -3801,33 +3515,31 @@ Buffer **dstBuf; #endif #endif - TRC1(SCpyMsgMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) if (!srcBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS116, ERRZERO, "SCpyMsgMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (srcBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS117, ERRZERO, "SCpyMsgMsg : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition to validate region and pool */ if (dstRegion >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS118, ERRZERO, "SCpyMsgMsg : Invalid region id"); - RETVALUE(RFAILED); + return RFAILED; } if (dstPool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS119, ERRZERO, "SCpyMsgMsg : Invalid pool id"); - RETVALUE(RFAILED); + return RFAILED; } /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -3843,7 +3555,7 @@ Buffer **dstBuf; "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3857,12 +3569,12 @@ Buffer **dstBuf; #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS121, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif SSLOGERROR(ERRCLS_INT_PAR, ESS122, dstRegion, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -3873,7 +3585,7 @@ Buffer **dstBuf; #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS123, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -3889,7 +3601,7 @@ Buffer **dstBuf; #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS124, ERRZERO, "SCpyMsgMsg : SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* get the SsMsgInfo from srcBuf */ minfo1 = (SsMsgInfo*) srcBuf->b_rptr; @@ -3921,9 +3633,11 @@ Buffer **dstBuf; (Void) SPutDBuf(minfo1->region, minfo1->pool, newblk); newblk = curblk; } - printf("Failed to get the buffer of size %s %d\n", __FILE__, __LINE__); +#ifdef ERROR_PRINT + printf("\nFailed to get the buffer of size %s %d\n", __FILE__, __LINE__); +#endif (Void) SPutMsg(*dstBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } if (!prevblk) @@ -3941,7 +3655,7 @@ Buffer **dstBuf; minfo2->endptr = curblk; (*dstBuf)->b_cont = newblk; - RETVALUE(ROK); + return ROK; } @@ -3963,31 +3677,23 @@ Buffer **dstBuf; * */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SAddMsgRefNew +S16 SAddMsgRefNew ( Buffer *srcBuf, Region dstRegion, Pool dstPool, Buffer **dstBuf, char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SAddMsgRef +S16 SAddMsgRef ( Buffer *srcBuf, Region dstRegion, Pool dstPool, Buffer **dstBuf ) -#else -PUBLIC S16 SAddMsgRef(srcBuf, dstRegion, dstPool, dstBuf) -Buffer *srcBuf; -Region dstRegion; -Pool dstPool; -Buffer **dstBuf; -#endif #endif { SsMsgInfo *minfo1; @@ -4000,19 +3706,18 @@ Buffer **dstBuf; Data *cptr; MsgLen numBytes; - TRC1(SAddMsgRef) #if (ERRCLASS & ERRCLS_INT_PAR) if (!srcBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS126, ERRZERO, "SAddMsgRef : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (srcBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS127, ERRZERO, "SAddMsgRef : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif #ifdef XEON_SPECIFIC_CHANGES @@ -4026,7 +3731,7 @@ Buffer **dstBuf; #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS128, ERRZERO, "SAddMsgRef : SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* get the SsMsgInfo from srcBuf */ minfo1 = (SsMsgInfo*) srcBuf->b_rptr; @@ -4061,7 +3766,7 @@ Buffer **dstBuf; newblk = curblk; } (Void) SPutMsg(*dstBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } if (!prevblk) @@ -4079,7 +3784,7 @@ Buffer **dstBuf; minfo2->endptr = curblk; (*dstBuf)->b_cont = newblk; - RETVALUE(ROK); + return ROK; } /* allocate a data buffer */ @@ -4089,7 +3794,7 @@ Buffer **dstBuf; (Void) SPutMsg(*dstBuf); SSLOGERROR(ERRCLS_DEBUG, ESS129, ERRZERO, "SAddMsgRef : ssGetDBufOfSize\ failed"); - RETVALUE(ROUTRES); + return (ROUTRES); } dBuf->b_datap->db_type = SS_M_DATA; @@ -4106,7 +3811,7 @@ Buffer **dstBuf; minfo2->endptr = dBuf; (*dstBuf)->b_cont = dBuf; - RETVALUE(ROK); + return ROK; } /* ss012.13: Addition */ #ifdef SS_M_PROTO_REGION @@ -4128,46 +3833,38 @@ Buffer **dstBuf; * */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE Buffer *DupMsgNew +static Buffer *DupMsgNew ( Region region, /* region id */ Buffer *mp, /* message block */ char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PRIVATE Buffer *DupMsg +static Buffer *DupMsg ( Region region, /* region id */ Buffer *mp /* message block */ ) -#else -PRIVATE Buffer *DupMsg(region, mp) -Region region; /* region id */ -Buffer *mp; /* message block */ -#endif #endif { Buffer *bp; /* mblk for iteration */ S16 r; /* return value */ Size m; /* temporary */ - TRC1(DupMsg); - #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS130, ERRZERO, "Null pointer"); - RETVALUE(NULLP); + return (NULLP); } if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS131, ERRZERO, "DupMsg : Invalid region\ id"); - RETVALUE(NULLP); + return (NULLP); } #endif @@ -4181,7 +3878,7 @@ Buffer *mp; /* message block */ #endif /* SS_MULTICORE_SUPPORT */ /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT - r = SAlloc(region, &m, 0, (Data **)&bp, __LINE__, (U8*) __FILE__, ENTNC); + r = SAlloc(region, &m, 0, (Data **)&bp, __LINE__, (uint8_t*) __FILE__, ENTNC); #else r = SAlloc(region, &m, 0, (Data **)&bp); #endif /* SS_HISTOGRAM_SUPPORT */ @@ -4191,16 +3888,16 @@ Buffer *mp; /* message block */ SSLOGERROR(ERRCLS_ADD_RES, ESS132, (ErrVal) r, "SAlloc() failed"); #endif - RETVALUE(NULLP); + return (NULLP); } /* generic set-up-message function */ #if 1 #ifndef SS_DBUF_REFLOCK_DISABLE - SS_STRM_INITB(bp, (SsDblk *)(((U8 *)bp) + sizeof(SsMblk)), NULLP, 0, NULLP); + SS_STRM_INITB(bp, (SsDblk *)(((uint8_t *)bp) + sizeof(SsMblk)), NULLP, 0, NULLP); #endif #else data = (Data *) (bp) + MDBSIZE; - SS_STRM_INITB(bp,(SsDblk *)(((U8 *)bp) + sizeof(SsMblk)), data, numBytes, NULLP); + SS_STRM_INITB(bp,(SsDblk *)(((uint8_t *)bp) + sizeof(SsMblk)), data, numBytes, NULLP); #endif /* SS_MULTICORE_SUPPORT */ @@ -4216,7 +3913,7 @@ Buffer *mp; /* message block */ { SSLOGERROR(ERRCLS_DEBUG, ESS335, ERRZERO, "Could not lock the mBuf Ref Lock"); - RETVALUE(NULLP); + return (NULLP); } #endif /* increment the reference count of the dblock */ @@ -4228,12 +3925,12 @@ Buffer *mp; /* message block */ { SSLOGERROR(ERRCLS_DEBUG, ESS335, ERRZERO, "Could not lock the mBuf Ref Lock"); - RETVALUE(NULLP); + return (NULLP); } #endif - RETVALUE(bp); + return (bp); } /* DupMsg */ #endif /* SS_M_PROTO_REGION */ @@ -4260,28 +3957,21 @@ Buffer *mp; /* message block */ */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SGetDBufNew +S16 SGetDBufNew ( Region region, /* region id */ Pool pool, /* pool id */ Buffer **bufPtr, char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SGetDBuf +S16 SGetDBuf ( Region region, /* region id */ Pool pool, /* pool id */ Buffer **bufPtr ) -#else -PUBLIC S16 SGetDBuf(region, pool, bufPtr) -Region region; /* region id */ -Pool pool; /* pool id */ -Buffer **bufPtr; /* pointer to buffer */ -#endif #endif { Size size; @@ -4304,26 +3994,24 @@ Buffer **bufPtr; /* pointer to buffer */ #endif #endif - TRC1(SGetDBuf) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ if (!bufPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS133, ERRZERO, "SGetDBuf : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS134, ERRZERO, "SGetDBuf : Invalid region\ id"); - RETVALUE(RFAILED); + return RFAILED; } if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS135, ERRZERO, "SGetDBuf : Invalid pool id"); - RETVALUE(RFAILED); + return RFAILED; } /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -4339,7 +4027,7 @@ Buffer **bufPtr; /* pointer to buffer */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -4356,12 +4044,12 @@ Buffer **bufPtr; /* pointer to buffer */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS137, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif SSLOGERROR(ERRCLS_INT_PAR, ESS138, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -4372,7 +4060,7 @@ Buffer **bufPtr; /* pointer to buffer */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS139, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -4400,12 +4088,12 @@ Buffer **bufPtr; /* pointer to buffer */ /* ss006.301 : optimized this function */ /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT - if (SAlloc(region, &mdsize, 0, (Data **) bufPtr, __LINE__, (U8*) __FILE__, ENTNC) != ROK) + if (SAlloc(region, &mdsize, 0, (Data **) bufPtr, __LINE__, (uint8_t*) __FILE__, ENTNC) != ROK) #else if (SAlloc(region, &mdsize, 0, (Data **) bufPtr) != ROK) #endif /* SS_HISTOGRAM_SUPPORT */ { - RETVALUE(ROUTRES); + return (ROUTRES); } data = (Data *) (*bufPtr) + MDBSIZE; size = mdsize - MDBSIZE; @@ -4416,11 +4104,13 @@ Buffer **bufPtr; /* pointer to buffer */ #ifndef SS_DBUF_REFLOCK_DISABLE if((SInitLock (&(dptr->dBufLock), SS_LOCK_MUTEX)) != 0) { - printf("Falied to destroy lock\n"); +#ifdef ERROR_PRINT + printf("\nFalied to destroy lock\n"); +#endif } #endif - RETVALUE(ROK); + return ROK; } /* @@ -4445,38 +4135,30 @@ Buffer **bufPtr; /* pointer to buffer */ */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SPutDBufNew +S16 SPutDBufNew ( Region region, Pool pool, Buffer *buf, char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SPutDBuf +S16 SPutDBuf ( Region region, Pool pool, Buffer *buf ) -#else -PUBLIC S16 SPutDBuf(region, pool, buf) -Region region; -Pool pool; -Buffer *buf; -#endif #endif { - register SsDblk *dptr; + register SsDblk *dptr = NULLP; /* ss021.103 - Addition to check return value of SFree */ - S16 ret; + S16 ret = ROK; #if (defined(SS_USE_ZBC_MEMORY) && defined (TENB_DPDK_BUF)) - Data *dpdkBuf; + Data *dpdkBuf = NULLP; #endif - TRC2(SPutDBuf); /* ss021.103 - Addition of ret initialization */ ret = ROK; @@ -4485,26 +4167,26 @@ Buffer *buf; if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS141, ERRZERO, "SPutDBuf:Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS142, ERRZERO, "SPutDBuf:Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } if (buf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS143, ERRZERO, "SPutDBuf:Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } if ( (buf->b_datap->db_type != SS_M_DATA) && (buf->b_datap->db_type != SS_M_PROTO)) { SSLOGERROR(ERRCLS_INT_PAR, ESS144, ERRZERO, "SPutDBuf:Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss016.13: Addition */ @@ -4514,7 +4196,7 @@ Buffer *buf; if(dptr->db_type == SS_MEM_TYPE_SSI_ZBC) { ret = SPutZbcDBuf(region, buf); - RETVALUE(ret); + return (ret); } #ifdef TENB_DPDK_BUF @@ -4524,7 +4206,7 @@ Buffer *buf; SDetachDpdkPtrFrmDBuf(buf, &dpdkBuf); SPutSBufDpdk(dpdkBuf); ret = SFree(region, (Data *) buf, MDBSIZE); - RETVALUE(ret); + return (ret); } #endif /* TENB_DPDK_BUF */ #endif /* SS_USE_ZBC_MEMORY */ @@ -4540,7 +4222,7 @@ Buffer *buf; /* if the data block is not shared, free the buffer, checks not reqd */ #ifdef SS_HISTOGRAM_SUPPORT ret = SFree(region, (Data *) buf, MDBSIZE + dptr->db_lim - dptr->db_base - , __LINE__, (U8*) __FILE__, ENTNC); + , __LINE__, (uint8_t*) __FILE__, ENTNC); #else ret = SFree(region, (Data *) buf, MDBSIZE + dptr->db_lim - dptr->db_base); #endif /* SS_HISTOGRAM_SUPPORT */ @@ -4552,7 +4234,7 @@ Buffer *buf; { SSLOGERROR(ERRCLS_DEBUG, ESSXXX, ERRZERO, "Could not lock the mBuf Ref Lock"); - RETVALUE(RFAILED); + return RFAILED; } #endif --dptr->db_ref; @@ -4560,13 +4242,13 @@ Buffer *buf; if (buf != (SsMblk *) (((Data*) dptr) - MBSIZE)) { - SsDblk* dupdptr = (SsDblk *)((U8 *)buf + MBSIZE); + SsDblk* dupdptr = (SsDblk *)((uint8_t *)buf + MBSIZE); dupdptr->db_ref--; if(dupdptr->db_ref == 0) { #ifdef SS_HISTOGRAM_SUPPORT - ret = SFree(region, (Data *) buf, MDBSIZE, __LINE__, (U8*) __FILE__, ENTNC); + ret = SFree(region, (Data *) buf, MDBSIZE, __LINE__, (uint8_t*) __FILE__, ENTNC); #else ret = SFree(region, (Data *) buf, MDBSIZE); @@ -4581,17 +4263,19 @@ Buffer *buf; ret = SUnlock(&dptr->dBufLock) ; if((SDestroyLock(&dptr->dBufLock)) != 0) { - printf("Falied to destroy lock\n"); +#ifdef ERROR_PRINT + printf("\nFalied to destroy lock\n"); +#endif } #endif /* free buffer to region */ #ifdef SS_HISTOGRAM_SUPPORT ret = SFree(region, (Data *) buf, MDBSIZE + dptr->db_lim - dptr->db_base - , __LINE__, (U8*) __FILE__, ENTNC); + , __LINE__, (uint8_t*) __FILE__, ENTNC); #else ret = SFree(region, (Data *) buf, MDBSIZE + dptr->db_lim - dptr->db_base); #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ret); + return (ret); } #ifndef SS_DBUF_REFLOCK_DISABLE ret = SUnlock(&(dptr->dBufLock)); @@ -4601,12 +4285,12 @@ Buffer *buf; /* If MultiCore Support enabled, Dblk never be shared */ #ifdef SS_HISTOGRAM_SUPPORT ret = SFree(region, (Data *) buf, MDBSIZE + dptr->db_lim - dptr->db_base - , __LINE__, (U8*) __FILE__, ENTNC); + , __LINE__, (uint8_t*) __FILE__, ENTNC); #else ret = SFree(region, (Data *) buf, MDBSIZE + dptr->db_lim - dptr->db_base); #endif /* SS_HISTOGRAM_SUPPORT */ #endif /* SS_MULTICORE_SUPPORT */ - RETVALUE(ret); + return (ret); } @@ -4640,64 +4324,55 @@ Buffer *buf; */ -#ifdef ANSI -PUBLIC S16 SCatMsg +S16 SCatMsg ( Buffer *mBuf1, /* message 1 */ Buffer *mBuf2, /* message 2 */ Order order ) -#else -PUBLIC S16 SCatMsg(mBuf1, mBuf2, order) -Buffer *mBuf1; /* message 1 */ -Buffer *mBuf2; /* message 2 */ -Order order; /* order */ -#endif { SsMsgInfo *minfo1; SsMsgInfo *minfo2; Buffer *tmp; Buffer *newb; - TRC1(SCatMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer 1 */ if (mBuf1 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS148, ERRZERO, "SCatMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer 2 */ if (mBuf2 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS149, ERRZERO, "SCatMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition to test if same buffer */ /* check message buffer 1 and 2 not same buffer */ if (mBuf1 == mBuf2) { SSLOGERROR(ERRCLS_INT_PAR, ESS150, ERRZERO, "SCatMsg : mBuf1 == mBuf2"); - RETVALUE(RFAILED); + return RFAILED; } if ((order != M1M2) && (order != M2M1)) { SSLOGERROR(ERRCLS_INT_PAR, ESS151, ERRZERO, "SCatMsg : Invalid Order"); - RETVALUE(RFAILED); + return RFAILED; } if ((mBuf1->b_datap->db_type != SS_M_PROTO) || (mBuf2->b_datap->db_type != SS_M_PROTO)) { SSLOGERROR(ERRCLS_INT_PAR, ESS152, ERRZERO, "SCatMsg : Incorrect buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* no data to append or prepend */ if (!mBuf2->b_cont) - RETVALUE(ROK); + return ROK; minfo1 = (SsMsgInfo*) mBuf1->b_rptr; minfo2 = (SsMsgInfo*) mBuf2->b_rptr; @@ -4711,7 +4386,7 @@ Order order; /* order */ #endif { SSLOGERROR(ERRCLS_INT_PAR, ESS153, ERRZERO, "SCpyFixMsg : messages too big"); - RETVALUE(ROUTRES); + return (ROUTRES); } #endif @@ -4720,7 +4395,7 @@ Order order; /* order */ /* duplicate mBuf2 from the region/pool of mBuf1, initialise mBuf2 */ /*ss015.13: addition */ if (SCpyMsgMsg(mBuf2, minfo1->region, minfo1->pool, &newb) != ROK) - RETVALUE(RFAILED); + return RFAILED; minfo2 = (SsMsgInfo*) newb->b_rptr; } @@ -4755,7 +4430,7 @@ Order order; /* order */ #endif if (newb && (newb != mBuf2)) (Void) SPutMsg(newb); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -4773,7 +4448,7 @@ Order order; /* order */ (Void) SInitMsg(mBuf2); } - RETVALUE(ROK); + return ROK; } /* @@ -4801,19 +4476,12 @@ Order order; /* order */ */ -#ifdef ANSI -PUBLIC S16 SRepMsg +S16 SRepMsg ( Data data, /* data */ Buffer *mBuf, /* message buffer */ MsgLen idx ) -#else -PUBLIC S16 SRepMsg(data, mBuf, idx) -Data data; /* data */ -Buffer *mBuf; /* message buffer */ -MsgLen idx; /* index */ -#endif { SsMsgInfo *minfo; Buffer *tmp; @@ -4821,29 +4489,28 @@ MsgLen idx; /* index */ Buffer *prev; MsgLen numBytes; - TRC1(SRepMsg) #ifdef T2K_MEM_LEAK_DBG char* file = __FILE__; - U32 line = __LINE__; + uint32_t line = __LINE__; #endif #if ( ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS155, ERRZERO, "SRepMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (idx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS156, ERRZERO, "SRepMsg : Invalid index"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS157, ERRZERO, "SRepMsg : Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -4852,7 +4519,7 @@ MsgLen idx; /* index */ /* if index > length of the buffer */ if (minfo->len <= idx) { - RETVALUE(ROKDNA); + return (ROKDNA); } tmp = mBuf->b_cont; /* get the first SS_M_DATA blk */ @@ -4869,7 +4536,7 @@ MsgLen idx; /* index */ { SSLOGERROR(ERRCLS_DEBUG, ESS158, ERRZERO, "SRepMsg : ssGetDBufOfSize\ failed"); - RETVALUE(RFAILED); + return RFAILED; } while (numBytes--) *newb->b_wptr++ = *tmp->b_rptr++; @@ -4885,7 +4552,7 @@ MsgLen idx; /* index */ } *(tmp->b_rptr + idx) = data; - RETVALUE(ROK); + return ROK; } /* @@ -4903,46 +4570,37 @@ MsgLen idx; /* index */ */ -#ifdef ANSI -PUBLIC S16 SUpdMsg +S16 SUpdMsg ( Buffer *mBuf, /* message buffer */ Buffer *dBuf, /* data buffer */ MsgLen dLen ) -#else -PUBLIC S16 SUpdMsg(mBuf, dBuf, dLen) -Buffer *mBuf; /* message buffer */ -Buffer *dBuf; /* data buffer */ -MsgLen dLen; /* data length */ -#endif { SsMsgInfo *minfo; - TRC1(SUpdMsg) - #if (ERRCLASS & ERRCLS_INT_PAR) if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS159, ERRZERO, "SUpdMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (!dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS160, ERRZERO, "SUpdMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (dLen < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS161, ERRZERO, "SUpdMsg : Invalid length"); - RETVALUE(RFAILED); + return RFAILED; } if ((mBuf->b_datap->db_type != SS_M_PROTO) || (dBuf->b_datap->db_type != SS_M_DATA)) { SSLOGERROR(ERRCLS_INT_PAR, ESS162, ERRZERO, "SUpdMsg : Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -4955,7 +4613,7 @@ MsgLen dLen; /* data length */ if ((dBuf->b_rptr + dLen) > dBuf->b_datap->db_lim) { SSLOGERROR(ERRCLS_DEBUG, ESS163, ERRZERO, "SUpdMsg:Offset out of bounds"); - RETVALUE(RFAILED); + return RFAILED; } /* offset write ptr from read ptr by dLen */ @@ -4972,7 +4630,7 @@ MsgLen dLen; /* data length */ minfo->len += dLen; - RETVALUE(ROK); + return ROK; } /* @@ -4996,41 +4654,33 @@ MsgLen dLen; /* data length */ */ -#ifdef ANSI -PUBLIC S16 SAddDBufPst +S16 SAddDBufPst ( Buffer *mBuf, /* message buffer */ Buffer *dBuf ) -#else -PUBLIC S16 SAddDBufPst(mBuf, dBuf) -Buffer *mBuf; /* message buffer */ -Buffer *dBuf; /* data buffer */ -#endif { SsMsgInfo *minfo; - TRC1(SAddDBufPst) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer queue */ if (!mBuf || !dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS164, ERRZERO, "SAddDBufPst : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if ((mBuf->b_datap->db_type != SS_M_PROTO) || (dBuf->b_datap->db_type != SS_M_DATA)) { SSLOGERROR(ERRCLS_INT_PAR, ESS165, ERRZERO, "SAddDBufPst : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* no data, return */ if (dBuf->b_wptr == dBuf->b_rptr) - RETVALUE(ROK); + return ROK; minfo = (SsMsgInfo*) (mBuf)->b_rptr; @@ -5045,7 +4695,7 @@ Buffer *dBuf; /* data buffer */ minfo->len += dBuf->b_wptr - dBuf->b_rptr; - RETVALUE(ROK); + return ROK; } /* @@ -5069,42 +4719,34 @@ Buffer *dBuf; /* data buffer */ */ -#ifdef ANSI -PUBLIC S16 SAddDBufPre +S16 SAddDBufPre ( Buffer *mBuf, /* message buffer */ Buffer *dBuf ) -#else -PUBLIC S16 SAddDBufPre(mBuf, dBuf) -Buffer *mBuf; /* message buffer */ -Buffer *dBuf; /* data buffer */ -#endif { SsMsgInfo *minfo; Buffer *tmp; - TRC1(SAddDBufPre) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer queue */ if (!mBuf || !dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS166, ERRZERO, "SAddDBufPre : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if ((mBuf->b_datap->db_type != SS_M_PROTO) || (dBuf->b_datap->db_type != SS_M_DATA)) { SSLOGERROR(ERRCLS_INT_PAR, ESS167, ERRZERO, "SAddDBufPre : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* no data, return */ if (dBuf->b_wptr == dBuf->b_rptr) - RETVALUE(ROK); + return ROK; minfo = (SsMsgInfo*) (mBuf)->b_rptr; @@ -5119,7 +4761,7 @@ Buffer *dBuf; /* data buffer */ if (!tmp) minfo->endptr = dBuf; - RETVALUE(ROK); + return ROK; } /* @@ -5145,40 +4787,32 @@ Buffer *dBuf; /* data buffer */ */ -#ifdef ANSI -PUBLIC S16 SRemDBufPre +S16 SRemDBufPre ( Buffer *mBuf, /* message buffer */ Buffer **dBufPtr ) -#else -PUBLIC S16 SRemDBufPre(mBuf, dBufPtr) -Buffer *mBuf; /* message buffer */ -Buffer **dBufPtr; /* pointer to data buffer */ -#endif { SsMsgInfo *minfo; - TRC1(SRemDBufPre) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ if (dBufPtr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS168, ERRZERO, "SRemDBufPre : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check queue */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS169, ERRZERO, "SRemDBufPre : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS170, ERRZERO, "SRemDBufPre : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -5196,7 +4830,7 @@ Buffer **dBufPtr; /* pointer to data buffer */ if (!(minfo->len -= (*dBufPtr)->b_wptr - (*dBufPtr)->b_rptr)) minfo->endptr = NULLP; - RETVALUE(ROK); + return ROK; } /* @@ -5222,41 +4856,33 @@ Buffer **dBufPtr; /* pointer to data buffer */ */ -#ifdef ANSI -PUBLIC S16 SRemDBufPst +S16 SRemDBufPst ( Buffer *mBuf, /* message buffer */ Buffer **dBufPtr ) -#else -PUBLIC S16 SRemDBufPst(mBuf, dBufPtr) -Buffer *mBuf; /* message buffer */ -Buffer **dBufPtr; /* pointer to data buffer */ -#endif { SsMsgInfo *minfo; Buffer *tmp; - TRC1(SRemDBufPst) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ if (!dBufPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS171, ERRZERO, "SRemDBufPst : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS172, ERRZERO, "SRemDBufPst : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS173, ERRZERO, "SRemDBufPst : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -5278,7 +4904,7 @@ Buffer **dBufPtr; /* pointer to data buffer */ else minfo->endptr = tmp; - RETVALUE(ROK); + return ROK; } /* @@ -5296,31 +4922,24 @@ Buffer **dBufPtr; /* pointer to data buffer */ */ -#ifdef ANSI -PUBLIC S16 SInitNxtDBuf +S16 SInitNxtDBuf ( Buffer *mBuf ) -#else -PUBLIC S16 SInitNxtDBuf(mBuf) -Buffer *mBuf; /* message buffer */ -#endif { SsMsgInfo *minfo; - TRC1(SInitNxtDBuf) - #if (ERRCLASS & ERRCLS_INT_PAR) if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS174, ERRZERO, "SInitNxtDBuf : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS175, ERRZERO, "SInitNxtDBuf : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -5329,7 +4948,7 @@ Buffer *mBuf; /* message buffer */ /* set the next ptr of mBuf to point to the first SS_M_DATA blk */ minfo->next = mBuf->b_cont; - RETVALUE(ROK); + return ROK; } /* @@ -5347,38 +4966,30 @@ Buffer *mBuf; /* message buffer */ */ -#ifdef ANSI -PUBLIC S16 SGetNxtDBuf +S16 SGetNxtDBuf ( Buffer *mBuf, /* message buffer */ Buffer **dBuf ) -#else -PUBLIC S16 SGetNxtDBuf(mBuf, dBuf) -Buffer *mBuf; /* message buffer */ -Buffer **dBuf; /* data buffer return */ -#endif { SsMsgInfo *minfo; - TRC1(SGetNxtDBuf) - #if (ERRCLASS & ERRCLS_INT_PAR) if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS176, ERRZERO, "SGetNxtDBuf : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (!dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS177, ERRZERO, "SGetNxtDBuf : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS178, ERRZERO, "SGetNxtDBuf : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -5386,12 +4997,12 @@ Buffer **dBuf; /* data buffer return */ /* if next ptr of mBuf is NULLP, return */ if ((*dBuf = minfo->next) == NULLP) - RETVALUE(ROKDNA); + return (ROKDNA); /* update next */ minfo->next = (*dBuf)->b_cont; - RETVALUE(ROK); + return ROK; } /* @@ -5408,31 +5019,24 @@ Buffer **dBuf; /* data buffer return */ * */ -#ifdef ANSI -PUBLIC S16 SChkNxtDBuf +S16 SChkNxtDBuf ( Buffer *mBuf ) -#else -PUBLIC S16 SChkNxtDBuf(mBuf) -Buffer *mBuf; /* message buffer */ -#endif { SsMsgInfo *minfo; - TRC1(SChkNxtDBuf) - #if (ERRCLASS & ERRCLS_INT_PAR) if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS179, ERRZERO, "SChkNxtDBuf : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS180, ERRZERO, "SChkNxtDBuf : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS */ @@ -5440,9 +5044,9 @@ Buffer *mBuf; /* message buffer */ /* if next is valid, return ROK */ if (minfo->next) - RETVALUE(ROK); + return ROK; else - RETVALUE(ROKDNA); + return (ROKDNA); } /* @@ -5463,45 +5067,36 @@ Buffer *mBuf; /* message buffer */ */ -#ifdef ANSI -PUBLIC S16 SGetDataRx +S16 SGetDataRx ( Buffer *dBuf, /* data buffer */ MsgLen pad, /* pad */ Data **retDatPtr, /* return data pointer */ MsgLen *retDatLen ) -#else -PUBLIC S16 SGetDataRx(dBuf, pad, retDatPtr, retDatLen) -Buffer *dBuf; /* data buffer */ -MsgLen pad; /* pad */ -Data **retDatPtr; /* return data pointer */ -MsgLen *retDatLen; /* return data length */ -#endif { - TRC1(SGetDataRx) #if (ERRCLASS & ERRCLS_INT_PAR) if (!dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS181, ERRZERO, "SGetDataRx : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (!retDatLen || (pad < 0)) { SSLOGERROR(ERRCLS_INT_PAR, ESS182, ERRZERO, "SGetDataRx : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (!retDatPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS183, ERRZERO, "SGetDataRx : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (dBuf->b_datap->db_type != SS_M_DATA) { SSLOGERROR(ERRCLS_INT_PAR, ESS184, ERRZERO, "SGetDataRx : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS */ @@ -5511,7 +5106,7 @@ MsgLen *retDatLen; /* return data length */ SSLOGERROR(ERRCLS_DEBUG, ESS185, ERRZERO, "SGetDataRx : Reference\ count > 1"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* return the write ptr loc(with padding) if there is data to write to */ @@ -5523,10 +5118,10 @@ MsgLen *retDatLen; /* return data length */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS186, ERRZERO, "SGetDataRx:No data available"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -5547,46 +5142,38 @@ MsgLen *retDatLen; /* return data length */ */ -#ifdef ANSI -PUBLIC S16 SGetDataTx +S16 SGetDataTx ( Buffer *dBuf, /* data buffer */ Data **retDatPtr, /* return data pointer */ MsgLen *retDatLen /* return data length */ ) -#else -PUBLIC S16 SGetDataTx(dBuf, retDatPtr, retDatLen) -Buffer *dBuf; /* data buffer */ -Data **retDatPtr; /* return data pointer */ -MsgLen *retDatLen; /* return data length */ -#endif { - TRC1(SGetDataTx) #if (ERRCLASS & ERRCLS_INT_PAR) /* ss021.103 - Modification to check parameters */ if (!retDatPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS187, ERRZERO, "SGetDataTx : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (!dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS188, ERRZERO, "SGetDataTx : Null Buffer"); *retDatPtr = (Data *)NULLP; - RETVALUE(RFAILED); + return RFAILED; } if (!retDatLen) { SSLOGERROR(ERRCLS_INT_PAR, ESS189, ERRZERO, "SGetDataTx : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (dBuf->b_datap->db_type != SS_M_DATA) { SSLOGERROR(ERRCLS_INT_PAR, ESS190, ERRZERO, "SGetDataTx : Incorrect\ buffer type"); *retDatPtr = (Data *)NULLP; - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS */ @@ -5599,10 +5186,10 @@ MsgLen *retDatLen; /* return data length */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS191, ERRZERO, "SGetDataTx : Buffer empty"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #ifndef SS_ENABLE_MACROS @@ -5621,23 +5208,15 @@ MsgLen *retDatLen; /* return data length */ * File: ss_msg.c * */ -#ifdef ANSI -PUBLIC S16 SGetBufRegionPool +S16 SGetBufRegionPool ( Buffer *mBuf, /* message buffer */ Region *region, /* region */ Pool *pool /* pool */ ) -#else -PUBLIC S16 SGetBufRegionPool(mBuf, region, pool) -Buffer *mBuf; /* message buffer */ -Region *region; /* region */ -Pool *pool; /* pool */ -#endif { SsMsgInfo *mInfo; /* message info pointer */ - TRC1(SGetBufRegionPool) #if (ERRCLASS & ERRCLS_INT_PAR) @@ -5645,19 +5224,19 @@ Pool *pool; /* pool */ { SSLOGERROR(ERRCLS_INT_PAR, ESS192, ERRZERO, "SGetBufRegionPool : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if ((region == NULLP) && (pool == NULLP)) { SSLOGERROR(ERRCLS_INT_PAR, ESS193, ERRZERO, "SGetBufRegionPool : Null region and pool pointers"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS194, ERRZERO, "SUpdMsg : Incorrect buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_INT_PAR */ @@ -5668,7 +5247,7 @@ Pool *pool; /* pool */ SSLOGERROR(ERRCLS_DEBUG, ESS195, ERRZERO, "SGetBufRegionPool : mBuf's control data is null"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (region != NULLP) @@ -5676,7 +5255,7 @@ Pool *pool; /* pool */ if (pool != NULLP) *pool = mInfo->pool; - RETVALUE(ROK); + return ROK; } /* end of SGetBufRegionPool */ #endif /* SS_ENABLE_MACROS */ @@ -5699,15 +5278,10 @@ Pool *pool; /* pool */ */ -#ifdef ANSI -PUBLIC S16 SCompressMsg +S16 SCompressMsg ( Buffer *mBuf ) -#else -PUBLIC S16 SCompressMsg(mBuf) -Buffer *mBuf; /* message buffer */ -#endif { SsMsgInfo *minfo; MsgLen numBytes; @@ -5718,21 +5292,20 @@ Buffer *mBuf; /* message buffer */ #ifdef T2K_MEM_LEAK_DBG char* file = __FILE__; - U32 line = __LINE__; + uint32_t line = __LINE__; #endif - TRC1(SCompressMsg) #if (ERRCLASS & ERRCLS_INT_PAR) if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS196, ERRZERO, "SCompressMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS197, ERRZERO, "SCompressMsg : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -5740,7 +5313,7 @@ Buffer *mBuf; /* message buffer */ if ((tmp = mBuf->b_cont) == minfo->endptr) { - RETVALUE(ROK); + return ROK; } /* allocate a data buffer of size bytes*/ @@ -5748,7 +5321,7 @@ Buffer *mBuf; /* message buffer */ { SSLOGERROR(ERRCLS_DEBUG, ESS198, ERRZERO, "SAddMsgRef : ssGetDBufOfSize\ failed"); - RETVALUE(RFAILED); + return RFAILED; } dBuf->b_datap->db_type = SS_M_DATA; @@ -5775,7 +5348,7 @@ Buffer *mBuf; /* message buffer */ mBuf->b_cont = dBuf; minfo->endptr = dBuf; - RETVALUE(ROK); + return ROK; } /* @@ -5797,46 +5370,38 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI -PUBLIC S16 SPrntMsg +S16 SPrntMsg ( Buffer *mBuf, /* message buffer */ S16 src, /* source id */ S16 dst /* destination id */ ) -#else -PUBLIC S16 SPrntMsg(mBuf, src, dst) -Buffer *mBuf; /* message buffer */ -S16 src; /* source id */ -S16 dst; /* destination id */ -#endif { - QLen qlen; /* queue length */ - MsgLen mlen; /* message length */ + QLen qlen =0; /* queue length */ + MsgLen mlen =0; /* message length */ /* * SDeRegTTsk patch */ /* ss038.103 : 102061 Changed to MsgLen from S16 */ - MsgLen i; /* counter */ - S16 j; /* counter */ - S16 k; /* counter */ - U8 data; /* data */ - U8 tdata[16] = {0}; /* temporary data */ - S8 prntBuf[256]; /* print buffer */ - Buffer *tmp; /* buffer ptr */ - Data *cptr; + MsgLen i =0; /* counter */ + S16 j =0; /* counter */ + S16 k =0; /* counter */ + uint8_t data =0; /* data */ + uint8_t tdata[16] = {0}; /* temporary data */ + S8 prntBuf[256] ={0}; /* print buffer */ + Buffer *tmp = NULLP; /* buffer ptr */ + Data *cptr =NULLP; /* ss012.13: Addition */ - Data reg; + Data reg =0; - TRC1(SPrntMsg) if (mBuf == NULLP) { sprintf(prntBuf,"\nmsg: empty\n"); SPrint(prntBuf); SPrint( (S8*)"\n\n"); - RETVALUE(ROK); + return ROK; } for (qlen = 0, tmp = mBuf->b_cont; tmp; qlen++) @@ -5844,8 +5409,9 @@ S16 dst; /* destination id */ mlen = ((SsMsgInfo*)(mBuf->b_rptr))->len; reg = ((SsMsgInfo*)(mBuf->b_rptr))->region; /*ss013.301: Fixed Warnings for 32/64 bit compilation*/ +#ifdef DEBUG_PRINT sprintf(prntBuf,"\nmsg: qlen: %04d mlen: %04d %02d-->%02d region: %02d\n", - (U16)qlen,(U16)mlen,src,dst,reg); + (uint16_t)qlen,(uint16_t)mlen,src,dst,reg); SPrint( prntBuf); #ifdef XEON_SPECIFIC_CHANGES printf("%s\n", prntBuf); @@ -5853,6 +5419,7 @@ S16 dst; /* destination id */ SPrint((S8*) "dat: "); #ifdef XEON_SPECIFIC_CHANGES printf("\ndat: "); +#endif #endif if (mlen == 0) @@ -5860,7 +5427,7 @@ S16 dst; /* destination id */ sprintf(prntBuf," empty\n"); SPrint(prntBuf); SPrint( (S8*)"\n\n"); - RETVALUE(ROK); + return ROK; } tmp = mBuf->b_cont; cptr = tmp->b_rptr; @@ -5875,10 +5442,12 @@ S16 dst; /* destination id */ { /* print hex */ tdata[j]=data; - sprintf( prntBuf,"%02x ",(U16) data); + sprintf( prntBuf,"%02x ",(uint16_t) data); +#ifdef DEBUG_PRINT SPrint( prntBuf); #ifdef XEON_SPECIFIC_CHANGES printf("%s\n", prntBuf); +#endif #endif if (cptr == tmp->b_wptr) { @@ -5894,9 +5463,11 @@ S16 dst; /* destination id */ else { sprintf( prntBuf," "); +#ifdef DEBUG_PRINT SPrint( prntBuf ); #ifdef XEON_SPECIFIC_CHANGES printf("%s\n", prntBuf); +#endif #endif } } @@ -5908,27 +5479,33 @@ S16 dst; /* destination id */ { /* print character if printable */ sprintf(prntBuf,"%c",tdata[k]); +#ifdef DEBUG_PRINT SPrint( prntBuf); #ifdef XEON_SPECIFIC_CHANGES printf("%s\n", prntBuf); +#endif #endif } else { /* print . if non printable */ +#ifdef DEBUG_PRINT SPrint((S8*) "."); #ifdef XEON_SPECIFIC_CHANGES printf("."); #endif +#endif } } sprintf(prntBuf,"\n "); +#ifdef DEBUG_PRINT SPrint(prntBuf); #ifdef XEON_SPECIFIC_CHANGES printf("%s\n", prntBuf); #endif +#endif } - RETVALUE(ROK); + return ROK; } /* end of SPrntMsg */ @@ -5955,17 +5532,11 @@ S16 dst; /* destination id */ * File: ss_msg.c * */ -#ifdef ANSI -PUBLIC S16 SGetPstMsgMult +S16 SGetPstMsgMult ( MsgLen cnt, /* count */ Buffer *mBuf /* message buffer */ ) -#else -PUBLIC S16 SGetPstMsgMult(cnt, mBuf) -MsgLen cnt; /* count */ -Buffer *mBuf; /* message buffer */ -#endif { Buffer *tmp; Buffer *newb; @@ -5973,22 +5544,21 @@ Buffer *mBuf; /* message buffer */ MsgLen numBytes; MsgLen avail; - TRC1(SGetPstMsgMult) #if ( ERRCLASS & ERRCLS_INT_PAR ) /* check message buffer */ if (mBuf == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } /* check count */ if (cnt <= 0) { - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* get the message info */ @@ -6012,7 +5582,7 @@ Buffer *mBuf; /* message buffer */ tmp->b_wptr += numBytes; if (!cnt) - RETVALUE(ROK); + return ROK; } if (ssGetDBufOfSize(minfo->region, cnt, &newb) != ROK) { @@ -6020,7 +5590,7 @@ Buffer *mBuf; /* message buffer */ if ((avail) && (tmp)) tmp->b_wptr = tmp->b_datap->db_lim - avail; minfo->len -= avail; - RETVALUE(ROUTRES); + return (ROUTRES); } minfo->len += cnt; @@ -6040,7 +5610,7 @@ Buffer *mBuf; /* message buffer */ minfo->endptr = newb; - RETVALUE(ROK); + return ROK; } /* @@ -6060,45 +5630,39 @@ Buffer *mBuf; /* message buffer */ * File: ss_msg.c * */ -#ifdef ANSI -PUBLIC S16 SChkMsg +S16 SChkMsg ( Buffer *mBuf ) -#else -PUBLIC S16 SChkMsg(mBuf) -Buffer *mBuf; -#endif { SsMsgInfo *minfo; Buffer *tmp; - TRC1(SChkMsg) #if ( ERRCLASS & ERRCLS_INT_PAR ) /* check message buffer */ if (mBuf == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* get the message info */ minfo = (SsMsgInfo *) (mBuf->b_rptr); if (minfo->len < 2) - RETVALUE(RFAILED); + return RFAILED; /* get the first M_DATA blk*/ tmp = mBuf->b_cont; if (((tmp->b_rptr + 2) <= tmp->b_wptr) || (SCompressMsg(mBuf) == ROK)) - RETVALUE(ROK); + return ROK; - RETVALUE(RFAILED); + return RFAILED; } /* @@ -6115,43 +5679,36 @@ Buffer *mBuf; * File: ss_msg.c * */ -#ifdef ANSI -PUBLIC S16 SAlignDBufEven +S16 SAlignDBufEven ( Buffer *dBuf /* data buffer */ ) -#else -PUBLIC S16 SAlignDBufEven(dBuf) -Buffer *dBuf; /* data buffer */ -#endif { MsgLen len; Data *src; - TRC1(SAlignDBufEven) - #if (ERRCLASS & ERRCLS_INT_PAR) if (!dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS199, ERRZERO, "SAlignDBufEven : Null\ Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (dBuf->b_datap->db_type != SS_M_DATA) { SSLOGERROR(ERRCLS_INT_PAR, ESS200, ERRZERO, "SAlignDBufEven : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif src = dBuf->b_rptr; /* ss008.13: addition */ if (!((PTR)src % (PTR)2)) - RETVALUE(ROK); + return ROK; if (dBuf->b_datap->db_ref > 1) - RETVALUE(RFAILED); + return RFAILED; len = dBuf->b_wptr - dBuf->b_rptr; @@ -6170,9 +5727,9 @@ Buffer *dBuf; /* data buffer */ *--dBuf->b_rptr = *src--; } else - RETVALUE(RFAILED); + return RFAILED; - RETVALUE(ROK); + return ROK; } /* ss004.13: addition */ @@ -6190,37 +5747,29 @@ Buffer *dBuf; /* data buffer */ * File: ss_msg.c * */ -#ifdef ANSI -PUBLIC S16 SAlignDBuf +S16 SAlignDBuf ( Buffer *dBuf, /* data buffer */ -U32 align /* alignemnt required */ +uint32_t align /* alignemnt required */ ) -#else -PUBLIC S16 SAlignDBuf(dBuf, align) -Buffer *dBuf; /* data buffer */ -U32 align; /* alignemnt required */ -#endif { MsgLen len; Data *src; - U32 upShift; /* no. of bytes to be shifted up */ - U32 downShift; /* no. of bytes to be shifted down */ - - TRC1(SAlignDBuf) + uint32_t upShift; /* no. of bytes to be shifted up */ + uint32_t downShift; /* no. of bytes to be shifted down */ #if (ERRCLASS & ERRCLS_INT_PAR) if (!dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS201, ERRZERO, "SAlignDBuf: Null\ Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (dBuf->b_datap->db_type != SS_M_DATA) { SSLOGERROR(ERRCLS_INT_PAR, ESS202, ERRZERO, "SAlignDBuf: Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6230,10 +5779,10 @@ U32 align; /* alignemnt required */ * the read and write pointers */ if (!upShift) - RETVALUE(ROK); + return ROK; if (dBuf->b_datap->db_ref > 1) - RETVALUE(RFAILED); + return RFAILED; downShift = align - upShift; /* no of bytes by which to shift down * the read and write pointers */ @@ -6259,10 +5808,10 @@ U32 align; /* alignemnt required */ *--dBuf->b_rptr = *src--; } else - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -6283,22 +5832,13 @@ U32 align; /* alignemnt required */ * File: ss_msg.c * */ -#ifdef ANSI -PUBLIC S16 SGetSMem +S16 SGetSMem ( Region region, /* region ID */ Size size, /* size */ Pool *pool /* pointer to pool ID */ ) -#else -PUBLIC S16 SGetSMem(region, size, pool) -Region region; /* region ID */ -Size size; /* size */ -Pool *pool; /* pointer to pool ID */ -#endif { - TRC1(SGetSMem); - UNUSED(size); @@ -6308,14 +5848,14 @@ Pool *pool; /* pointer to pool ID */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS203, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate pointer to pool ID */ if (pool == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS204, region, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6324,7 +5864,7 @@ Pool *pool; /* pointer to pool ID */ *pool = 0; - RETVALUE(ROK); + return ROK; } @@ -6344,39 +5884,31 @@ Pool *pool; /* pointer to pool ID */ * File: ss_msg.c * */ -#ifdef ANSI -PUBLIC S16 SPutSMem +S16 SPutSMem ( Region region, /* region ID */ Pool pool /* pool ID */ ) -#else -PUBLIC S16 SPutSMem(region, pool) -Region region; /* region ID */ -Pool pool; /* pool ID */ -#endif { /* ss021.103 - Addition of return value */ #if (ERRCLASS & ERRCLS_INT_PAR) S16 ret; #endif - TRC1(SPutSMem); - #if (ERRCLASS & ERRCLS_INT_PAR) /* validate region ID */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS205, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate pool ID */ if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS206, region, "Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition to check if region is registered */ @@ -6390,7 +5922,7 @@ Pool pool; /* pool ID */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -6403,12 +5935,12 @@ Pool pool; /* pool ID */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS208, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS209, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6417,12 +5949,12 @@ Pool pool; /* pool ID */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS210, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif - RETVALUE(ROK); + return ROK; } @@ -6440,47 +5972,38 @@ Pool pool; /* pool ID */ * File: ss_msg.c * */ -#ifdef ANSI -PUBLIC S16 SChkRes +S16 SChkRes ( Region region, /* region ID */ Pool pool, /* pool ID */ Status *status /* pointer to status */ ) -#else -PUBLIC S16 SChkRes(region, pool, status) -Region region; /* region ID */ -Pool pool; /* pool ID */ -Status *status; /* pointer to status */ -#endif { S16 ret; SMemCtl mctl; - TRC1(SChkRes); - #if (ERRCLASS & ERRCLS_INT_PAR) /* validate region ID */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS229, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate pool ID */ if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS230, region, "Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } /* validate status pointer */ if (status == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS231, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -6496,7 +6019,7 @@ Status *status; /* pointer to status */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -6511,19 +6034,19 @@ Status *status; /* pointer to status */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS233, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS234, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } /* verify that this is a valid pool */ if (osCp.regionTbl[region].poolTbl[pool].type != SS_POOL_DYNAMIC) { SSLOGERROR(ERRCLS_DEBUG, ESS235, ERRZERO, "Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } #endif #endif @@ -6543,12 +6066,12 @@ Status *status; /* pointer to status */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS236, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif - RETVALUE(ret); + return (ret); } /* @@ -6568,17 +6091,11 @@ Status *status; /* pointer to status */ */ -#ifdef ANSI -PUBLIC S16 SSwapMsg +S16 SSwapMsg ( Buffer *mBuf1, /* message 1 */ Buffer *mBuf2 /* message 2 */ ) -#else -PUBLIC S16 SSwapMsg(mBuf1, mBuf2) -Buffer *mBuf1; /* message 1 */ -Buffer *mBuf2; /* message 2 */ -#endif { SsMsgInfo *minfop; SsMsgInfo minfo; @@ -6587,34 +6104,33 @@ Buffer *mBuf2; /* message 2 */ SsMsgInfo *minfo2; #endif Buffer *tmp; - U8 tmp2; + uint8_t tmp2; - TRC1(SSwapMsg) #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer 1 */ if (mBuf1 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS237, ERRZERO, "SSwapMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer 2 */ if (mBuf2 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS238, ERRZERO, "SSwapMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf1->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS239, ERRZERO, "SSwapMsg: Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf2->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS240, ERRZERO, "SSwapMsg: Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } minfo1 = (SsMsgInfo*) mBuf1->b_rptr; minfo2 = (SsMsgInfo*) mBuf2->b_rptr; @@ -6622,7 +6138,7 @@ Buffer *mBuf2; /* message 2 */ { SSLOGERROR(ERRCLS_INT_PAR, ESS241, ERRZERO, "SSwapMsg: differnt regions\ for messages"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6657,7 +6173,7 @@ Buffer *mBuf2; /* message 2 */ SMemCpy((Void *) (mBuf1->b_datap->db_base), (Void *) (mBuf2->b_datap->db_base), (size_t)(sizeof(SsMsgInfo))); SMemCpy((Void *) (mBuf2->b_datap->db_base), (Void *) minfop, (size_t)(sizeof(SsMsgInfo))); - RETVALUE(ROK); + return ROK; } /* ss004.301 : Cavium changes */ #ifdef SS_SEUM_CAVIUM @@ -6680,15 +6196,10 @@ Buffer *mBuf2; /* message 2 */ * File: ss_msg.c * */ -#ifdef ANSI -PUBLIC S16 SConvPtrPhy +S16 SConvPtrPhy ( Buffer **mBuf ) -#else -PUBLIC S16 SConvPtrPhy (mBuf) - Buffer **mBuf; -#endif { Buffer *curPtr; @@ -6697,13 +6208,11 @@ PUBLIC S16 SConvPtrPhy (mBuf) SsDblk *dblkPtr; SsFrtn *frtnPtr; - TRC1(SConvPtrPhy); - /* check mBuf for NULLP */ if ( (mBuf == NULLP) || (*mBuf == NULLP ) ) { - RETVALUE(RFAILED); + return RFAILED; } /* first block in Buffer is head */ @@ -6738,9 +6247,9 @@ PUBLIC S16 SConvPtrPhy (mBuf) minfoPtr->next = (Buffer*)cvmx_ptr_to_phys (minfoPtr->next); } - curPtr->b_rptr = (U8*)cvmx_ptr_to_phys (curPtr->b_rptr); + curPtr->b_rptr = (uint8_t*)cvmx_ptr_to_phys (curPtr->b_rptr); - curPtr->b_wptr = (U8*)cvmx_ptr_to_phys (curPtr->b_wptr); + curPtr->b_wptr = (uint8_t*)cvmx_ptr_to_phys (curPtr->b_wptr); /* Convert the pointers of Dblock to Physical addr */ dblkPtr = (SsDblk*)curPtr->b_datap; @@ -6763,8 +6272,8 @@ PUBLIC S16 SConvPtrPhy (mBuf) } #endif - dblkPtr->db_base = (U8*)cvmx_ptr_to_phys (dblkPtr->db_base); - dblkPtr->db_lim = (U8*)cvmx_ptr_to_phys (dblkPtr->db_lim); + dblkPtr->db_base = (uint8_t*)cvmx_ptr_to_phys (dblkPtr->db_base); + dblkPtr->db_lim = (uint8_t*)cvmx_ptr_to_phys (dblkPtr->db_lim); curPtr->b_datap = (SsDblk*)cvmx_ptr_to_phys (curPtr->b_datap); @@ -6781,8 +6290,8 @@ PUBLIC S16 SConvPtrPhy (mBuf) curPtr->b_cont = (Buffer*)cvmx_ptr_to_phys (curPtr->b_cont); } - curPtr->b_rptr = (U8*)cvmx_ptr_to_phys (curPtr->b_rptr); - curPtr->b_wptr = (U8*)cvmx_ptr_to_phys (curPtr->b_wptr); + curPtr->b_rptr = (uint8_t*)cvmx_ptr_to_phys (curPtr->b_rptr); + curPtr->b_wptr = (uint8_t*)cvmx_ptr_to_phys (curPtr->b_wptr); /* Convert the pointers of Dblock to Physical addr */ dblkPtr = (SsDblk*)curPtr->b_datap; @@ -6805,8 +6314,8 @@ PUBLIC S16 SConvPtrPhy (mBuf) } #endif - dblkPtr->db_base = (U8*)cvmx_ptr_to_phys (dblkPtr->db_base); - dblkPtr->db_lim = (U8*)cvmx_ptr_to_phys (dblkPtr->db_lim); + dblkPtr->db_base = (uint8_t*)cvmx_ptr_to_phys (dblkPtr->db_base); + dblkPtr->db_lim = (uint8_t*)cvmx_ptr_to_phys (dblkPtr->db_lim); curPtr->b_datap = (SsDblk*)cvmx_ptr_to_phys (curPtr->b_datap); @@ -6816,7 +6325,7 @@ PUBLIC S16 SConvPtrPhy (mBuf) *mBuf = (Buffer*)cvmx_ptr_to_phys (*mBuf); - RETVALUE(ROK); + return ROK; } /* SConvPtrPhy */ @@ -6838,15 +6347,10 @@ PUBLIC S16 SConvPtrPhy (mBuf) * File: ss_msg.c * */ -#ifdef ANSI -PUBLIC S16 SConvPhyPtr +S16 SConvPhyPtr ( - Buffer **workPtr - ) -#else -PUBLIC S16 SConvPhyPtr (workPtr) - Buffer **workPtr; -#endif +Buffer **workPtr +) { Buffer *curPtr; @@ -6855,53 +6359,51 @@ PUBLIC S16 SConvPhyPtr (workPtr) SsDblk *dblkPtr; SsFrtn *frtnPtr; - TRC1(SConvPhyPtr); - /* check workPtr for NULLP */ if ( (workPtr == NULLP) || (*workPtr == NULLP) ) { - RETVALUE(RFAILED); + return RFAILED; } /* Convert the buffer address to pointer */ - mBuf = (Buffer*)cvmx_phys_to_ptr ((U64)(*workPtr)); + mBuf = (Buffer*)cvmx_phys_to_ptr ((uint64_t)(*workPtr)); curPtr = mBuf; /* first block is mblk */ if (curPtr->b_next) { - curPtr->b_next = (Buffer*)cvmx_phys_to_ptr ((U64)curPtr->b_next); + curPtr->b_next = (Buffer*)cvmx_phys_to_ptr ((uint64_t)curPtr->b_next); } if (curPtr->b_prev) { - curPtr->b_prev = (Buffer*)cvmx_phys_to_ptr ((U64)curPtr->b_prev); + curPtr->b_prev = (Buffer*)cvmx_phys_to_ptr ((uint64_t)curPtr->b_prev); } if(curPtr->b_cont) { - curPtr->b_cont = (Buffer*)cvmx_phys_to_ptr ((U64)curPtr->b_cont); + curPtr->b_cont = (Buffer*)cvmx_phys_to_ptr ((uint64_t)curPtr->b_cont); } - curPtr->b_rptr = (U8*)cvmx_phys_to_ptr ((U64)curPtr->b_rptr); + curPtr->b_rptr = (uint8_t*)cvmx_phys_to_ptr ((uint64_t)curPtr->b_rptr); /* Get the pointer for minfo */ minfoPtr = (SsMsgInfo*)curPtr->b_rptr; if (minfoPtr->endptr) { - minfoPtr->endptr = (Buffer*)cvmx_phys_to_ptr ((U64)minfoPtr->endptr); + minfoPtr->endptr = (Buffer*)cvmx_phys_to_ptr ((uint64_t)minfoPtr->endptr); } if (minfoPtr->next) { - minfoPtr->next = (Buffer*)cvmx_phys_to_ptr ((U64)minfoPtr->next); + minfoPtr->next = (Buffer*)cvmx_phys_to_ptr ((uint64_t)minfoPtr->next); } - curPtr->b_wptr = (U8*)cvmx_phys_to_ptr ((U64)curPtr->b_wptr); + curPtr->b_wptr = (uint8_t*)cvmx_phys_to_ptr ((uint64_t)curPtr->b_wptr); - curPtr->b_datap = (SsDblk*)cvmx_phys_to_ptr ((U64)curPtr->b_datap); + curPtr->b_datap = (SsDblk*)cvmx_phys_to_ptr ((uint64_t)curPtr->b_datap); /* Get the Dblock pointers */ dblkPtr = (SsDblk*)curPtr->b_datap; @@ -6910,22 +6412,22 @@ PUBLIC S16 SConvPhyPtr (workPtr) #ifdef SS_DBLK_FREE_RTN if (dblkPtr->db_frtnp) { - dblkPtr->db_frtnp = (SsFrtn*)cvmx_phys_to_ptr ((U64)dblkPtr->db_frtnp); + dblkPtr->db_frtnp = (SsFrtn*)cvmx_phys_to_ptr ((uint64_t)dblkPtr->db_frtnp); frtnPtr = dblkPtr->db_frtnp; if (frtnPtr->free_func) { - frtnPtr->free_func = cvmx_phys_to_ptr ((U64)frtnPtr->free_func); + frtnPtr->free_func = cvmx_phys_to_ptr ((uint64_t)frtnPtr->free_func); } if (frtnPtr->free_arg) { - frtnPtr->free_arg = (S8*)cvmx_phys_to_ptr ((U64)frtnPtr->free_arg); + frtnPtr->free_arg = (S8*)cvmx_phys_to_ptr ((uint64_t)frtnPtr->free_arg); } } #endif - dblkPtr->db_base = (U8*)cvmx_phys_to_ptr ((U64)dblkPtr->db_base); - dblkPtr->db_lim = (U8*)cvmx_phys_to_ptr ((U64)dblkPtr->db_lim); + dblkPtr->db_base = (uint8_t*)cvmx_phys_to_ptr ((uint64_t)dblkPtr->db_base); + dblkPtr->db_lim = (uint8_t*)cvmx_phys_to_ptr ((uint64_t)dblkPtr->db_lim); curPtr = curPtr->b_cont; @@ -6934,14 +6436,14 @@ PUBLIC S16 SConvPhyPtr (workPtr) { if(curPtr->b_cont) { - curPtr->b_cont = (Buffer*)cvmx_phys_to_ptr ((U64)curPtr->b_cont); + curPtr->b_cont = (Buffer*)cvmx_phys_to_ptr ((uint64_t)curPtr->b_cont); } - curPtr->b_rptr = (U8*)cvmx_phys_to_ptr ((U64)curPtr->b_rptr); + curPtr->b_rptr = (uint8_t*)cvmx_phys_to_ptr ((uint64_t)curPtr->b_rptr); - curPtr->b_wptr = (U8*)cvmx_phys_to_ptr ((U64)curPtr->b_wptr); + curPtr->b_wptr = (uint8_t*)cvmx_phys_to_ptr ((uint64_t)curPtr->b_wptr); - curPtr->b_datap = (SsDblk*)cvmx_phys_to_ptr ((U64)curPtr->b_datap); + curPtr->b_datap = (SsDblk*)cvmx_phys_to_ptr ((uint64_t)curPtr->b_datap); /* Get the Dblock pointers */ dblkPtr = (SsDblk*)curPtr->b_datap; @@ -6950,23 +6452,23 @@ PUBLIC S16 SConvPhyPtr (workPtr) #ifdef SS_DBLK_FREE_RTN if (dblkPtr->db_frtnp) { - dblkPtr->db_frtnp = (SsFrtn*)cvmx_phys_to_ptr ((U64)dblkPtr->db_frtnp); + dblkPtr->db_frtnp = (SsFrtn*)cvmx_phys_to_ptr ((uint64_t)dblkPtr->db_frtnp); frtnPtr = dblkPtr->db_frtnp; if (frtnPtr->free_func) { - frtnPtr->free_func = cvmx_phys_to_ptr ((U64)frtnPtr->free_func); + frtnPtr->free_func = cvmx_phys_to_ptr ((uint64_t)frtnPtr->free_func); } if (frtnPtr->free_arg) { - frtnPtr->free_arg = (S8*)cvmx_phys_to_ptr ((U64)frtnPtr->free_arg); + frtnPtr->free_arg = (S8*)cvmx_phys_to_ptr ((uint64_t)frtnPtr->free_arg); } } #endif - dblkPtr->db_base = (U8*)cvmx_phys_to_ptr ((U64)dblkPtr->db_base); - dblkPtr->db_lim = (U8*)cvmx_phys_to_ptr ((U64)dblkPtr->db_lim); + dblkPtr->db_base = (uint8_t*)cvmx_phys_to_ptr ((uint64_t)dblkPtr->db_base); + dblkPtr->db_lim = (uint8_t*)cvmx_phys_to_ptr ((uint64_t)dblkPtr->db_lim); curPtr = curPtr->b_cont; } @@ -6974,7 +6476,7 @@ PUBLIC S16 SConvPhyPtr (workPtr) /* Place the converted buffer */ *workPtr = mBuf; - RETVALUE(ROK); + return ROK; } /* SConvPhyPtr */ @@ -6996,21 +6498,13 @@ PUBLIC S16 SConvPhyPtr (workPtr) * File: * */ -#ifdef ANSI -PUBLIC S16 SCpyFpaMsg +S16 SCpyFpaMsg ( - Buffer *srcBuf, - Region dstRegion, - Pool dstPool, - Buffer **dstBuf - ) -#else -PUBLIC S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf) - Buffer *srcBuf; - Region dstRegion; - Pool dstPool; - Buffer **dstBuf; -#endif +Buffer *srcBuf, +Region dstRegion, +Pool dstPool, +Buffer **dstBuf +) { Size numBytes; @@ -7026,19 +6520,17 @@ PUBLIC S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf) SsDblk *dblkPtr = NULLP; SsDblk *dptr = NULLP; - TRC1(SCpyFpaMsg); - if ( srcBuf == (Buffer*)NULLP ) { - RETVALUE(RFAILED); + return RFAILED; } if ((dstRegion >= SS_MAX_REGS) || (dstPool >= SS_MAX_POOLS_PER_REG)) { /* Free the source buffer and return failure */ SPutFpaMsg(srcBuf); - RETVALUE(RFAILED); + return RFAILED; } /* Allocate memory for destination buffer */ @@ -7046,7 +6538,7 @@ PUBLIC S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf) { /* Free the source buffer and return failure */ SPutFpaMsg(srcBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } /* get the minfo of dest and src buffers */ @@ -7078,7 +6570,7 @@ PUBLIC S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf) (Void) SPutMsg(*dstBuf); /* Free the source buffer and return failure */ SPutFpaMsg(srcBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } dat = (Data *)tmpblk + MDBSIZE; @@ -7128,7 +6620,7 @@ PUBLIC S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf) /* Free the source buffer after copying it */ SPutFpaMsg(srcBuf); - RETVALUE(ROK); + return ROK; } /* SCpyFpaMsg */ @@ -7151,17 +6643,11 @@ PUBLIC S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf) * File: * */ -#ifdef ANSI -PUBLIC S16 SCpyMsgFpa +S16 SCpyMsgFpa ( - Buffer *srcBuf, - Buffer **dstBuf - ) -#else -PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf) - Buffer *srcBuf; - Buffer **dstBuf; -#endif +Buffer *srcBuf, +Buffer **dstBuf +) { Buffer *curPtr = NULLP; @@ -7173,15 +6659,13 @@ PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf) SsMsgInfo *minfoDst = NULLP; SsDblk *dblkPtr = NULLP; SsDblk *dptr = NULLP; - U32 numBytes; + uint32_t numBytes; Pool pool; - TRC1(SCpyMsgFpa); - if (srcBuf == (Buffer*)NULLP) { - RETVALUE(RFAILED); + return RFAILED; } *dstBuf = (Buffer*)cvmx_fpa_alloc(SS_CVMX_POOL_0); @@ -7190,7 +6674,7 @@ PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf) { /* Free the source buffer before returning */ SPutMsg(srcBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } dat = (Data *)(*dstBuf) + MDBSIZE; @@ -7248,7 +6732,7 @@ PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf) SPutFpaMsg(*dstBuf); /* Free the source buffer before returning */ SPutMsg(srcBuf); - RETVALUE(RFAILED); + return RFAILED; } /* Allocate for mBuf and copy both the header and contents */ @@ -7262,7 +6746,7 @@ PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf) SPutFpaMsg(*dstBuf); /* Free the source buffer before returning */ SPutMsg(srcBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } dat = (Data *)tmpblk + MDBSIZE; @@ -7313,7 +6797,7 @@ PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf) /* Free the source buffer after copying it */ SPutMsg(srcBuf); - RETVALUE(ROK); + return ROK; } /* SCpyMsgFpa */ @@ -7334,26 +6818,20 @@ PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf) * File: * */ -#ifdef ANSI -PUBLIC S16 SPutFpaMsg +S16 SPutFpaMsg ( - Buffer *fpaBuf +Buffer *fpaBuf ) -#else -PUBLIC S16 SPutFpaMsg(fpaBuf) -Buffer *fpaBuf; -#endif { - U16 size; + uint16_t size; Buffer *curBlk; Buffer *nextBlk; SsDblk *dblkPtr; - TRC1(SPutFpaMsg); if( fpaBuf == NULLP ) { - RETVALUE(ROK); + return ROK; } curBlk = fpaBuf->b_cont; @@ -7396,7 +6874,7 @@ Buffer *fpaBuf; cvmx_fpa_free(fpaBuf, SS_CVMX_POOL_0, 0); - RETVALUE(ROK); + return ROK; } /* SPutFpaMsg */ @@ -7421,21 +6899,13 @@ Buffer *fpaBuf; * */ -#ifdef ANSI -PUBLIC S16 SCpyPartMsg +S16 SCpyPartMsg ( Buffer *srcBuf, MsgLen idx, MsgLen cnt, Buffer *dstBuf ) -#else -PUBLIC S16 SCpyPartMsg(srcBuf, idx, cnt, dstBuf) -Buffer *srcBuf; -MsgLen idx; -MsgLen cnt; -Buffer *dstBuf; -#endif { SsMsgInfo *sMinfo; SsMsgInfo *dMinfo; @@ -7446,30 +6916,29 @@ Buffer *dstBuf; MsgLen dCnt; MsgLen numCpd; - TRC1(SCpyPartMsg) #if (ERRCLASS & ERRCLS_INT_PAR) if (!srcBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SCpyPartMsg : Null src Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (srcBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SCpyPartMsg : Incorrect\ src buffer type"); - RETVALUE(RFAILED); + return RFAILED; } if(!dstBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SCpyPartMsg : Null dst Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (dstBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SCpyPartMsg : Incorrect\ dst buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_INT_PAR) */ @@ -7481,7 +6950,7 @@ Buffer *dstBuf; { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SCpyPartMsg : Incorrect\ idx value "); - RETVALUE(RFAILED); + return RFAILED; } sBuf = srcBuf->b_cont; @@ -7516,7 +6985,7 @@ Buffer *dstBuf; { SSLOGERROR(ERRCLS_DEBUG, ESS125, ERRZERO, "SCpyPartMsg : SGetDBuf\ failed"); - RETVALUE(ROUTRES); + return (ROUTRES); } dCnt = MIN(cnt, (dBuf->b_datap->db_lim - dBuf->b_datap->db_base)); dPrev->b_cont = dBuf; @@ -7569,7 +7038,7 @@ Buffer *dstBuf; dMinfo->len += numCpd; dMinfo->endptr = dBuf; - RETVALUE(ROK); + return ROK; } /* @@ -7588,21 +7057,13 @@ Buffer *dstBuf; * */ -#ifdef ANSI -PUBLIC S16 SRepPartMsg +S16 SRepPartMsg ( Buffer *srcBuf, MsgLen idx, MsgLen cnt, Buffer *dstBuf ) -#else -PUBLIC S16 SRepPartMsg(srcBuf, idx, cnt, dstBuf) -Buffer *srcBuf; -MsgLen idx; -MsgLen cnt; -Buffer *dstBuf; -#endif { SsMsgInfo *sMinfo; SsMsgInfo *dMinfo; @@ -7613,30 +7074,29 @@ Buffer *dstBuf; MsgLen sIdx; MsgLen cpBytes; - TRC1(SRepPartMsg) #if (ERRCLASS & ERRCLS_INT_PAR) if (!dstBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRepPartMsg : Null dstBuf"); - RETVALUE(RFAILED); + return RFAILED; } if (dstBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRepPartMsg : Incorrect\ dstBuf buffer type"); - RETVALUE(RFAILED); + return RFAILED; } if(!srcBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRepPartMsg : Null Src Buffer "); - RETVALUE(RFAILED); + return RFAILED; } if (srcBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRepPartMsg : Incorrect\ sBuf buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_INT_PAR) */ @@ -7647,7 +7107,7 @@ Buffer *dstBuf; { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRepPartMsg : Incorrect\ cnt value "); - RETVALUE(RFAILED); + return RFAILED; } dBuf = dstBuf->b_cont; @@ -7690,10 +7150,10 @@ Buffer *dstBuf; { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRepPartMsg : unable to replace\ some bytes "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -7731,19 +7191,12 @@ Buffer *dstBuf; */ -#ifdef ANSI -PUBLIC S16 SMovPartMsg +S16 SMovPartMsg ( Buffer *srcBuf, /* message 1 */ MsgLen idx, /* index */ Buffer *dstBuf /* message 2 */ ) -#else -PUBLIC S16 SMovPartMsg(srcBuf, idx, dstBuf) -Buffer *srcBuf; /* message 1 */ -MsgLen idx; /* index */ -Buffer *dstBuf; /* message 2 */ -#endif { MsgLen dCnt; MsgLen sCnt; @@ -7754,28 +7207,27 @@ Buffer *dstBuf; /* message 2 */ SsMsgInfo *dMinfo; #ifdef T2K_MEM_LEAK_DBG char* file = __FILE__; - U32 line = __LINE__; + uint32_t line = __LINE__; #endif - TRC1(SMovPartMsg) #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer 1 */ if ((!srcBuf) || (!dstBuf )) { SSLOGERROR(ERRCLS_INT_PAR, ESS097, ERRZERO, "SMovPartMsg : Null Buffer (src or Dst)"); - RETVALUE(RFAILED); + return RFAILED; } if (idx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS099, ERRZERO, "SMovPartMsg : Invalid index"); - RETVALUE(RFAILED); + return RFAILED; } if ((srcBuf->b_datap->db_type != SS_M_PROTO) || (dstBuf->b_datap->db_type != SS_M_PROTO)) { SSLOGERROR(ERRCLS_INT_PAR, ESS100, ERRZERO, "SMovPartMsg : Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7789,7 +7241,7 @@ Buffer *dstBuf; /* message 2 */ /*-- ss008.301 */ if (idx > sMinfo->len) { - RETVALUE(ROKDNA); + return (ROKDNA); } /* one block might not sufficient - Check for generic implementation */ @@ -7811,7 +7263,7 @@ Buffer *dstBuf; /* message 2 */ { SSLOGERROR(ERRCLS_DEBUG, ESS125, ERRZERO, "SCpyMsgPartMsg : SGetDBuf\ failed"); - RETVALUE(ROUTRES); + return (ROUTRES); } dCnt = MIN(idx, (dBuf->b_datap->db_lim - dBuf->b_datap->db_base)); dPrev->b_cont = dBuf; @@ -7859,7 +7311,7 @@ Buffer *dstBuf; /* message 2 */ idx -= sCnt; /* deallocate the sBuf here */ tmp = sBuf->b_cont; - /* printf("SMovPartMsg() sBuf is completely copied sBuf->b_cont(%p)\n", sBuf->b_cont); */ + /* printf("\nSMovPartMsg() sBuf is completely copied sBuf->b_cont(%p)\n", sBuf->b_cont); */ (Void)SPutDBuf(sMinfo->region, sMinfo->pool, sBuf); srcBuf->b_cont = sBuf = tmp; } @@ -7872,10 +7324,10 @@ Buffer *dstBuf; /* message 2 */ dMinfo->len -= idx; SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SMovPartMsg : unable to copy\ some bytes "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -7906,19 +7358,12 @@ Buffer *dstBuf; /* message 2 */ * */ -#ifdef ANSI -PUBLIC S16 SPkMsgMult +S16 SPkMsgMult ( Data *src, MsgLen cnt, Buffer *mBuf ) -#else -PUBLIC S16 SPkMsgMult(src, cnt, mBuf) -Data *src; -MsgLen cnt; -Buffer *mBuf; -#endif { SsMsgInfo *minfo; /* Message info */ Buffer *tmp; @@ -7926,33 +7371,32 @@ Buffer *mBuf; MsgLen numBytes; /* no. of bytes to be copied */ MsgLen offset; - TRC1(SPkMsgMult) #if (ERRCLASS & ERRCLS_INT_PAR) /* check message buffer */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS070, ERRZERO, "SPkMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check source */ if (src == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS071, ERRZERO, "SPkMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check count */ if (cnt <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS072, ERRZERO, "SPkMsgMult: Invalid\ count"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS073, ERRZERO, "SPkMsgMult: Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7977,11 +7421,11 @@ Buffer *mBuf; /* update the read ptr */ tmp->b_rptr -= numBytes; /* copy data */ - memcpy((U8*)tmp->b_rptr, (src + cnt), numBytes); + memcpy(tmp->b_rptr, (src + cnt), numBytes); minfo->len += numBytes; if (!cnt) { - RETVALUE(ROK); + return ROK; } } @@ -7989,19 +7433,19 @@ Buffer *mBuf; newblk = NULLP; if (ssGetDBufOfSize(minfo->region, cnt, &newblk) != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } newblk->b_datap->db_type = SS_M_DATA; newblk->b_rptr = newblk->b_datap->db_lim - cnt; newblk->b_wptr = newblk->b_datap->db_lim; - memcpy((U8*)newblk->b_rptr, src, cnt); + memcpy(newblk->b_rptr, src, cnt); /* attach the newblk chain into mBuf */ newblk->b_cont = tmp; mBuf->b_cont = newblk; minfo->len += cnt; minfo->endptr = newblk; - RETVALUE(ROK); + return ROK; } /* ss006.301 : new buffer management APIs, end */ /* @@ -8018,19 +7462,12 @@ Buffer *mBuf; * File: ss_msg.c * */ -#ifdef ANSI -PUBLIC S16 SGetReadPtr +S16 SGetReadPtr ( - Buffer *mBuf, - U8** data, - MsgLen *len +Buffer *mBuf, +uint8_t** data, +MsgLen *len ) -#else -PUBLIC S16 SGetReadPtr (mBuf, data, len) -Buffer *mBuf; -U8** data; -MsgLen *len; -#endif { /* Buffer *tmp; */ @@ -8045,7 +7482,7 @@ MsgLen *len; *len = 0; } - RETVALUE(ROK); + return ROK; } #ifdef SS_USE_ZBC_MEMORY /* @@ -8068,7 +7505,7 @@ MsgLen *len; */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SAttachPtrToBufNew +S16 SAttachPtrToBufNew ( Region region, Pool pool, @@ -8076,11 +7513,10 @@ Data *ptr, MsgLen totalLen, Buffer** mBuf, char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SAttachPtrToBuf +S16 SAttachPtrToBuf ( Region region, Pool pool, @@ -8088,14 +7524,6 @@ Data *ptr, MsgLen totalLen, Buffer** mBuf ) -#else -PUBLIC S16 SAttachPtrToBuf(region, pool, ptr, totalLen, mBuf) -Region region; -Pool pool; -Data *ptr; -MsgLen totalLen; -Buffer** mBuf; -#endif #endif { SsMsgInfo *minfo; /* Message info */ @@ -8104,13 +7532,12 @@ Buffer** mBuf; Buffer *newblk; /* Void *iccHdlr; */ - TRC1(SAttachPtrToBuf) #if (ERRCLASS & ERRCLS_INT_PAR) if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: Null PTR"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -8120,20 +7547,20 @@ Buffer** mBuf; if(SGetMsg(region, pool, mBuf) != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: SGetMsg Failed"); - RETVALUE(ROUTRES); + return (ROUTRES); } mdsize = MDBSIZE; #ifdef SS_HISTOGRAM_SUPPORT - if (SAlloc(region, &mdsize, 0, (Data **) &newblk, __LINE__, (U8*) __FILE__, ENTNC) != ROK) + if (SAlloc(region, &mdsize, 0, (Data **) &newblk, __LINE__, (uint8_t*) __FILE__, ENTNC) != ROK) #else if (SAlloc(region, &mdsize, 0, (Data **) &newblk) != ROK) #endif /* SS_HISTOGRAM_SUPPORT */ { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: SAlloc Failed"); SPutMsg(*mBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } (*mBuf)->b_cont = newblk; @@ -8151,7 +7578,9 @@ Buffer** mBuf; #ifndef SS_DBUF_REFLOCK_DISABLE if((SInitLock (&(dptr->dBufLock), SS_LOCK_MUTEX)) != 0) { - printf("Falied to destroy lock\n"); +#ifdef ERROR_PRINT + printf("\nFalied to destroy lock\n"); +#endif } #endif @@ -8162,7 +7591,7 @@ Buffer** mBuf; minfo->len = totalLen; minfo->endptr = newblk; - RETVALUE(ROK); + return ROK; } /* @@ -8182,32 +7611,25 @@ Buffer** mBuf; */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 SPutZbcDBufNew +static S16 SPutZbcDBufNew ( Region region, Buffer *buf, char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PRIVATE S16 SPutZbcDBuf +static S16 SPutZbcDBuf ( Region region, Buffer *buf ) -#else -PRIVATE S16 SPutZbcDBuf(region, buf) -Region region; -Buffer *buf; -#endif #endif { register SsDblk *dptr; MsgLen bufLen; S16 ret = ROK; - TRC2(SPutZbcDBuf); dptr = buf->b_datap; /* Get the length of the buffer */ @@ -8225,14 +7647,14 @@ Buffer *buf; #ifdef SS_HISTOGRAM_SUPPORT ret = SFree(region, (Data *) buf->b_datap->db_base, bufLen, __LINE__, - (U8*) __FILE__, ENTNC); + (uint8_t*) __FILE__, ENTNC); #else ret = SFree(region, (Data *) buf->b_datap->db_base, bufLen); #endif /* SS_HISTOGRAM_SUPPORT */ /* if the data block is not shared, free the buffer, checks not reqd */ #ifdef SS_HISTOGRAM_SUPPORT - ret = SFree(region, (Data *) buf, MDBSIZE, __LINE__, (U8*) __FILE__, + ret = SFree(region, (Data *) buf, MDBSIZE, __LINE__, (uint8_t*) __FILE__, ENTNC); #else ret = SFree(region, (Data *) buf, MDBSIZE); @@ -8247,7 +7669,7 @@ Buffer *buf; { SSLOGERROR(ERRCLS_DEBUG, ESSXXX, ERRZERO, "Could not lock the mBuf Ref Lock"); - RETVALUE(RFAILED); + return RFAILED; } #endif --dptr->db_ref; @@ -8255,7 +7677,7 @@ Buffer *buf; if (buf != (SsMblk *) (((Data*) dptr) - MBSIZE)) { #ifdef SS_HISTOGRAM_SUPPORT - ret = SFree(region, (Data *) buf, MDBSIZE, __LINE__, (U8*) __FILE__, ENTNC); + ret = SFree(region, (Data *) buf, MDBSIZE, __LINE__, (uint8_t*) __FILE__, ENTNC); #else ret = SFree(region, (Data *) buf, MDBSIZE); #endif /* SS_HISTOGRAM_SUPPORT */ @@ -8268,30 +7690,32 @@ Buffer *buf; ret = SUnlock(&dptr->dBufLock) ; if((SDestroyLock(&dptr->dBufLock)) != 0) { - printf("Falied to destroy lock\n"); +#ifdef ERROR_PRINT + printf("\nFalied to destroy lock\n"); +#endif } #endif #ifdef SS_HISTOGRAM_SUPPORT ret = SFree(region, (Data *) buf->b_datap->db_base, bufLen, __LINE__, - (U8*) __FILE__, ENTNC); + (uint8_t*) __FILE__, ENTNC); #else ret = SFree(region, (Data *) buf->b_datap->db_base, bufLen); #endif /* SS_HISTOGRAM_SUPPORT */ #ifdef SS_HISTOGRAM_SUPPORT - ret = SFree(region, (Data *) buf, MDBSIZE, __LINE__, (U8*) __FILE__, + ret = SFree(region, (Data *) buf, MDBSIZE, __LINE__, (uint8_t*) __FILE__, ENTNC); #else ret = SFree(region, (Data *) buf, MDBSIZE); #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ret); + return (ret); } #ifndef SS_DBUF_REFLOCK_DISABLE ret = SUnlock(&(dptr->dBufLock)); #endif } - RETVALUE(ret); + return (ret); } #endif /* SS_USE_ZBC_MEMORY */ @@ -8316,7 +7740,7 @@ Buffer *buf; * */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SAttachPtrToMBuf1 +S16 SAttachPtrToMBuf1 ( Region region, Pool pool, @@ -8325,11 +7749,10 @@ MsgLen totalLen, MsgLen ptrLen, Buffer** mBuf, char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SAttachPtrToMBuf +S16 SAttachPtrToMBuf ( Region region, Pool pool, @@ -8338,15 +7761,6 @@ MsgLen totalLen, MsgLen ptrLen, Buffer** mBuf ) -#else -PUBLIC S16 SAttachPtrToMBuf(region, pool, ptr, totalLen, ptrLen, mBuf) -Region region; -Pool pool; -Data *ptr; -MsgLen totalLen; -MsgLen ptrLen; -Buffer** mBuf; -#endif #endif { SsMsgInfo *minfo; /* Message info */ @@ -8355,34 +7769,33 @@ Buffer** mBuf; Buffer *newblk; /* Void *iccHdlr; */ - TRC1(SAttachPtrToMBuf) #if (ERRCLASS & ERRCLS_INT_PAR) if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: Null PTR"); - RETVALUE(RFAILED); + return RFAILED; } #endif if(SGetMsg(region, pool, mBuf) != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: SGetMsg Failed"); - RETVALUE(ROUTRES); + return (ROUTRES); } region = 0; mdsize = MDBSIZE; #ifdef SS_HISTOGRAM_SUPPORT - if (SAlloc(region, &mdsize, 0, (Data **) &newblk, __LINE__, (U8*) __FILE__, ENTNC) != ROK) + if (SAlloc(region, &mdsize, 0, (Data **) &newblk, __LINE__, (uint8_t*) __FILE__, ENTNC) != ROK) #else if (SAlloc(region, &mdsize, 0, (Data **) &newblk) != ROK) #endif /* SS_HISTOGRAM_SUPPORT */ { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: SAlloc Failed"); SPutMsg(*mBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } (*mBuf)->b_cont = newblk; @@ -8400,7 +7813,9 @@ Buffer** mBuf; #ifndef SS_DBUF_REFLOCK_DISABLE if((SInitLock (&(dptr->dBufLock), SS_LOCK_MUTEX)) != 0) { - printf("Falied to destroy lock\n"); +#ifdef ERROR_PRINT + printf("\nFalied to destroy lock\n"); +#endif } #endif @@ -8411,21 +7826,21 @@ Buffer** mBuf; minfo->len = totalLen; minfo->endptr = newblk; - //printf("Mbuf PTR = %x, DBlk PTR = %x, PTR = %x\n", *mBuf, newblk, ptr); - RETVALUE(ROK); + //printf("\nMbuf PTR = %x, DBlk PTR = %x, PTR = %x\n", *mBuf, newblk, ptr); + return ROK; } #endif /* INTEL_WLS */ -PUBLIC S16 SIncMsgRef(Buffer *srcBuf,Region dstRegion, Pool dstPool,Buffer **dstBuf) +S16 SIncMsgRef(Buffer *srcBuf,Region dstRegion, Pool dstPool,Buffer **dstBuf) { #ifndef L2_OPTMZ - RETVALUE(SAddMsgRef(srcBuf,dstRegion, dstPool,dstBuf)); + return (SAddMsgRef(srcBuf,dstRegion, dstPool,dstBuf)); #else *dstBuf = srcBuf; #endif - RETVALUE(ROK); + return ROK; } #ifdef L2_OPTMZ -PUBLIC Void SResetMBuf(Buffer *mbuf) +Void SResetMBuf(Buffer *mbuf) { SsMsgInfo *minfo; Buffer *tmp; @@ -8439,7 +7854,7 @@ PUBLIC Void SResetMBuf(Buffer *mbuf) if(tmp) { - // printf("SResetMBuf The write & read ptr is %p %p %p %p \n", tmp->b_wptr, tmp->b_rptr, tmp->b_datap->db_base, tmp->b_datap->db_lim ); + // printf("\nSResetMBuf The write & read ptr is %p %p %p %p \n", tmp->b_wptr, tmp->b_rptr, tmp->b_datap->db_base, tmp->b_datap->db_lim ); // tmp->b_wptr = tmp->b_rptr = tmp->b_datap->db_base; tmp->b_wptr = tmp->b_rptr = (tmp->b_datap->db_base + 5); tmp->b_datap->db_ref = 1; @@ -8448,7 +7863,7 @@ PUBLIC Void SResetMBuf(Buffer *mbuf) #endif - RETVOID; + return; } #endif @@ -8472,7 +7887,7 @@ PUBLIC Void SResetMBuf(Buffer *mbuf) * */ #ifdef T2K_MEM_LEAK_DBG -PUBLIC S16 SAttachWlsPtrToMBuf1 +S16 SAttachWlsPtrToMBuf1 ( Region region, Pool pool, @@ -8482,11 +7897,10 @@ MsgLen totalLen, MsgLen ptrLen, Buffer** mBuf, char* file, -U32 line +uint32_t line ) #else -#ifdef ANSI -PUBLIC S16 SAttachWlsPtrToMBuf +S16 SAttachWlsPtrToMBuf ( Region region, Pool pool, @@ -8496,16 +7910,6 @@ MsgLen totalLen, MsgLen ptrLen, Buffer** mBuf ) -#else -PUBLIC S16 SAttachWlsPtrToMBuf(region, pool, ptr, readPtr, totalLen, ptrLen, mBuf) -Region region; -Pool pool; -Data *ptr; -Data *readPtr; -MsgLen totalLen; -MsgLen ptrLen; -Buffer** mBuf; -#endif #endif { SsMsgInfo *minfo; /* Message info */ @@ -8514,13 +7918,12 @@ Buffer** mBuf; Buffer *newblk; /* Void *iccHdlr; */ - TRC1(SAttachWlsPtrToMBuf) #if (ERRCLASS & ERRCLS_INT_PAR) if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: Null PTR"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -8528,20 +7931,20 @@ Buffer** mBuf; if(SGetMsg(region, pool, mBuf) != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: SGetMsg Failed"); - RETVALUE(ROUTRES); + return (ROUTRES); } mdsize = MDBSIZE; #ifdef SS_HISTOGRAM_SUPPORT - if (SAlloc(region, &mdsize, 0, (Data **) &newblk, __LINE__, (U8*) __FILE__, ENTNC) != ROK) + if (SAlloc(region, &mdsize, 0, (Data **) &newblk, __LINE__, (uint8_t*) __FILE__, ENTNC) != ROK) #else if (SAlloc(region, &mdsize, 0, (Data **) &newblk) != ROK) #endif /* SS_HISTOGRAM_SUPPORT */ { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: SAlloc Failed"); SPutMsg(*mBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } (*mBuf)->b_cont = newblk; @@ -8559,7 +7962,9 @@ Buffer** mBuf; #ifndef SS_DBUF_REFLOCK_DISABLE if((SInitLock (&(dptr->dBufLock), SS_LOCK_MUTEX)) != 0) { - printf("Falied to destroy lock\n"); +#ifdef ERROR_PRINT + printf("\nFalied to destroy lock\n"); +#endif } #endif @@ -8570,15 +7975,15 @@ Buffer** mBuf; minfo->len = totalLen; minfo->endptr = newblk; - //printf("Mbuf PTR = %x, DBlk PTR = %x, PTR = %x\n", *mBuf, newblk, ptr); - RETVALUE(ROK); + //printf("\nMbuf PTR = %x, DBlk PTR = %x, PTR = %x\n", *mBuf, newblk, ptr); + return ROK; } #ifdef TENB_DPDK_BUF -extern U32 numeTti; +uint32_t numeTti; -PUBLIC S16 SGetSBufDpdk +S16 SGetSBufDpdk ( Data **ptr, /* pointer to buffer */ Size size /* size requested */ @@ -8588,23 +7993,23 @@ Size size /* size requested */ *ptr = ntl_alloc(mtGetNtlHdl(), size); - RETVALUE(ret); + return (ret); } -PUBLIC S16 SPutSBufDpdk +S16 SPutSBufDpdk ( Data *ptr /* pointer to buffer */ ) { - S16 ret; - U32 flags = 0; + S16 ret = ROK; + uint32_t flags = 0; ntl_free(mtGetNtlHdl(), ptr); - RETVALUE(ret); + return (ret); } -PUBLIC S16 SDetachDpdkPtrFrmDBuf +S16 SDetachDpdkPtrFrmDBuf ( Buffer *mBuf, Data **ptr @@ -8615,8 +8020,8 @@ Data **ptr SsMsgInfo *minfo; //msgBlk = mBuf->b_cont; - //*ptr = msgBlk->b_rptr;; - *ptr = mBuf->b_datap->db_base;; + //*ptr = msgBlk->b_rptr; + *ptr = mBuf->b_datap->db_base; mBuf->b_cont = NULL; @@ -8624,11 +8029,11 @@ Data **ptr //minfo->len = 0; - RETVALUE(ROK); + return ROK; } -PUBLIC S16 SDetachDpdkPtrFrmMBuf +S16 SDetachDpdkPtrFrmMBuf ( Buffer *mBuf, Data **ptr @@ -8645,29 +8050,28 @@ PUBLIC S16 SDetachDpdkPtrFrmMBuf if(msgBlk == NULLP) { *ptr = NULLP; - RETVALUE(RFAILED); + return RFAILED; } dptr = msgBlk->b_datap; if(dptr->db_type != SS_MEM_TYPE_DPDK_ZBC) { *ptr = NULLP; - RETVALUE(RFAILED); + return RFAILED; } - *ptr = msgBlk->b_rptr;; + *ptr = msgBlk->b_rptr; mBuf->b_cont = NULL; minfo = (SsMsgInfo*) mBuf->b_rptr; minfo->len = 0; - RETVALUE(ROK); + return ROK; } -#ifdef ANSI -PUBLIC S16 SAttachDpdkPtrToMBuf +S16 SAttachDpdkPtrToMBuf ( Region region, Pool pool, @@ -8677,29 +8081,19 @@ MsgLen msgLen, MsgLen totalLen, Buffer** mBuf ) -#else -PUBLIC S16 SAttachDpdkPtrToMBuf(region, pool, ptr, readPtr, msgLen, totalLen, mBuf) -Region region; -Pool pool; -Data *ptr; -Data *readPtr; -MsgLen msgLen; -MsgLen totalLen; -Buffer** mBuf; -#endif { SsDblk *dptr; if(0 == msgLen) - RETVALUE(RFAILED); + return RFAILED; SAttachWlsPtrToMBuf(region, pool, ptr, readPtr, msgLen, totalLen, mBuf); dptr = (SsDblk*) (((Data *) ((*mBuf)->b_cont)) + MBSIZE); dptr->db_type = SS_MEM_TYPE_DPDK_ZBC; - RETVALUE(ROK); + return ROK; } #endif /* TENB_DPDK_BUF */