2273480e423dca72b1251438587f1fb53cf38e6c galt Thu Jun 6 23:28:44 2013 -0700 adding mutex to make careful alloc, free, etc work with multiple pthreads, which customFactory now uses. The careful mem handler is being used in many cgis now although not hgTracks at this time. Because of the saved-session support going into cart.c, that means that practically anything that uses the cart now can be calling the multi-threaded customtrack loader. diff --git src/inc/memalloc.h src/inc/memalloc.h index eebc92d..eaa0799 100644 --- src/inc/memalloc.h +++ src/inc/memalloc.h @@ -26,30 +26,30 @@ /* Sets memHandler to the default. */ void pushCarefulMemHandler(size_t maxAlloc); /* Push the careful (paranoid, conservative, checks everything) * memory handler top of the memHandler stack and use it. */ void carefulCheckHeap(); /* Walk through allocated memory and make sure that all cookies are * in place. Only walks through what's been done since * pushCarefulMemHandler(). */ int carefulCountBlocksAllocated(); /* How many memory items are allocated? (Since called * pushCarefulMemHandler(). */ -long carefulTotalAllocated(); +size_t carefulTotalAllocated(); /* Return total bases allocated */ void setMaxAlloc(size_t s); /* Set large allocation limit. */ void memTrackerStart(); /* Push memory handler that will track blocks allocated so that * they can be automatically released with memTrackerEnd(). */ void memTrackerEnd(); /* Free any remaining blocks and pop tracker memory handler. */ #endif /* MEMALLOC_H */