From cd2b917feff1f292085cef15574bb5974a11d4a7 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 17 Jul 2013 13:33:13 +0200 Subject: cosmetic bugfix: file name buffer was not freed on disk queue destruction This was an extremely small one-time per run memleak, so nothing of concern. However, it bugs under valgrind and similar memory debuggers. --- runtime/queue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'runtime/queue.c') diff --git a/runtime/queue.c b/runtime/queue.c index 5ccdd814..08ef475f 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -877,7 +877,8 @@ static rsRetVal qDestructDisk(qqueue_t *pThis) DEFiRet; ASSERT(pThis != NULL); - + + free(pThis->pszQIFNam); if(pThis->tVars.disk.pWrite != NULL) strm.Destruct(&pThis->tVars.disk.pWrite); if(pThis->tVars.disk.pReadDeq != NULL) -- cgit v1.2.3 From 62090c416cd0b7f4b67a68a81b5c37e2d27cf84e Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 17 Jul 2013 13:34:23 +0200 Subject: regression fix: %d used for long long types in debug output regression from recent DA queue bug fix set of patches; not present in any released code. --- runtime/queue.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'runtime/queue.c') diff --git a/runtime/queue.c b/runtime/queue.c index 08ef475f..abe2be06 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -2568,7 +2568,9 @@ doEnqSingleObj(qqueue_t *pThis, flowControl_t flowCtlType, msg_t *pMsg) && pThis->tVars.disk.sizeOnDisk > pThis->sizeOnDiskMax)) { STATSCOUNTER_INC(pThis->ctrFull, pThis->mutCtrFull); if(pThis->toEnq == 0 || pThis->bEnqOnly) { - DBGOPRINT((obj_t*) pThis, "doEnqSingleObject: queue FULL - configured for immediate discarding QueueSize=%d MaxQueueSize=%d sizeOnDisk=%d sizeOnDiskMax=%d\n", pThis->iQueueSize, pThis->iMaxQueueSize, pThis->tVars.disk.sizeOnDisk, pThis->sizeOnDiskMax); + DBGOPRINT((obj_t*) pThis, "doEnqSingleObject: queue FULL - configured for immediate discarding QueueSize=%d " + "MaxQueueSize=%d sizeOnDisk=%lld sizeOnDiskMax=%lld\n", pThis->iQueueSize, pThis->iMaxQueueSize, + pThis->tVars.disk.sizeOnDisk, pThis->sizeOnDiskMax); STATSCOUNTER_INC(pThis->ctrFDscrd, pThis->mutCtrFDscrd); msgDestruct(&pMsg); ABORT_FINALIZE(RS_RET_QUEUE_FULL); -- cgit v1.2.3