Skip to content

Commit

Permalink
Bug 1547698 - Remove unused IPC methods for taking minidumps r=froydnj
Browse files Browse the repository at this point in the history
This removes the XRE_TakeMinidumpForChild() which does not need to be
exposed anymore in the XUL API as well as
IToplevelProtocol::TakeMinidump() which was simply unused.

Differential Revision: https://phabricator.services.mozilla.com/D31062

--HG--
extra : moz-landing-system : lando
  • Loading branch information
gabrielesvelto committed May 14, 2019
1 parent d36b68f commit f7b311b
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 21 deletions.
4 changes: 2 additions & 2 deletions ipc/glue/CrashReporterHost.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ RefPtr<nsIFile> CrashReporterHost::TakeCrashedChildMinidump(
MOZ_ASSERT(!HasMinidump());

RefPtr<nsIFile> crashDump;
if (!XRE_TakeMinidumpForChild(aPid, getter_AddRefs(crashDump),
aOutSequence)) {
if (!CrashReporter::TakeMinidumpForChild(aPid, getter_AddRefs(crashDump),
aOutSequence)) {
return nullptr;
}
if (!AdoptMinidump(crashDump)) {
Expand Down
5 changes: 0 additions & 5 deletions ipc/glue/ProtocolUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -604,11 +604,6 @@ void IToplevelProtocol::SetOtherProcessId(base::ProcessId aOtherPid) {
}
}

bool IToplevelProtocol::TakeMinidump(nsIFile** aDump, uint32_t* aSequence) {
MOZ_RELEASE_ASSERT(GetSide() == ParentSide);
return XRE_TakeMinidumpForChild(OtherPid(), aDump, aSequence);
}

bool IToplevelProtocol::Open(mozilla::ipc::Transport* aTransport,
base::ProcessId aOtherPid, MessageLoop* aThread,
mozilla::ipc::Side aSide) {
Expand Down
2 changes: 0 additions & 2 deletions ipc/glue/ProtocolUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,6 @@ class IToplevelProtocol : public IProtocol {
base::ProcessId OtherPid() const final;
void SetOtherProcessId(base::ProcessId aOtherPid);

bool TakeMinidump(nsIFile** aDump, uint32_t* aSequence);

virtual void OnChannelClose() = 0;
virtual void OnChannelError() = 0;
virtual void ProcessingError(Result aError, const char* aMsgName) {}
Expand Down
8 changes: 0 additions & 8 deletions toolkit/xre/nsEmbedFunctions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -262,14 +262,6 @@ void XRE_SetProcessType(const char* aProcessTypeString) {
}
}

// FIXME/bug 539522: this out-of-place function is stuck here because
// IPDL wants access to this crashreporter interface, and
// crashreporter is built in such a way to make that awkward
bool XRE_TakeMinidumpForChild(uint32_t aChildPid, nsIFile** aDump,
uint32_t* aSequence) {
return CrashReporter::TakeMinidumpForChild(aChildPid, aDump, aSequence);
}

bool
#if defined(XP_WIN)
XRE_SetRemoteExceptionHandler(const char* aPipe /*= 0*/,
Expand Down
4 changes: 0 additions & 4 deletions xpcom/build/nsXULAppAPI.h
Original file line number Diff line number Diff line change
Expand Up @@ -401,10 +401,6 @@ XRE_API(void, XRE_SetAndroidChildFds,

XRE_API(void, XRE_SetProcessType, (const char* aProcessTypeString))

// Used in the "master" parent process hosting the crash server
XRE_API(bool, XRE_TakeMinidumpForChild,
(uint32_t aChildPid, nsIFile** aDump, uint32_t* aSequence))

// Used in child processes.
#if defined(XP_WIN)
// Uses uintptr_t, even though it's really a HANDLE, because including
Expand Down

0 comments on commit f7b311b

Please sign in to comment.