epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

libCom: valgrind track taskwd freelist

Browse Source
This commit is contained in:
Michael Davidsaver
2015-12-21 13:44:23 -05:00
committed by Michael Davidsaver
parent 6f0814108a
commit c1f742e741
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libCom/taskwd/taskwd.c
View File

@@ -25,6 +25,7 @@
#include "epicsStdioRedirect.h"
#include "epicsThread.h"
#include "epicsMutex.h"
#include "valgrind/valgrind.h"
#include "errlog.h"
#include "ellLib.h"
#include "errMdef.h"
@@ -130,9 +131,15 @@ static void twdTask(void *arg)
static void twdShutdown(void *arg)
{
ELLNODE *cur;
twdCtl = twdctlExit;
epicsEventSignal(loopEvent);
epicsEventWait(exitEvent);
while((cur=ellGet(&fList))!=NULL) {
VALGRIND_MEMPOOL_FREE(&fList, cur);
free(cur);
}
VALGRIND_DESTROY_MEMPOOL(&fList);
}
static void twdInitOnce(void *arg)
@@ -142,6 +149,8 @@ static void twdInitOnce(void *arg)
tLock = epicsMutexMustCreate();
mLock = epicsMutexMustCreate();
fLock = epicsMutexMustCreate();
ellInit(&fList);
VALGRIND_CREATE_MEMPOOL(&fList, 0, 0);
twdCtl = twdctlRun;
loopEvent = epicsEventMustCreate(epicsEventEmpty);
@@ -391,11 +400,14 @@ static union twdNode *newNode(void)
pn = (union twdNode *)ellFirst(&fList);
if (pn) {
ellDelete(&fList, (void *)pn);
epicsMutexUnlock(fLock);
return pn;
VALGRIND_MEMPOOL_FREE(&fList, pn);
}
epicsMutexUnlock(fLock);
return calloc(1, sizeof(union twdNode));
if(!pn)
pn = calloc(1, sizeof(union twdNode));
if(pn)
VALGRIND_MEMPOOL_ALLOC(&fList, pn, sizeof(*pn));
return pn;
}
static union twdNode *allocNode(void)
@@ -411,6 +423,8 @@ static union twdNode *allocNode(void)
static void freeNode(union twdNode *pn)
{
VALGRIND_MEMPOOL_FREE(&fList, pn);
VALGRIND_MEMPOOL_ALLOC(&fList, pn, sizeof(ELLNODE));
epicsMutexMustLock(fLock);
ellAdd(&fList, (void *)pn);
epicsMutexUnlock(fLock);