Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-12 05:14:10 +02:00
Code Activity

GC marking in addr order for cache, improved reporting

Browse source
This commit is contained in:
Brian Fiete 2019-11-07 10:01:23 -08:00
parent 9197c60964
commit 9c9bfdc6d4
4 changed files with 216 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

76
BeefRT/dbg/gc.cpp
View file

@ -42,6 +42,7 @@
#include "BeefySysLib/util/BeefPerf.h"
#include "BeefySysLib/util/HashSet.h"
#include "BeefySysLib/util/Dictionary.h"
#include "BeefySysLib/util/BinaryHeap.h"
#include <unordered_set>
#include "../rt/BfObjects.h"
#include "../rt/Thread.h"
@ -586,8 +587,8 @@ BFGC::BFGC()
mGracelessShutdown = false;
mMainThreadTLSPtr = NULL;
mHadPendingGCDataOverflow = false;
mCurPendingGCDepth = 0;
mMaxPendingGCDepth = 0;
mCurPendingGCSize = 0;
mMaxPendingGCSize = 0;
mCollectIdx = 0;
mStackScanIdx = 0;
@ -851,33 +852,28 @@ void BFGC::ObjectDeleteRequested(bf::System::Object* obj)
}
}
bool BFGC::HandlePendingGCData(Beefy::Array<bf::System::Object*>* pendingGCData)
bool BFGC::HandlePendingGCData()
{
int count = 0;
while (!pendingGCData->IsEmpty())
while (true)
{
mCurPendingGCDepth = 0;
if (mOrderedPendingGCData.IsEmpty())
break;
bf::System::Object* obj = pendingGCData->back();
pendingGCData->pop_back();
mCurPendingGCSize = 0;
bf::System::Object* obj = mOrderedPendingGCData.Pop();
MarkMembers(obj);
count++;
if (mCurPendingGCDepth > mMaxPendingGCDepth)
mMaxPendingGCDepth = mCurPendingGCDepth;
if (mCurPendingGCSize > mMaxPendingGCSize)
mMaxPendingGCSize = mCurPendingGCSize;
}
return count > 0;
}
bool BFGC::HandlePendingGCData()
{
bool didMark = false;
didMark = HandlePendingGCData(&mPendingGCData);
return didMark;
}
void BFGC::SweepSpan(tcmalloc_obj::Span* span, int expectedStartPage)
{
if ((gBfRtDbgFlags & BfRtFlags_ObjectHasDebugFlags) == 0)
@ -1446,7 +1442,7 @@ bool BFGC::ScanThreads()
//suspendTimeGuard.Stop();
BF_LOGASSERT(result != -1);
if (!mPendingGCData.IsEmpty())
if ((!mOrderedPendingGCData.IsEmpty()) || (!mOrderedPendingGCData.IsEmpty()))
{
BP_ZONE("HandlePendingGCData(Thread)");
HandlePendingGCData();
@ -1608,7 +1604,7 @@ void BFGC::DoCollect(bool doingFullGC)
}
}
BF_ASSERT(mPendingGCData.IsEmpty());
BF_ASSERT(mOrderedPendingGCData.IsEmpty());
}
void BFGC::FinishCollect()
@ -1825,11 +1821,11 @@ void BFGC::Run()
while (true)
{
mHadPendingGCDataOverflow = false;
mMaxPendingGCDepth = 0;
mMaxPendingGCSize = 0;
PerformCollection();
if (!mHadPendingGCDataOverflow)
break;
mPendingGCData.Reserve(BF_MAX(mPendingGCData.mAllocSize + mPendingGCData.mAllocSize / 2, mMaxPendingGCDepth + 256));
mOrderedPendingGCData.Reserve(BF_MAX(mOrderedPendingGCData.mAllocSize + mOrderedPendingGCData.mAllocSize / 2, mMaxPendingGCSize + 256));
}
BF_FULL_MEMORY_FENCE();
@ -1997,7 +1993,7 @@ void BFGC::Shutdown()
TCMalloc_FreeAllocs();
mFinalizeList.Dispose();
mPendingGCData.Dispose();
mOrderedPendingGCData.Dispose();
for (auto thread : mThreadList)
thread->mStackMarkableObjects.Dispose();
}
@ -2070,8 +2066,8 @@ void BFGC::ObjReportHandleSpan(tcmalloc_obj::Span* span, int expectedStartPage,
//pairVal.first->second = newSize;
AllocInfo* sizePtr = NULL;
sizeMap.TryAdd(type, NULL, &sizePtr);
sizePtr->mCount++;
sizePtr->mSize += elementSize;
sizePtr->mObjCount++;
sizePtr->mObjSize += elementSize;
objectCount++;
}
@ -2168,7 +2164,6 @@ void BFGC::Report()
ObjReportScan(objectCount, objFreeSize, sizeMap);
std::multimap<AllocInfo, bf::System::Type*> orderedSizeMap;
intptr totalSize = 0;
for (auto& pair : sizeMap)
{
orderedSizeMap.insert(std::make_pair(pair.mValue, pair.mKey));
@ -2182,18 +2177,25 @@ void BFGC::Report()
msg += Beefy::StrFormat(" Live Objects %d\n", objectCount);
msg += Beefy::StrFormat(" Last Object Freed Count %d\n", mLastFreeCount);
intptr reportedCount = 0;
intptr objReportedCount = 0;
intptr rawReportedCount = 0;
intptr rawFreeSize = 0;
intptr objTotalSize = 0;
intptr rawTotalSize = 0;
gBFGC.RawReport(msg, rawFreeSize, orderedSizeMap);
for (auto& pair : orderedSizeMap)
{
totalSize += pair.first.mSize;
reportedCount += pair.first.mCount;
objTotalSize += pair.first.mObjSize;
objReportedCount += pair.first.mObjCount;
rawTotalSize += pair.first.mRawSize;
rawReportedCount += pair.first.mRawCount;
}
msg += Beefy::StrFormat(" Scanned Alloc Count %d\n", (int)(reportedCount));
msg += Beefy::StrFormat(" Used Memory %dk\n", (int)(totalSize / 1024));
msg += Beefy::StrFormat(" Object Unusued Memory %dk\n", (int)(objFreeSize / 1024));
msg += Beefy::StrFormat(" Obj Scanned Alloc Count %d\n", (int)(objReportedCount));
msg += Beefy::StrFormat(" Raw Scanned Alloc Count %d\n", (int)(rawReportedCount));
msg += Beefy::StrFormat(" Obj Used Memory %dk\n", (int)(objTotalSize / 1024));
msg += Beefy::StrFormat(" Raw Used Memory %dk\n", (int)(rawTotalSize / 1024));
msg += Beefy::StrFormat(" Obj Unusued Memory %dk\n", (int)(objFreeSize / 1024));
msg += Beefy::StrFormat(" Raw Unusued Memory %dk\n", (int)(rawFreeSize / 1024));
@ -2226,7 +2228,10 @@ void BFGC::Report()
else
typeName = type->GetFullName();
msg += StrFormat(" %-62s %7dk %7d\n", typeName.c_str(), (pair.first.mSize + 1023) / 1024, pair.first.mCount);
if (pair.first.mObjCount > 0)
msg += StrFormat("OBJ %-62s %7dk %7d\n", typeName.c_str(), (pair.first.mObjSize + 1023) / 1024, pair.first.mObjCount);
if (pair.first.mRawCount > 0)
msg += StrFormat("RAW %-62s %7dk %7d\n", typeName.c_str(), (pair.first.mRawSize + 1023) / 1024, pair.first.mRawCount);
}
Beefy::OutputDebugStr(msg.c_str());
@ -2313,7 +2318,7 @@ void BFGC::PerformCollection()
uint8 oldCode = *mallocAddr;
*mallocAddr = 0xCC;*/
mPendingGCData.Reserve(BF_GC_MAX_PENDING_OBJECT_COUNT);
mOrderedPendingGCData.Reserve(BF_GC_MAX_PENDING_OBJECT_COUNT);
uint32 suspendStartTick = BFTickCount();
SuspendThreads();
@ -2579,12 +2584,13 @@ void BFGC::MarkFromGCThread(bf::System::Object* obj)
mCurGCMarkCount++;
mCurGCObjectQueuedCount++;
mCurPendingGCDepth++;
mCurPendingGCSize++;
bool allowQueue = true;
if (mPendingGCData.GetFreeCount() > 0)
if (mOrderedPendingGCData.GetFreeCount() > 0)
{
mPendingGCData.Add(obj);
mOrderedPendingGCData.Add(obj);
}
else
{

18
BeefRT/dbg/gc.h
View file

@ -4,6 +4,7 @@
#include "BeefySysLib/util/CritSect.h"
#include "BeefySysLib/util/Array.h"
#include "BeefySysLib/util/Dictionary.h"
#include "BeefySysLib/util/BinaryHeap.h"
#include <unordered_map>
#include <map>
#include "../rt/BfObjects.h"
@ -238,12 +239,15 @@ public:
struct AllocInfo
{
int mCount;
int mSize;
int mObjCount;
int mObjSize;
int mRawCount;
int mRawSize;
bool operator<(const AllocInfo &rhs) const
{
return mSize > rhs.mSize;
return (mObjSize + mRawSize) > (rhs.mObjSize + rhs.mRawSize);
}
};
@ -301,10 +305,11 @@ public:
static int volatile sCurMarkId; //0-3
static int volatile sAllocFlags;
Beefy::Array<bf::System::Object*> mPendingGCData;
Beefy::BinaryMinHeap<bf::System::Object*> mOrderedPendingGCData;
bool mHadPendingGCDataOverflow;
int mCurPendingGCDepth;
int mMaxPendingGCDepth;
int mCurPendingGCSize;
int mMaxPendingGCSize;
Beefy::Array<ThreadInfo*> mThreadList;
int mCurMutatorMarkCount;
int mCurGCMarkCount;
@ -336,7 +341,6 @@ public:
void RawInit();
void RawShutdown();
void WriteDebugDumpState();
bool HandlePendingGCData(Beefy::Array<bf::System::Object*>* pendingGCData);
bool HandlePendingGCData();
void MarkMembers(bf::System::Object* obj);

4
BeefRT/dbg/gc_raw.cpp
View file

@ -292,8 +292,8 @@ void BFGC::RawReportHandleSpan(tcmalloc_raw::Span* span, int expectedStartPage,
else
{
(*sizeMap).TryAdd(type, NULL, &sizePtr);
sizePtr->mSize += elementSize;
sizePtr->mCount++;
sizePtr->mRawSize += elementSize;
sizePtr->mRawCount++;
}
objectCount++;
}

154
BeefySysLib/util/BinaryHeap.h Normal file
View file

@ -0,0 +1,154 @@
#pragma once
#include "Array.h"
NS_BF_BEGIN;
template <typename T>
class BinaryMaxHeap : public Array<T>
{
private:
void HeapifyUp(int32 childIdx)
{
if (childIdx > 0)
{
int32 parentIdx = (childIdx - 1) / 2;
if (mVals[childIdx] > mVals[parentIdx])
{
// swap parent and child
T t = mVals[parentIdx];
mVals[parentIdx] = mVals[childIdx];
mVals[childIdx] = t;
HeapifyUp(parentIdx);
}
}
}
void HeapifyDown(int32 parentIdx)
{
int32 leftChildIdx = 2 * parentIdx + 1;
int32 rightChildIdx = leftChildIdx + 1;
int32 largestChildIdx = parentIdx;
if (leftChildIdx < mSize && mVals[leftChildIdx] > mVals[largestChildIdx])
{
largestChildIdx = leftChildIdx;
}
if (rightChildIdx < mSize && mVals[rightChildIdx] > mVals[largestChildIdx])
{
largestChildIdx = rightChildIdx;
}
if (largestChildIdx != parentIdx)
{
T t = mVals[parentIdx];
mVals[parentIdx] = mVals[largestChildIdx];
mVals[largestChildIdx] = t;
HeapifyDown(largestChildIdx);
}
}
public:
BinaryMaxHeap() : Array()
{
}
/// Add an item to the heap
void Add(T item)
{
Array::Add(item);
HeapifyUp(mSize - 1);
}
/// Get the item of the root
T Peek()
{
return mVals[0];
}
/// Extract the item of the root
T Pop()
{
T item = mVals[0];
mSize--;
mVals[0] = mVals[mSize];
HeapifyDown(0);
return item;
}
};
template <typename T>
class BinaryMinHeap : public Array<T>
{
private:
void HeapifyUp(int32 childIdx)
{
if (childIdx > 0)
{
int32 parentIdx = (childIdx - 1) / 2;
if (mVals[childIdx] < mVals[parentIdx])
{
// swap parent and child
T t = mVals[parentIdx];
mVals[parentIdx] = mVals[childIdx];
mVals[childIdx] = t;
HeapifyUp(parentIdx);
}
}
}
void HeapifyDown(int32 parentIdx)
{
int32 leftChildIdx = 2 * parentIdx + 1;
int32 rightChildIdx = leftChildIdx + 1;
int32 largestChildIdx = parentIdx;
if (leftChildIdx < mSize && mVals[leftChildIdx] < mVals[largestChildIdx])
{
largestChildIdx = leftChildIdx;
}
if (rightChildIdx < mSize && mVals[rightChildIdx] < mVals[largestChildIdx])
{
largestChildIdx = rightChildIdx;
}
if (largestChildIdx != parentIdx)
{
T t = mVals[parentIdx];
mVals[parentIdx] = mVals[largestChildIdx];
mVals[largestChildIdx] = t;
HeapifyDown(largestChildIdx);
}
}
public:
BinaryMinHeap() : Array()
{
}
/// Add an item to the heap
void Add(T item)
{
Array::Add(item);
HeapifyUp(mSize - 1);
}
/// Get the item of the root
T Peek()
{
return mVals[0];
}
/// Extract the item of the root
T Pop()
{
T item = mVals[0];
mSize--;
mVals[0] = mVals[mSize];
HeapifyDown(0);
return item;
}
};
NS_BF_END