Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HPCC-29883 Optimize DataBuffer allocator #17560

Merged
merged 1 commit into from
Aug 11, 2023
Merged

HPCC-29883 Optimize DataBuffer allocator #17560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions roxie/roxiemem/roxiemem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6644,7 +6644,7 @@ class CDataBufferManager : implements IDataBufferManager, public CInterface

DataBuffer *allocate()
{
CriticalBlock b(crit);
CLeavableCriticalBlock block(crit);

if (memTraceLevel >= 5)
DBGLOG("RoxieMemMgr: CDataBufferManager::allocate() curBlock=%p nextAddr=%p:%x", curBlock, nextBase, nextOffset);
Expand Down Expand Up @@ -6681,8 +6681,12 @@ class CDataBufferManager : implements IDataBufferManager, public CInterface
memsize_t nextHeadId = createDataId(nextFree, nextSeqFromDataId(curHeadId));
if (likely(bottom->freeHeadId.compare_exchange_weak(curHeadId, nextHeadId, std::memory_order_acq_rel)))
{
dataBuffersActive.fetch_add(1);
bottom->Link();

//Leave the critical section before initialising the return result
block.leave();

dataBuffersActive.fetch_add(1);
curFree->nextDataId = 0;
curFree->changeState(DBState::freed, DBState::unowned, __func__); // sanity check - will be overriden by the following new
if (memTraceLevel >= 4)
Expand All @@ -6694,19 +6698,15 @@ class CDataBufferManager : implements IDataBufferManager, public CInterface

if (nextOffset < HEAP_ALIGNMENT_SIZE) // Is there any space in the current block (it must be a whole block)
{
dataBuffersActive.fetch_add(1);
curBlock->Link();
DataBuffer *x = ::new(nextBase+nextOffset) DataBuffer();
char * result = nextBase+nextOffset;
nextOffset += DATA_ALIGNMENT_SIZE;
if (nextOffset == HEAP_ALIGNMENT_SIZE)
{
// MORE: May want to delete this "if" logic !!
// and let it be handled in the similar logic of "else" part below.
curBlock->Release();
curBlock = NULL;
nextBase = NULL;
//nextOffset = 0 - not needed since only used if curBlock is set
}

//Leave the critical section before initialising the return result
block.leave();

dataBuffersActive.fetch_add(1);
DataBuffer *x = ::new(result) DataBuffer();
if (memTraceLevel >= 4)
DBGLOG("RoxieMemMgr: CDataBufferManager::allocate() allocated DataBuffer - addr=%p", x);
return x;
Expand Down Expand Up @@ -6749,8 +6749,12 @@ class CDataBufferManager : implements IDataBufferManager, public CInterface
memsize_t nextHeadId = createDataId(nextFree, nextSeqFromDataId(curHeadId));
if (likely(finger->freeHeadId.compare_exchange_weak(curHeadId, nextHeadId, std::memory_order_acq_rel)))
{
dataBuffersActive.fetch_add(1);
finger->Link();

//Leave the critical section before initialising the return result
block.leave();

dataBuffersActive.fetch_add(1);
curFree->nextDataId = 0;
curFree->changeState(DBState::freed, DBState::unowned, __func__); // sanity check - will be overriden by the following new
if (memTraceLevel >= 4)
Expand Down
Loading