Ack from me (not tested).
/AndersBj
reddy.neelaka...@oracle.com wrote:
> osaf/services/saf/immsv/immnd/ImmModel.cc | 25 +++++++++++++------------
> osaf/services/saf/immsv/immnd/immnd_evt.c | 6 +++---
> osaf/services/saf/immsv/immnd/immnd_proc.c | 4 ++--
> 3 files changed, 18 insertions(+), 17 deletions(-)
>
>
> diff --git a/osaf/services/saf/immsv/immnd/ImmModel.cc
> b/osaf/services/saf/immsv/immnd/ImmModel.cc
> --- a/osaf/services/saf/immsv/immnd/ImmModel.cc
> +++ b/osaf/services/saf/immsv/immnd/ImmModel.cc
> @@ -41,7 +41,7 @@ struct ContinuationInfo2
> ContinuationInfo2():mCreateTime(0), mConn(0), mTimeout(0), mImplId(0){}
> ContinuationInfo2(SaUint32T conn, SaUint32T timeout):mConn(conn),
> mTimeout(timeout),
> mImplId(0)
> - {mCreateTime = time(NULL);osafassert(mCreateTime > ((time_t) 0));}
> + {mCreateTime = time(NULL);osafassert(mCreateTime >= ((time_t) 0));}
>
> time_t mCreateTime;
> SaUint32T mConn;
> @@ -1000,6 +1000,7 @@ immModel_cleanTheBasement(IMMND_CB *cb,
> }
>
> time_t now = time(NULL);
> + osafassert(now >= ((time_t) 0));
> time_t nextSearch = 0;
> time_t opSearchTime;
> ImmSearchOp *op;
> @@ -4927,7 +4928,7 @@ ImmModel::ccbApply(SaUint32T ccbId,
> implAssoc->mContinuationId = sLastContinuationId;/*
> incremented above */
> if(ccb->mWaitStartTime == 0) {
> ccb->mWaitStartTime = time(NULL);
> - osafassert(ccb->mWaitStartTime > ((time_t) 0));
> + osafassert(ccb->mWaitStartTime >= ((time_t) 0));
> TRACE("Wait timer for completed started for ccb:%u",
> ccb->mId);
> }
> @@ -5736,7 +5737,7 @@ ImmModel::ccbTerminate(SaUint32T ccbId)
>
> if(ccb->mWaitStartTime == 0) {
> ccb->mWaitStartTime = time(NULL);
> - osafassert(ccb->mWaitStartTime > ((time_t) 0));
> + osafassert(ccb->mWaitStartTime >= ((time_t) 0));
> TRACE_5("Ccb Wait-time for GC set. State: %u/%s", ccb->mState,
> (ccb->mState == IMM_CCB_COMMITTED)?"COMMITTED":
> ((ccb->mState == IMM_CCB_ABORTED)?"ABORTED":"OTHER"));
> @@ -7372,7 +7373,7 @@ SaAisErrorT ImmModel::ccbObjectCreate(Im
> object->mImplementer->mId, *implConn, *implNodeId,
> object->mImplementer->mImplementerName.c_str());
> ccb->mWaitStartTime = time(NULL);
> - osafassert(ccb->mWaitStartTime > ((time_t) 0));
> + osafassert(ccb->mWaitStartTime >= ((time_t) 0));
> } else if(className == immMngtClass) {
> if(sImmNodeState == IMM_NODE_LOADING) {
> if(objectName != immManagementDn) {
> @@ -8498,7 +8499,7 @@ ImmModel::ccbObjectModify(const ImmsvOmC
> object->mImplementer->mImplementerName.c_str());
>
> ccb->mWaitStartTime = time(NULL);
> - osafassert(ccb->mWaitStartTime > ((time_t) 0));
> + osafassert(ccb->mWaitStartTime >= ((time_t) 0));
> } else if(ccb->mCcbFlags & SA_IMM_CCB_REGISTERED_OI) {
> if((object->mImplementer == NULL) &&
> (ccb->mCcbFlags & SA_IMM_CCB_ALLOW_NULL_OI)) {
> @@ -9062,7 +9063,7 @@ ImmModel::deleteObject(ObjectMap::iterat
> SaUint32T implConn = oi->second->mImplementer->mConn;
>
> ccb->mWaitStartTime = time(NULL);
> - osafassert(ccb->mWaitStartTime > ((time_t) 0));
> + osafassert(ccb->mWaitStartTime >= ((time_t) 0));
> /* TODO: Resetting the ccb timer for each deleted object here.
> Not so efficient. Should set it only when all objects
> are processed.
> @@ -9364,7 +9365,7 @@ ImmModel::ccbWaitForCompletedAck(SaUint3
> Restart the timer to catch ccbs hung waiting on PBE.
> */
> ccb->mWaitStartTime = time(NULL);
> - osafassert(ccb->mWaitStartTime > ((time_t) 0));
> + osafassert(ccb->mWaitStartTime >= ((time_t) 0));
> return true; /* Wait for PBE commit*/
> } else {
> /* But there is not any PBE up currently => abort. */
> @@ -11972,7 +11973,7 @@ ImmModel::getOldCriticalCcbs(IdVector& c
> *pbeIdPtr = 0;
> CcbVector::iterator i;
> time_t now = time(NULL);
> - osafassert(now > ((time_t) 0));
> + osafassert(now >= ((time_t) 0));
> for(i=sCcbVector.begin(); i!=sCcbVector.end(); ++i) {
> if((*i)->mState == IMM_CCB_CRITICAL &&
> (((*i)->mWaitStartTime &&
> @@ -12193,7 +12194,7 @@ ImmModel::cleanTheBasement(InvocVector&
> bool iAmCoord)
> {
> time_t now = time(NULL);
> - osafassert(now > ((time_t) 0));
> + osafassert(now >= ((time_t) 0));
> ContinuationMap2::iterator ci2;
> ImplementerEvtMap::iterator iem;
> CcbVector::iterator i3;
> @@ -12574,7 +12575,7 @@ ImmModel::implementerSet(const IMMSV_OCT
> TRACE_7("Replaced implid %u with %u",
> oldImplId, info->mId);
> ccb->mPbeRestartId = info->mId;
> ccb->mWaitStartTime = time(NULL);/*Reset
> timer on new impl*/
> - osafassert(ccb->mWaitStartTime > ((time_t)
> 0));
> + osafassert(ccb->mWaitStartTime >= ((time_t)
> 0));
> /* Can only be one PBE impl asoc*/
> break; /* out of for(isi =
> ccb->mImplementers....*/
> }
> @@ -16892,8 +16893,8 @@ ImmModel::finalizeSync(ImmsvOmFinalizeSy
> newCcb->mVeto = SA_AIS_OK;
> newCcb->mState = (ImmCcbState) (prt45allowed ? ol->ccbState
> : (ol->ccbState + 2));
> newCcb->mWaitStartTime = time(NULL);
> - if(newCcb->mWaitStartTime <= ((time_t) 0)) {
> - LOG_ER("newCcb->mWaitStartTime <= 0");
> + if(newCcb->mWaitStartTime < ((time_t) 0)) {
> + LOG_ER("newCcb->mWaitStartTime < 0");
> err = SA_AIS_ERR_FAILED_OPERATION;
> delete newCcb;
> goto done;
> diff --git a/osaf/services/saf/immsv/immnd/immnd_evt.c
> b/osaf/services/saf/immsv/immnd/immnd_evt.c
> --- a/osaf/services/saf/immsv/immnd/immnd_evt.c
> +++ b/osaf/services/saf/immsv/immnd/immnd_evt.c
> @@ -8113,7 +8113,7 @@ uint32_t immnd_evt_proc_abort_sync(IMMND
> LOG_WA("SERVER STATE: IMM_SERVER_SYNC_CLIENT --> IMM
> SERVER LOADING PENDING (sync aborted)");
> cb->mStep = 0;
> cb->mJobStart = time(NULL);
> - osafassert(cb->mJobStart > ((time_t) 0));
> + osafassert(cb->mJobStart >= ((time_t) 0));
> cb->mMyEpoch = 0;
> cb->mSync = false;
> osafassert(!(cb->mAccepted));
> @@ -8247,7 +8247,7 @@ static uint32_t immnd_evt_proc_start_syn
> } else if ((cb->mState == IMM_SERVER_SYNC_CLIENT) &&
> (immnd_syncComplete(cb, SA_FALSE, cb->mStep))) {
> cb->mStep = 0;
> cb->mJobStart = time(NULL);
> - osafassert(cb->mJobStart > ((time_t) 0));
> + osafassert(cb->mJobStart >= ((time_t) 0));
> cb->mState = IMM_SERVER_READY;
> immnd_ackToNid(NCSCC_RC_SUCCESS);
> LOG_NO("SERVER STATE: IMM_SERVER_SYNC_CLIENT --> IMM SERVER
> READY (materialized by start sync)");
> @@ -8380,7 +8380,7 @@ static uint32_t immnd_evt_proc_loading_o
> cb->mState = IMM_SERVER_LOADING_CLIENT;
> cb->mStep = 0;
> cb->mJobStart = time(NULL);
> - osafassert(cb->mJobStart > ((time_t) 0));
> + osafassert(cb->mJobStart >= ((time_t) 0));
> cb->mAccepted = true;
> if(cb->mCanBeCoord) {cb->mIsOtherScUp = true;}
> }
> diff --git a/osaf/services/saf/immsv/immnd/immnd_proc.c
> b/osaf/services/saf/immsv/immnd/immnd_proc.c
> --- a/osaf/services/saf/immsv/immnd/immnd_proc.c
> +++ b/osaf/services/saf/immsv/immnd/immnd_proc.c
> @@ -572,7 +572,7 @@ void immnd_announceDump(IMMND_CB *cb)
> Reduces risk of epoch race with dump.
> */
> cb->mJobStart = time(NULL);
> - osafassert(cb->mJobStart > ((time_t) 0));
> + osafassert(cb->mJobStart >= ((time_t) 0));
> }
> }
>
> @@ -1623,7 +1623,7 @@ uint32_t immnd_proc_server(uint32_t *tim
> int32_t coord, newEpoch;
> int32_t printFrq = (*timeout > 100) ? 5 : 50;
> time_t now = time(NULL);
> - osafassert(now > ((time_t) 0));
> + osafassert(now >= ((time_t) 0));
> uint32_t jobDuration = (uint32_t) now - cb->mJobStart;
> SaBoolT pbeImmndDeadlock=SA_FALSE;
> if(!jobDuration) {++jobDuration;} /* Avoid jobDuraton of zero */
>
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
