Skip to content

Port AutoDisableInterrupt updates from internal branch #3479

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
Aug 4, 2017
Merged

Port AutoDisableInterrupt updates from internal branch #3479

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
4 changes: 2 additions & 2 deletions lib/Runtime/Base/ScriptContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2999,7 +2999,7 @@ namespace Js
DEBUGGER_ATTACHDETACH_FATAL_ERROR_IF_FAILED(hr);

// Disable QC while functions are re-parsed as this can be time consuming
AutoDisableInterrupt autoDisableInterrupt(this->threadContext->GetInterruptPoller(), true);
AutoDisableInterrupt autoDisableInterrupt(this->threadContext, false /* explicitCompletion */);

hr = this->GetDebugContext()->RundownSourcesAndReparse(shouldPerformSourceRundown, /*shouldReparseFunctions*/ true);

Expand Down Expand Up @@ -3095,7 +3095,7 @@ namespace Js
this->GetDebugContext()->SetDebuggerMode(Js::DebuggerMode::SourceRundown);

// Disable QC while functions are re-parsed as this can be time consuming
AutoDisableInterrupt autoDisableInterrupt(this->threadContext->GetInterruptPoller(), true);
AutoDisableInterrupt autoDisableInterrupt(this->threadContext, false /* explicitCompletion */);

// Force a reparse so that indirect function caches are updated.
hr = this->GetDebugContext()->RundownSourcesAndReparse(/*shouldPerformSourceRundown*/ false, /*shouldReparseFunctions*/ true);
Expand Down
60 changes: 36 additions & 24 deletions lib/Runtime/Base/ThreadContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,30 +82,6 @@ class InterruptPoller _ABSTRACT
bool isDisabled;
};

class AutoDisableInterrupt
{
private:
InterruptPoller* interruptPoller;
bool previousState;
public:
AutoDisableInterrupt(InterruptPoller* interruptPoller, bool disable)
: interruptPoller(interruptPoller)
{
if (interruptPoller != nullptr)
{
previousState = interruptPoller->IsDisabled();
interruptPoller->SetDisabled(disable);
}
}
~AutoDisableInterrupt()
{
if (interruptPoller != nullptr)
{
interruptPoller->SetDisabled(previousState);
}
}
};

// This function is called before we step out of script (currently only for WinRT callout).
// Debugger would put a breakpoint on this function if they want to detect the point at which we step
// over the boundary.
Expand Down Expand Up @@ -1796,6 +1772,42 @@ class ThreadContext sealed :

extern void(*InitializeAdditionalProperties)(ThreadContext *threadContext);

// This is for protecting a region of code, where we can't recover and be consistent upon failures (mainly due to OOM and SO).
// FailFast on that.
class AutoDisableInterrupt
{
public:
AutoDisableInterrupt::AutoDisableInterrupt(ThreadContext *threadContext, bool explicitCompletion = true)
: m_operationCompleted(false), m_interruptDisableState(false), m_threadContext(threadContext), m_explicitCompletion(explicitCompletion)
{
if (m_threadContext->HasInterruptPoller())
{
m_interruptDisableState = m_threadContext->GetInterruptPoller()->IsDisabled();
m_threadContext->GetInterruptPoller()->SetDisabled(true);
}
}
AutoDisableInterrupt::~AutoDisableInterrupt()
{
if (m_threadContext->HasInterruptPoller())
{
m_threadContext->GetInterruptPoller()->SetDisabled(m_interruptDisableState);
}

if (m_explicitCompletion && !m_operationCompleted)
{
AssertOrFailFast(false);
}
}

void Completed() { m_operationCompleted = true; }

private:
ThreadContext * m_threadContext;
bool m_operationCompleted;
bool m_interruptDisableState;
bool m_explicitCompletion;
};

#if ENABLE_JS_REENTRANCY_CHECK
class JsReentLock
{
Expand Down
21 changes: 6 additions & 15 deletions lib/Runtime/Library/JavascriptArray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1601,12 +1601,11 @@ namespace Js
}
#endif

// Grow the segments

// Code below has potential to throw due to OOM or SO. Just FailFast on those cases
AutoFailFastOnError failFastError;

ScriptContext *scriptContext = intArray->GetScriptContext();
AutoDisableInterrupt failFastError(scriptContext->GetThreadContext());

// Grow the segments
Recycler *recycler = scriptContext->GetRecycler();
SparseArraySegmentBase *seg, *nextSeg, *prevSeg = nullptr;
for (seg = intArray->head; seg; seg = nextSeg)
Expand Down Expand Up @@ -1884,7 +1883,7 @@ namespace Js
SparseArraySegmentBase *seg, *nextSeg, *prevSeg = nullptr;

// Code below has potential to throw due to OOM or SO. Just FailFast on those cases
AutoFailFastOnError failFastError;
AutoDisableInterrupt failFastError(scriptContext->GetThreadContext());

for (seg = intArray->head; seg; seg = nextSeg)
{
Expand Down Expand Up @@ -2074,7 +2073,7 @@ namespace Js
SparseArraySegmentBase *seg, *nextSeg, *prevSeg = nullptr;

// Code below has potential to throw due to OOM or SO. Just FailFast on those cases
AutoFailFastOnError failFastError;
AutoDisableInterrupt failFastError(scriptContext->GetThreadContext());

for (seg = fArray->head; seg; seg = nextSeg)
{
Expand Down Expand Up @@ -7377,7 +7376,7 @@ namespace Js
if (newArr && isBuiltinArrayCtor && len == pArr->length)
{
// Code below has potential to throw due to OOM or SO. Just FailFast on those cases
AutoFailFastOnError failFastOnError;
AutoDisableInterrupt failFastOnError(scriptContext->GetThreadContext());

// Array has a single segment (need not start at 0) and splice start lies in the range
// of that segment we optimize splice - Fast path.
Expand Down Expand Up @@ -12708,14 +12707,6 @@ namespace Js
return static_cast<JavascriptNativeFloatArray *>(RecyclableObject::FromVar(aValue));
}

AutoFailFastOnError::~AutoFailFastOnError()
{
if (!m_operationCompleted)
{
AssertOrFailFast(false);
}
}

template int Js::JavascriptArray::GetParamForIndexOf<unsigned int>(unsigned int, Js::Arguments const&, void*&, unsigned int&, Js::ScriptContext*);
template bool Js::JavascriptArray::ArrayElementEnumerator::MoveNext<void*>();
template void Js::JavascriptArray::SetArrayLiteralItem<void*>(unsigned int, void*);
Expand Down
15 changes: 0 additions & 15 deletions lib/Runtime/Library/JavascriptArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,19 +1267,4 @@ namespace Js
template <>
inline uint32 JavascriptArray::ConvertToIndex<uint32, uint32>(uint32 idxDest, ScriptContext* scriptContext) { return idxDest; }

// This is for protecting a region of code, where we can't recover and be consistent upon failures (mainly due to OOM and SO).
// FailFast on that.
class AutoFailFastOnError
{
public:
AutoFailFastOnError() : m_operationCompleted(false) { }
~AutoFailFastOnError();

void Completed() { m_operationCompleted = true; }

private:
bool m_operationCompleted;
};


} // namespace Js