2017-07-20 21:31:56 +03:00
|
|
|
#include "HangDetails.h"
|
|
|
|
#include "nsIHangDetails.h"
|
|
|
|
#include "nsPrintfCString.h"
|
|
|
|
#include "mozilla/gfx/GPUParent.h"
|
|
|
|
#include "mozilla/dom/ContentChild.h"
|
|
|
|
#include "mozilla/Unused.h"
|
|
|
|
#include "mozilla/GfxMessageUtils.h" // For ParamTraits<GeckoProcessType>
|
|
|
|
|
|
|
|
namespace mozilla {
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
|
|
|
nsHangDetails::GetDuration(uint32_t* aDuration)
|
|
|
|
{
|
|
|
|
*aDuration = mDetails.mDuration;
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
|
|
|
nsHangDetails::GetThread(nsACString& aName)
|
|
|
|
{
|
|
|
|
aName.Assign(mDetails.mThreadName);
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
|
|
|
nsHangDetails::GetRunnableName(nsACString& aRunnableName)
|
|
|
|
{
|
|
|
|
aRunnableName.Assign(mDetails.mRunnableName);
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
|
|
|
nsHangDetails::GetProcess(nsACString& aName)
|
|
|
|
{
|
|
|
|
aName.AssignASCII(XRE_ChildProcessTypeToString(mDetails.mProcess));
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
|
|
|
nsHangDetails::GetAnnotations(JSContext* aCx, JS::MutableHandleValue aVal)
|
|
|
|
{
|
|
|
|
// We create an object with { "key" : "value" } string pairs for each item in
|
|
|
|
// our annotations object.
|
|
|
|
JS::RootedObject jsAnnotation(aCx, JS_NewPlainObject(aCx));
|
|
|
|
if (!jsAnnotation) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
2017-07-21 23:57:48 +03:00
|
|
|
for (auto& annot : mDetails.mAnnotations) {
|
|
|
|
JSString* jsString = JS_NewUCStringCopyN(aCx, annot.mValue.get(), annot.mValue.Length());
|
|
|
|
if (!jsString) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
JS::RootedValue jsValue(aCx);
|
|
|
|
jsValue.setString(jsString);
|
|
|
|
if (!JS_DefineUCProperty(aCx, jsAnnotation, annot.mName.get(), annot.mName.Length(),
|
|
|
|
jsValue, JSPROP_ENUMERATE)) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
2017-07-20 21:31:56 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
aVal.setObject(*jsAnnotation);
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
Bug 1367406 - Part 1: Add interleaved stack functionality to HangStack, r=froydnj
- This patch was written in 3 interdependent parts, which are described below -
Part 1A: Allow HangStack to contain raw PCs and Module offsets, r=froydnj
The HangStack previously consisted of an array of const char* pointers into its
backing string buffer, which represented pseudostack entries. With interleaved
stacks, it is now possible for the stack to contain raw unresolved program
counters (Kind::PC), and module/offset pairs (Kind::MODOFFSET). To do this, we
use a discriminated union, and make the backing array use the discriminated
union instead of const char*s.
The code cannot use mozilla::Variant<const char*, uintptr_t, Module>
unfortuantely, as we cannot use the implementation of ParamTraits for Variant in
HangStack's ParamTraits implementation.
When deserializing a HangStack over IPC, we need to read the string frame
entries into the backing string buffer, and generate const char* entries for
each of the strings which we read in over IPC. The default implementation of
ParamTraits wouldn't give us access to the enclusing HangStack object while
deserializing each individual entry, so we couldn't use it. In fact, Entries
don't have ParamTraits implemented for them at all, and can only be sent over
IPC as part of a HangStack due to this dependency.
Part 1B: Remove nsIHangDetails.pseudoStack, replace ProcessedStack w/ new HangStack type, r=froydnj
Previously there were two stack objects on each HangDetails object: mStack and
mPseudoStack. mStack was a Telemetry::ProcessedStack, while mPseudoStack was a
HangStack. After the changes in part 1A, HangStack can now contain all of the
information of both the old HangStack and ProcessedStack, so the mPseudoStack
field is renamed to mStack, and the old mStack field is removed.
This patch also implements the new GetStack getter, which generates the JS data
format for the new HangStack type.
Part 1C: Collect interleaved stacks w/ ProfilerStackCollector API in ThreadStackHelper, r=froydnj
This new API was added by njn in bug 1380286, and provides both pseudostack and
native stack entries to the consumer of the API.
This patch changes ThreadStackHelper to use this new API instead of the previous
one, and use it to collect the frames directly into HangStack objects.
2017-08-10 23:40:59 +03:00
|
|
|
nsHangDetails::GetStack(JSContext* aCx, JS::MutableHandle<JS::Value> aVal)
|
2017-07-20 21:31:56 +03:00
|
|
|
{
|
Bug 1367406 - Part 1: Add interleaved stack functionality to HangStack, r=froydnj
- This patch was written in 3 interdependent parts, which are described below -
Part 1A: Allow HangStack to contain raw PCs and Module offsets, r=froydnj
The HangStack previously consisted of an array of const char* pointers into its
backing string buffer, which represented pseudostack entries. With interleaved
stacks, it is now possible for the stack to contain raw unresolved program
counters (Kind::PC), and module/offset pairs (Kind::MODOFFSET). To do this, we
use a discriminated union, and make the backing array use the discriminated
union instead of const char*s.
The code cannot use mozilla::Variant<const char*, uintptr_t, Module>
unfortuantely, as we cannot use the implementation of ParamTraits for Variant in
HangStack's ParamTraits implementation.
When deserializing a HangStack over IPC, we need to read the string frame
entries into the backing string buffer, and generate const char* entries for
each of the strings which we read in over IPC. The default implementation of
ParamTraits wouldn't give us access to the enclusing HangStack object while
deserializing each individual entry, so we couldn't use it. In fact, Entries
don't have ParamTraits implemented for them at all, and can only be sent over
IPC as part of a HangStack due to this dependency.
Part 1B: Remove nsIHangDetails.pseudoStack, replace ProcessedStack w/ new HangStack type, r=froydnj
Previously there were two stack objects on each HangDetails object: mStack and
mPseudoStack. mStack was a Telemetry::ProcessedStack, while mPseudoStack was a
HangStack. After the changes in part 1A, HangStack can now contain all of the
information of both the old HangStack and ProcessedStack, so the mPseudoStack
field is renamed to mStack, and the old mStack field is removed.
This patch also implements the new GetStack getter, which generates the JS data
format for the new HangStack type.
Part 1C: Collect interleaved stacks w/ ProfilerStackCollector API in ThreadStackHelper, r=froydnj
This new API was added by njn in bug 1380286, and provides both pseudostack and
native stack entries to the consumer of the API.
This patch changes ThreadStackHelper to use this new API instead of the previous
one, and use it to collect the frames directly into HangStack objects.
2017-08-10 23:40:59 +03:00
|
|
|
JS::RootedObject ret(aCx, JS_NewArrayObject(aCx, mDetails.mStack.length()));
|
2017-07-20 21:31:56 +03:00
|
|
|
if (!ret) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
Bug 1367406 - Part 1: Add interleaved stack functionality to HangStack, r=froydnj
- This patch was written in 3 interdependent parts, which are described below -
Part 1A: Allow HangStack to contain raw PCs and Module offsets, r=froydnj
The HangStack previously consisted of an array of const char* pointers into its
backing string buffer, which represented pseudostack entries. With interleaved
stacks, it is now possible for the stack to contain raw unresolved program
counters (Kind::PC), and module/offset pairs (Kind::MODOFFSET). To do this, we
use a discriminated union, and make the backing array use the discriminated
union instead of const char*s.
The code cannot use mozilla::Variant<const char*, uintptr_t, Module>
unfortuantely, as we cannot use the implementation of ParamTraits for Variant in
HangStack's ParamTraits implementation.
When deserializing a HangStack over IPC, we need to read the string frame
entries into the backing string buffer, and generate const char* entries for
each of the strings which we read in over IPC. The default implementation of
ParamTraits wouldn't give us access to the enclusing HangStack object while
deserializing each individual entry, so we couldn't use it. In fact, Entries
don't have ParamTraits implemented for them at all, and can only be sent over
IPC as part of a HangStack due to this dependency.
Part 1B: Remove nsIHangDetails.pseudoStack, replace ProcessedStack w/ new HangStack type, r=froydnj
Previously there were two stack objects on each HangDetails object: mStack and
mPseudoStack. mStack was a Telemetry::ProcessedStack, while mPseudoStack was a
HangStack. After the changes in part 1A, HangStack can now contain all of the
information of both the old HangStack and ProcessedStack, so the mPseudoStack
field is renamed to mStack, and the old mStack field is removed.
This patch also implements the new GetStack getter, which generates the JS data
format for the new HangStack type.
Part 1C: Collect interleaved stacks w/ ProfilerStackCollector API in ThreadStackHelper, r=froydnj
This new API was added by njn in bug 1380286, and provides both pseudostack and
native stack entries to the consumer of the API.
This patch changes ThreadStackHelper to use this new API instead of the previous
one, and use it to collect the frames directly into HangStack objects.
2017-08-10 23:40:59 +03:00
|
|
|
for (size_t i = 0; i < mDetails.mStack.length(); ++i) {
|
|
|
|
const HangStack::Frame& frame = mDetails.mStack[i];
|
|
|
|
switch (frame.GetKind()) {
|
|
|
|
case HangStack::Frame::Kind::STRING: {
|
|
|
|
JSString* jsString = JS_NewStringCopyZ(aCx, frame.AsString());
|
|
|
|
if (!jsString) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
JS::RootedString string(aCx, jsString);
|
|
|
|
if (!string) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
if (!JS_DefineElement(aCx, ret, i, string, JSPROP_ENUMERATE)) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case HangStack::Frame::Kind::MODOFFSET: {
|
|
|
|
JS::RootedObject jsFrame(aCx, JS_NewArrayObject(aCx, 2));
|
|
|
|
if (!jsFrame) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!JS_DefineElement(aCx, jsFrame, 0, frame.AsModOffset().mModule, JSPROP_ENUMERATE)) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
|
|
|
nsPrintfCString hexString("%" PRIxPTR, (uintptr_t)frame.AsModOffset().mOffset);
|
|
|
|
JS::RootedString hex(aCx, JS_NewStringCopyZ(aCx, hexString.get()));
|
|
|
|
if (!hex || !JS_DefineElement(aCx, jsFrame, 1, hex, JSPROP_ENUMERATE)) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!JS_DefineElement(aCx, ret, i, jsFrame, JSPROP_ENUMERATE)) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case HangStack::Frame::Kind::PC: {
|
|
|
|
JS::RootedObject jsFrame(aCx, JS_NewArrayObject(aCx, 2));
|
|
|
|
if (!jsFrame) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!JS_DefineElement(aCx, jsFrame, 0, -1, JSPROP_ENUMERATE)) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
|
|
|
nsPrintfCString hexString("%" PRIxPTR, frame.AsPC());
|
|
|
|
JS::RootedString hex(aCx, JS_NewStringCopyZ(aCx, hexString.get()));
|
|
|
|
if (!hex || !JS_DefineElement(aCx, jsFrame, 1, hex, JSPROP_ENUMERATE)) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!JS_DefineElement(aCx, ret, i, jsFrame, JSPROP_ENUMERATE)) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
MOZ_ASSERT_UNREACHABLE("Invalid variant");
|
|
|
|
break;
|
2017-07-20 21:31:56 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
aVal.setObject(*ret);
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
Bug 1367406 - Part 1: Add interleaved stack functionality to HangStack, r=froydnj
- This patch was written in 3 interdependent parts, which are described below -
Part 1A: Allow HangStack to contain raw PCs and Module offsets, r=froydnj
The HangStack previously consisted of an array of const char* pointers into its
backing string buffer, which represented pseudostack entries. With interleaved
stacks, it is now possible for the stack to contain raw unresolved program
counters (Kind::PC), and module/offset pairs (Kind::MODOFFSET). To do this, we
use a discriminated union, and make the backing array use the discriminated
union instead of const char*s.
The code cannot use mozilla::Variant<const char*, uintptr_t, Module>
unfortuantely, as we cannot use the implementation of ParamTraits for Variant in
HangStack's ParamTraits implementation.
When deserializing a HangStack over IPC, we need to read the string frame
entries into the backing string buffer, and generate const char* entries for
each of the strings which we read in over IPC. The default implementation of
ParamTraits wouldn't give us access to the enclusing HangStack object while
deserializing each individual entry, so we couldn't use it. In fact, Entries
don't have ParamTraits implemented for them at all, and can only be sent over
IPC as part of a HangStack due to this dependency.
Part 1B: Remove nsIHangDetails.pseudoStack, replace ProcessedStack w/ new HangStack type, r=froydnj
Previously there were two stack objects on each HangDetails object: mStack and
mPseudoStack. mStack was a Telemetry::ProcessedStack, while mPseudoStack was a
HangStack. After the changes in part 1A, HangStack can now contain all of the
information of both the old HangStack and ProcessedStack, so the mPseudoStack
field is renamed to mStack, and the old mStack field is removed.
This patch also implements the new GetStack getter, which generates the JS data
format for the new HangStack type.
Part 1C: Collect interleaved stacks w/ ProfilerStackCollector API in ThreadStackHelper, r=froydnj
This new API was added by njn in bug 1380286, and provides both pseudostack and
native stack entries to the consumer of the API.
This patch changes ThreadStackHelper to use this new API instead of the previous
one, and use it to collect the frames directly into HangStack objects.
2017-08-10 23:40:59 +03:00
|
|
|
NS_IMETHODIMP
|
|
|
|
nsHangDetails::GetModules(JSContext* aCx, JS::MutableHandleValue aVal)
|
|
|
|
{
|
2017-08-04 22:10:17 +03:00
|
|
|
auto& modules = mDetails.mStack.GetModules();
|
|
|
|
size_t length = modules.Length();
|
Bug 1367406 - Part 1: Add interleaved stack functionality to HangStack, r=froydnj
- This patch was written in 3 interdependent parts, which are described below -
Part 1A: Allow HangStack to contain raw PCs and Module offsets, r=froydnj
The HangStack previously consisted of an array of const char* pointers into its
backing string buffer, which represented pseudostack entries. With interleaved
stacks, it is now possible for the stack to contain raw unresolved program
counters (Kind::PC), and module/offset pairs (Kind::MODOFFSET). To do this, we
use a discriminated union, and make the backing array use the discriminated
union instead of const char*s.
The code cannot use mozilla::Variant<const char*, uintptr_t, Module>
unfortuantely, as we cannot use the implementation of ParamTraits for Variant in
HangStack's ParamTraits implementation.
When deserializing a HangStack over IPC, we need to read the string frame
entries into the backing string buffer, and generate const char* entries for
each of the strings which we read in over IPC. The default implementation of
ParamTraits wouldn't give us access to the enclusing HangStack object while
deserializing each individual entry, so we couldn't use it. In fact, Entries
don't have ParamTraits implemented for them at all, and can only be sent over
IPC as part of a HangStack due to this dependency.
Part 1B: Remove nsIHangDetails.pseudoStack, replace ProcessedStack w/ new HangStack type, r=froydnj
Previously there were two stack objects on each HangDetails object: mStack and
mPseudoStack. mStack was a Telemetry::ProcessedStack, while mPseudoStack was a
HangStack. After the changes in part 1A, HangStack can now contain all of the
information of both the old HangStack and ProcessedStack, so the mPseudoStack
field is renamed to mStack, and the old mStack field is removed.
This patch also implements the new GetStack getter, which generates the JS data
format for the new HangStack type.
Part 1C: Collect interleaved stacks w/ ProfilerStackCollector API in ThreadStackHelper, r=froydnj
This new API was added by njn in bug 1380286, and provides both pseudostack and
native stack entries to the consumer of the API.
This patch changes ThreadStackHelper to use this new API instead of the previous
one, and use it to collect the frames directly into HangStack objects.
2017-08-10 23:40:59 +03:00
|
|
|
JS::RootedObject retObj(aCx, JS_NewArrayObject(aCx, length));
|
|
|
|
if (!retObj) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
2017-08-04 22:10:17 +03:00
|
|
|
for (size_t i = 0; i < length; ++i) {
|
|
|
|
const HangStack::Module& module = modules[i];
|
|
|
|
JS::RootedObject jsModule(aCx, JS_NewArrayObject(aCx, 2));
|
|
|
|
if (!jsModule) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
|
|
|
JS::RootedString name(aCx, JS_NewUCStringCopyN(aCx, module.mName.BeginReading(), module.mName.Length()));
|
|
|
|
if (!JS_DefineElement(aCx, jsModule, 0, name, JSPROP_ENUMERATE)) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
|
|
|
JS::RootedString breakpadId(aCx, JS_NewStringCopyN(aCx, module.mBreakpadId.BeginReading(), module.mBreakpadId.Length()));
|
|
|
|
if (!JS_DefineElement(aCx, jsModule, 1, breakpadId, JSPROP_ENUMERATE)) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!JS_DefineElement(aCx, retObj, i, jsModule, JSPROP_ENUMERATE)) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Bug 1367406 - Part 1: Add interleaved stack functionality to HangStack, r=froydnj
- This patch was written in 3 interdependent parts, which are described below -
Part 1A: Allow HangStack to contain raw PCs and Module offsets, r=froydnj
The HangStack previously consisted of an array of const char* pointers into its
backing string buffer, which represented pseudostack entries. With interleaved
stacks, it is now possible for the stack to contain raw unresolved program
counters (Kind::PC), and module/offset pairs (Kind::MODOFFSET). To do this, we
use a discriminated union, and make the backing array use the discriminated
union instead of const char*s.
The code cannot use mozilla::Variant<const char*, uintptr_t, Module>
unfortuantely, as we cannot use the implementation of ParamTraits for Variant in
HangStack's ParamTraits implementation.
When deserializing a HangStack over IPC, we need to read the string frame
entries into the backing string buffer, and generate const char* entries for
each of the strings which we read in over IPC. The default implementation of
ParamTraits wouldn't give us access to the enclusing HangStack object while
deserializing each individual entry, so we couldn't use it. In fact, Entries
don't have ParamTraits implemented for them at all, and can only be sent over
IPC as part of a HangStack due to this dependency.
Part 1B: Remove nsIHangDetails.pseudoStack, replace ProcessedStack w/ new HangStack type, r=froydnj
Previously there were two stack objects on each HangDetails object: mStack and
mPseudoStack. mStack was a Telemetry::ProcessedStack, while mPseudoStack was a
HangStack. After the changes in part 1A, HangStack can now contain all of the
information of both the old HangStack and ProcessedStack, so the mPseudoStack
field is renamed to mStack, and the old mStack field is removed.
This patch also implements the new GetStack getter, which generates the JS data
format for the new HangStack type.
Part 1C: Collect interleaved stacks w/ ProfilerStackCollector API in ThreadStackHelper, r=froydnj
This new API was added by njn in bug 1380286, and provides both pseudostack and
native stack entries to the consumer of the API.
This patch changes ThreadStackHelper to use this new API instead of the previous
one, and use it to collect the frames directly into HangStack objects.
2017-08-10 23:40:59 +03:00
|
|
|
aVal.setObject(*retObj);
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
2017-07-20 21:31:56 +03:00
|
|
|
// Processing and submitting the stack as an observer notification.
|
|
|
|
|
|
|
|
void
|
|
|
|
nsHangDetails::Submit()
|
|
|
|
{
|
|
|
|
if (NS_WARN_IF(!SystemGroup::Initialized())) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
RefPtr<nsHangDetails> hangDetails = this;
|
|
|
|
nsCOMPtr<nsIRunnable> notifyObservers = NS_NewRunnableFunction("NotifyBHRHangObservers", [hangDetails] {
|
2017-08-10 21:32:08 +03:00
|
|
|
// The place we need to report the hang to varies depending on process.
|
|
|
|
//
|
|
|
|
// In child processes, we report the hang to our parent process, while if
|
|
|
|
// we're in the parent process, we report a bhr-thread-hang observer
|
|
|
|
// notification.
|
2017-07-20 19:49:28 +03:00
|
|
|
switch (XRE_GetProcessType()) {
|
|
|
|
case GeckoProcessType_Content: {
|
|
|
|
auto cc = dom::ContentChild::GetSingleton();
|
|
|
|
if (cc) {
|
|
|
|
Unused << cc->SendBHRThreadHang(hangDetails->mDetails);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case GeckoProcessType_GPU: {
|
|
|
|
auto gp = gfx::GPUParent::GetSingleton();
|
|
|
|
if (gp) {
|
|
|
|
Unused << gp->SendBHRThreadHang(hangDetails->mDetails);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2017-08-10 21:32:08 +03:00
|
|
|
case GeckoProcessType_Default: {
|
|
|
|
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
|
|
|
|
if (os) {
|
|
|
|
os->NotifyObservers(hangDetails, "bhr-thread-hang", nullptr);
|
|
|
|
}
|
2017-07-20 19:49:28 +03:00
|
|
|
break;
|
2017-08-10 21:32:08 +03:00
|
|
|
}
|
2017-07-20 19:49:28 +03:00
|
|
|
default:
|
|
|
|
// XXX: Consider handling GeckoProcessType_GMPlugin and
|
|
|
|
// GeckoProcessType_Plugin?
|
|
|
|
NS_WARNING("Unsupported BHR process type - discarding hang.");
|
|
|
|
break;
|
|
|
|
}
|
2017-07-20 21:31:56 +03:00
|
|
|
});
|
|
|
|
|
|
|
|
nsresult rv = SystemGroup::Dispatch(TaskCategory::Other,
|
|
|
|
notifyObservers.forget());
|
|
|
|
MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv));
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMPL_ISUPPORTS(nsHangDetails, nsIHangDetails)
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
|
|
|
ProcessHangStackRunnable::Run()
|
|
|
|
{
|
2017-08-04 18:21:05 +03:00
|
|
|
// NOTE: Reading module information can take a long time, which is why we do
|
|
|
|
// it off-main-thread.
|
|
|
|
mHangDetails.mStack.ReadModuleInformation();
|
|
|
|
|
2017-07-20 21:31:56 +03:00
|
|
|
RefPtr<nsHangDetails> hangDetails = new nsHangDetails(Move(mHangDetails));
|
|
|
|
hangDetails->Submit();
|
|
|
|
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace mozilla
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* IPC Serialization / Deserialization logic
|
|
|
|
*/
|
|
|
|
namespace IPC {
|
|
|
|
|
|
|
|
void
|
|
|
|
ParamTraits<mozilla::HangDetails>::Write(Message* aMsg, const mozilla::HangDetails& aParam)
|
|
|
|
{
|
|
|
|
WriteParam(aMsg, aParam.mDuration);
|
|
|
|
WriteParam(aMsg, aParam.mProcess);
|
|
|
|
WriteParam(aMsg, aParam.mThreadName);
|
|
|
|
WriteParam(aMsg, aParam.mRunnableName);
|
Bug 1367406 - Part 1: Add interleaved stack functionality to HangStack, r=froydnj
- This patch was written in 3 interdependent parts, which are described below -
Part 1A: Allow HangStack to contain raw PCs and Module offsets, r=froydnj
The HangStack previously consisted of an array of const char* pointers into its
backing string buffer, which represented pseudostack entries. With interleaved
stacks, it is now possible for the stack to contain raw unresolved program
counters (Kind::PC), and module/offset pairs (Kind::MODOFFSET). To do this, we
use a discriminated union, and make the backing array use the discriminated
union instead of const char*s.
The code cannot use mozilla::Variant<const char*, uintptr_t, Module>
unfortuantely, as we cannot use the implementation of ParamTraits for Variant in
HangStack's ParamTraits implementation.
When deserializing a HangStack over IPC, we need to read the string frame
entries into the backing string buffer, and generate const char* entries for
each of the strings which we read in over IPC. The default implementation of
ParamTraits wouldn't give us access to the enclusing HangStack object while
deserializing each individual entry, so we couldn't use it. In fact, Entries
don't have ParamTraits implemented for them at all, and can only be sent over
IPC as part of a HangStack due to this dependency.
Part 1B: Remove nsIHangDetails.pseudoStack, replace ProcessedStack w/ new HangStack type, r=froydnj
Previously there were two stack objects on each HangDetails object: mStack and
mPseudoStack. mStack was a Telemetry::ProcessedStack, while mPseudoStack was a
HangStack. After the changes in part 1A, HangStack can now contain all of the
information of both the old HangStack and ProcessedStack, so the mPseudoStack
field is renamed to mStack, and the old mStack field is removed.
This patch also implements the new GetStack getter, which generates the JS data
format for the new HangStack type.
Part 1C: Collect interleaved stacks w/ ProfilerStackCollector API in ThreadStackHelper, r=froydnj
This new API was added by njn in bug 1380286, and provides both pseudostack and
native stack entries to the consumer of the API.
This patch changes ThreadStackHelper to use this new API instead of the previous
one, and use it to collect the frames directly into HangStack objects.
2017-08-10 23:40:59 +03:00
|
|
|
WriteParam(aMsg, aParam.mStack);
|
2017-07-21 23:57:48 +03:00
|
|
|
WriteParam(aMsg, aParam.mAnnotations);
|
2017-07-20 21:31:56 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
ParamTraits<mozilla::HangDetails>::Read(const Message* aMsg,
|
|
|
|
PickleIterator* aIter,
|
|
|
|
mozilla::HangDetails* aResult)
|
|
|
|
{
|
|
|
|
if (!ReadParam(aMsg, aIter, &aResult->mDuration)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (!ReadParam(aMsg, aIter, &aResult->mProcess)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (!ReadParam(aMsg, aIter, &aResult->mThreadName)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (!ReadParam(aMsg, aIter, &aResult->mRunnableName)) {
|
|
|
|
return false;
|
|
|
|
}
|
Bug 1367406 - Part 1: Add interleaved stack functionality to HangStack, r=froydnj
- This patch was written in 3 interdependent parts, which are described below -
Part 1A: Allow HangStack to contain raw PCs and Module offsets, r=froydnj
The HangStack previously consisted of an array of const char* pointers into its
backing string buffer, which represented pseudostack entries. With interleaved
stacks, it is now possible for the stack to contain raw unresolved program
counters (Kind::PC), and module/offset pairs (Kind::MODOFFSET). To do this, we
use a discriminated union, and make the backing array use the discriminated
union instead of const char*s.
The code cannot use mozilla::Variant<const char*, uintptr_t, Module>
unfortuantely, as we cannot use the implementation of ParamTraits for Variant in
HangStack's ParamTraits implementation.
When deserializing a HangStack over IPC, we need to read the string frame
entries into the backing string buffer, and generate const char* entries for
each of the strings which we read in over IPC. The default implementation of
ParamTraits wouldn't give us access to the enclusing HangStack object while
deserializing each individual entry, so we couldn't use it. In fact, Entries
don't have ParamTraits implemented for them at all, and can only be sent over
IPC as part of a HangStack due to this dependency.
Part 1B: Remove nsIHangDetails.pseudoStack, replace ProcessedStack w/ new HangStack type, r=froydnj
Previously there were two stack objects on each HangDetails object: mStack and
mPseudoStack. mStack was a Telemetry::ProcessedStack, while mPseudoStack was a
HangStack. After the changes in part 1A, HangStack can now contain all of the
information of both the old HangStack and ProcessedStack, so the mPseudoStack
field is renamed to mStack, and the old mStack field is removed.
This patch also implements the new GetStack getter, which generates the JS data
format for the new HangStack type.
Part 1C: Collect interleaved stacks w/ ProfilerStackCollector API in ThreadStackHelper, r=froydnj
This new API was added by njn in bug 1380286, and provides both pseudostack and
native stack entries to the consumer of the API.
This patch changes ThreadStackHelper to use this new API instead of the previous
one, and use it to collect the frames directly into HangStack objects.
2017-08-10 23:40:59 +03:00
|
|
|
if (!ReadParam(aMsg, aIter, &aResult->mStack)) {
|
2017-07-20 21:31:56 +03:00
|
|
|
return false;
|
|
|
|
}
|
2017-07-21 23:57:48 +03:00
|
|
|
if (!ReadParam(aMsg, aIter, &aResult->mAnnotations)) {
|
|
|
|
return false;
|
2017-07-20 21:31:56 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace IPC
|