diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-11 11:55:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-11 11:55:59 +0200 |
| commit | d5160cc529073a79cc2e099ea2cef1c40e6310de (patch) | |
| tree | 02237aa61a7af9f70321379996e474da90741fe6 /runtime | |
| parent | b1fe03c82f0c3fbb9ec7209922fbdc2deeec0bdd (diff) | |
| parent | 40b342cfad797d269dd54c8a67e68299ef62d43e (diff) | |
Merge branch 'v5-stable' into v5-devel
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/glbl.c | 6 | ||||
| -rw-r--r-- | runtime/queue.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/runtime/glbl.c b/runtime/glbl.c index 68eb276c..ec4992cf 100644 --- a/runtime/glbl.c +++ b/runtime/glbl.c @@ -188,6 +188,11 @@ GetLocalHostName(void) { uchar *pszRet; + if(LocalHostNameOverride != NULL) { + pszRet = LocalHostNameOverride; + goto done; + } + if(LocalHostName == NULL) pszRet = (uchar*) "[localhost]"; else { @@ -196,6 +201,7 @@ GetLocalHostName(void) else pszRet = LocalHostName; } +done: return(pszRet); } diff --git a/runtime/queue.c b/runtime/queue.c index 70f0ba0c..d31a4551 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -2332,6 +2332,7 @@ doEnqSingleObj(qqueue_t *pThis, flowControl_t flowCtlType, void *pUsr) objDestruct(pUsr); ABORT_FINALIZE(RS_RET_QUEUE_FULL); } + dbgoprint((obj_t*) pThis, "enqueueMsg: wait solved queue full condition, enqueing\n"); } /* and finally enqueue the message */ @@ -2359,6 +2360,7 @@ qqueueMultiEnqObjNonDirect(qqueue_t *pThis, multi_submit_t *pMultiSub) { int iCancelStateSave; int i; + rsRetVal localRet; DEFiRet; ISOBJ_TYPE_assert(pThis, qqueue); @@ -2367,7 +2369,9 @@ qqueueMultiEnqObjNonDirect(qqueue_t *pThis, multi_submit_t *pMultiSub) pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &iCancelStateSave); d_pthread_mutex_lock(pThis->mut); for(i = 0 ; i < pMultiSub->nElem ; ++i) { - CHKiRet(doEnqSingleObj(pThis, pMultiSub->ppMsgs[i]->flowCtlType, (void*)pMultiSub->ppMsgs[i])); + localRet = doEnqSingleObj(pThis, pMultiSub->ppMsgs[i]->flowCtlType, (void*)pMultiSub->ppMsgs[i]); + if(localRet != RS_RET_OK && localRet != RS_RET_QUEUE_FULL) + ABORT_FINALIZE(localRet); } qqueueChkPersist(pThis, pMultiSub->nElem); |