corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Bug 1377344 - Record the name of the currently running Runnable on thread hangs for BHR, r=njn, r=froydnj

Browse Source 
MozReview-Commit-ID: IYRHh6jiTeo
This commit is contained in:
Michael Layzell
2017-06-29 20:09:41 -04:00
parent 5a19a8c245
commit 28279ac02e
9 changed files with 104 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
xpcom/threads/ThreadStackHelper.cpp
View File

@@ -21,6 +21,7 @@
#include "mozilla/UniquePtr.h"
#include "mozilla/MemoryChecking.h"
#include "mozilla/Sprintf.h"
#include "nsThread.h"
#ifdef __GNUC__
# pragma GCC diagnostic push
@@ -91,26 +92,32 @@ public:
} // namespace
void
ThreadStackHelper::GetPseudoStack(Stack& aStack)
ThreadStackHelper::GetPseudoStack(Stack& aStack, nsACString& aRunnableName)
{
GetStacksInternal(&aStack, nullptr);
GetStacksInternal(&aStack, nullptr, aRunnableName);
}
void
ThreadStackHelper::GetNativeStack(NativeStack& aNativeStack)
ThreadStackHelper::GetNativeStack(NativeStack& aNativeStack, nsACString& aRunnableName)
{
GetStacksInternal(nullptr, &aNativeStack);
GetStacksInternal(nullptr, &aNativeStack, aRunnableName);
}
void
ThreadStackHelper::GetPseudoAndNativeStack(Stack& aStack, NativeStack& aNativeStack)
ThreadStackHelper::GetPseudoAndNativeStack(Stack& aStack,
NativeStack& aNativeStack,
nsACString& aRunnableName)
{
GetStacksInternal(&aStack, &aNativeStack);
GetStacksInternal(&aStack, &aNativeStack, aRunnableName);
}
void
ThreadStackHelper::GetStacksInternal(Stack* aStack, NativeStack* aNativeStack)
ThreadStackHelper::GetStacksInternal(Stack* aStack,
NativeStack* aNativeStack,
nsACString& aRunnableName)
{
aRunnableName.AssignLiteral("???");
#if defined(MOZ_THREADSTACKHELPER_PSEUDO) || defined(MOZ_THREADSTACKHELPER_NATIVE)
// Always run PrepareStackBuffer first to clear aStack
if (aStack && !PrepareStackBuffer(*aStack)) {
@@ -131,7 +138,22 @@ ThreadStackHelper::GetStacksInternal(Stack* aStack, NativeStack* aNativeStack)
ScopedSetPtr<NativeStack> nativeStackPtr(mNativeStackToFill, aNativeStack);
#endif
auto callback = [&, this] (void** aPCs, size_t aCount) {
char nameBuffer[1000] = {0};
auto callback = [&, this] (void** aPCs, size_t aCount, bool aIsMainThread) {
// NOTE: We cannot allocate any memory in this callback, as the target
// thread is suspended, so we first copy it into a stack-allocated buffer,
// and then once the target thread is resumed, we can copy it into a real
// nsCString.
//
// Currently we only store the names of runnables which are running on the
// main thread, so we only want to read sMainThreadRunnableName and copy its
// value in the case that we are currently suspending the main thread.
if (aIsMainThread && nsThread::sMainThreadRunnableName) {
strncpy(nameBuffer, nsThread::sMainThreadRunnableName, sizeof(nameBuffer));
// Make sure the string is null-terminated.
nameBuffer[sizeof(nameBuffer) - 1] = '\0';
}
#ifdef MOZ_THREADSTACKHELPER_PSEUDO
if (mStackToFill) {
FillStackBuffer();
@@ -153,6 +175,11 @@ ThreadStackHelper::GetStacksInternal(Stack* aStack, NativeStack* aNativeStack)
callback,
/* aSampleNative = */ !!aNativeStack);
}
// Copy the name buffer allocation into the output string.
if (nameBuffer[0] != 0) {
aRunnableName = nameBuffer;
}
#endif
}