From 0f75e0aa7fc8d5219c95855c0cd52a24be1d2c35 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Wed, 13 Mar 2019 17:57:41 -0700 Subject: [PATCH] RPRO/PUTF log instead of assert() --- modules/database/src/ioc/db/dbDbLink.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/database/src/ioc/db/dbDbLink.c b/modules/database/src/ioc/db/dbDbLink.c index e5a686984..0da927139 100644 --- a/modules/database/src/ioc/db/dbDbLink.c +++ b/modules/database/src/ioc/db/dbDbLink.c @@ -436,21 +436,27 @@ static long processTarget(dbCommon *psrc, dbCommon *pdst) if(claim_src) { dbRec2Pvt(psrc)->procThread = self; - } else { - assert(dbRec2Pvt(psrc)->procThread==self); } if(claim_dst) { dbRec2Pvt(pdst)->procThread = self; - } else { - assert(dbRec2Pvt(psrc)->procThread==self); + } + + if(dbRec2Pvt(psrc)->procThread!=self || + dbRec2Pvt(pdst)->procThread!=self) { + errlogPrintf("Logic Error: processTarget 1 from %p, %s(%p) -> %s(%p)\n", + self, psrc->name, dbRec2Pvt(psrc), pdst->name, dbRec2Pvt(pdst)); } status = dbProcess(pdst); psrc->pact = pact; - assert(dbRec2Pvt(psrc)->procThread==self); - assert(dbRec2Pvt(pdst)->procThread==self); + if(dbRec2Pvt(psrc)->procThread!=self || + dbRec2Pvt(pdst)->procThread!=self) { + errlogPrintf("Logic Error: processTarget 2 from %p, %s(%p) -> %s(%p)\n", + self, psrc->name, dbRec2Pvt(psrc), pdst->name, dbRec2Pvt(pdst)); + } + if(claim_src) { dbRec2Pvt(psrc)->procThread = NULL; }