Skip to content

use throw allocator for dynamicProfileInfoMapSaving #3253

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

Merged
merged 1 commit into from
Jun 29, 2017
Merged

use throw allocator for dynamicProfileInfoMapSaving #3253

Show file tree
Hide file tree
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
18 changes: 16 additions & 2 deletions lib/Runtime/Language/SourceDynamicProfileManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,19 +329,33 @@ namespace Js
dynamicProfileInfoMapSaving.Reset();
}

void SourceDynamicProfileManager::AddItem(LocalFunctionId functionId, DynamicProfileInfo *info)
{
try
{
// our BaseDictionary does not allow nothrow allocator
AUTO_NESTED_HANDLED_EXCEPTION_TYPE(ExceptionType_OutOfMemory);
dynamicProfileInfoMapSaving.Item(functionId, info);
}
catch (Js::OutOfMemoryException&)
{
Output::Print(_u("Hit OOM while saving dynamic profile info\n"));
}
}

void SourceDynamicProfileManager::CopySavingData()
{
dynamicProfileInfoMap.Map([&](LocalFunctionId functionId, DynamicProfileInfo *info)
{
dynamicProfileInfoMapSaving.Item(functionId, info);
this->AddItem(functionId, info);
});
}

void
SourceDynamicProfileManager::SaveDynamicProfileInfo(LocalFunctionId functionId, DynamicProfileInfo * dynamicProfileInfo)
{
Assert(dynamicProfileInfo->GetFunctionBody()->HasExecutionDynamicProfileInfo());
dynamicProfileInfoMapSaving.Item(functionId, dynamicProfileInfo);
this->AddItem(functionId, dynamicProfileInfo);
}

template <typename T>
Expand Down
5 changes: 3 additions & 2 deletions lib/Runtime/Language/SourceDynamicProfileManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace Js
public:
SourceDynamicProfileManager(Recycler* allocator) : isNonCachableScript(false), cachedStartupFunctions(nullptr), recycler(allocator),
#ifdef DYNAMIC_PROFILE_STORAGE
dynamicProfileInfoMapSaving(&NoThrowHeapAllocator::Instance),
dynamicProfileInfoMapSaving(&HeapAllocator::Instance),
#endif
dynamicProfileInfoMap(allocator), startupFunctions(nullptr), profileDataCache(nullptr)
{
Expand Down Expand Up @@ -53,11 +53,12 @@ namespace Js
FieldNoBarrier(Recycler*) recycler;

#ifdef DYNAMIC_PROFILE_STORAGE
typedef JsUtil::BaseDictionary<LocalFunctionId, DynamicProfileInfo *, NoThrowHeapAllocator> DynamicProfileInfoMapSavingType;
typedef JsUtil::BaseDictionary<LocalFunctionId, DynamicProfileInfo *, HeapAllocator> DynamicProfileInfoMapSavingType;
FieldNoBarrier(DynamicProfileInfoMapSavingType) dynamicProfileInfoMapSaving;

void SaveDynamicProfileInfo(LocalFunctionId functionId, DynamicProfileInfo * dynamicProfileInfo);
void SaveToDynamicProfileStorage(char16 const * url);
void AddItem(LocalFunctionId functionId, DynamicProfileInfo *info);
template <typename T>
static SourceDynamicProfileManager * Deserialize(T * reader, Recycler* allocator);
template <typename T>
Expand Down