Back out bug 581341 due to too many intermittent failures.

rnewman · Jun 30, 2011 · a963070 · a963070
1 parent 08d70d1
commit a963070
Show file tree

Hide file tree

Showing 32 changed files with 196 additions and 634 deletions.
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
@@ -260,9 +260,8 @@ ContentChild::Init(MessageLoop* aIOLoop,
     Open(aChannel, aParentHandle, aIOLoop);
     sSingleton = this;
 
-    CrashReporterChild::CreateCrashReporter(this);
 #if defined(ANDROID) && defined(MOZ_CRASHREPORTER)
-    PCrashReporterChild* crashreporter = ManagedPCrashReporterChild()[0];
+    PCrashReporterChild* crashreporter = SendPCrashReporterConstructor();
     InfallibleTArray<Mapping> mappings;
     const struct mapping_info *info = getLibraryMapping();
     while (info && info->name) {
@@ -364,14 +363,9 @@ ContentChild::DeallocPBrowser(PBrowserChild* iframe)
 }
 
 PCrashReporterChild*
-ContentChild::AllocPCrashReporter(const NativeThreadId& tid,
-                                  const PRUint32& processType)
+ContentChild::AllocPCrashReporter()
 {
-#ifdef MOZ_CRASHREPORTER
     return new CrashReporterChild();
-#else
-    return nsnull;
-#endif
 }
 
 bool

diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
@@ -80,11 +80,8 @@ class ContentChild : public PContentChild
     virtual PBrowserChild* AllocPBrowser(const PRUint32& aChromeFlags);
     virtual bool DeallocPBrowser(PBrowserChild*);
 
-    virtual PCrashReporterChild*
-    AllocPCrashReporter(const NativeThreadId& id,
-                        const PRUint32& processType);
-    virtual bool
-    DeallocPCrashReporter(PCrashReporterChild*);
+    virtual PCrashReporterChild* AllocPCrashReporter();
+    virtual bool DeallocPCrashReporter(PCrashReporterChild*);
 
     virtual PMemoryReportRequestChild*
     AllocPMemoryReportRequest();

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
@@ -290,13 +290,27 @@ ContentParent::ActorDestroy(ActorDestroyReason why)
             props->SetPropertyAsBool(NS_LITERAL_STRING("abnormal"), PR_TRUE);
 
 #ifdef MOZ_CRASHREPORTER
-            CrashReporterParent* crashReporter =
-                    static_cast<CrashReporterParent*>(ManagedPCrashReporterParent()[0]);
+            nsAutoString dumpID;
 
-            crashReporter->GenerateCrashReport(this, NULL);
+            nsCOMPtr<nsILocalFile> crashDump;
+            TakeMinidump(getter_AddRefs(crashDump)) &&
+                CrashReporter::GetIDFromMinidump(crashDump, dumpID);
 
-            nsAutoString dumpID(crashReporter->ChildDumpID());
             props->SetPropertyAsAString(NS_LITERAL_STRING("dumpID"), dumpID);
+
+            if (!dumpID.IsEmpty()) {
+                CrashReporter::AnnotationTable notes;
+                notes.Init();
+                notes.Put(NS_LITERAL_CSTRING("ProcessType"), NS_LITERAL_CSTRING("content"));
+
+                char startTime[32];
+                sprintf(startTime, "%lld", static_cast<PRInt64>(mProcessStartTime));
+                notes.Put(NS_LITERAL_CSTRING("StartupTime"),
+                          nsDependentCString(startTime));
+
+                // TODO: Additional per-process annotations.
+                CrashReporter::AppendExtraData(dumpID, notes);
+            }
 #endif
 
             obs->NotifyObservers((nsIPropertyBag2*) props, "ipc:content-shutdown", nsnull);
@@ -327,19 +341,12 @@ ContentParent::DestroyTestShell(TestShellParent* aTestShell)
     return PTestShellParent::Send__delete__(aTestShell);
 }
 
-TestShellParent*
-ContentParent::GetTestShellSingleton()
-{
-    if (!ManagedPTestShellParent().Length())
-        return nsnull;
-    return static_cast<TestShellParent*>(ManagedPTestShellParent()[0]);
-}
-
 ContentParent::ContentParent()
     : mGeolocationWatchID(-1)
     , mRunToCompletionDepth(0)
     , mShouldCallUnblockChild(false)
     , mIsAlive(true)
+    , mProcessStartTime(time(NULL))
 {
     NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
     mSubprocess = new GeckoChildProcessHost(GeckoProcessType_Content);
@@ -672,14 +679,9 @@ ContentParent::DeallocPBrowser(PBrowserParent* frame)
 }
 
 PCrashReporterParent*
-ContentParent::AllocPCrashReporter(const NativeThreadId& tid,
-                                   const PRUint32& processType)
+ContentParent::AllocPCrashReporter()
 {
-#ifdef MOZ_CRASHREPORTER
-  return new CrashReporterParent(tid, processType);
-#else
-  return nsnull;
-#endif
+  return new CrashReporterParent();
 }
 
 bool

diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
@@ -94,7 +94,6 @@ class ContentParent : public PContentParent
 
     TestShellParent* CreateTestShell();
     bool DestroyTestShell(TestShellParent* aTestShell);
-    TestShellParent* GetTestShellSingleton();
 
     void ReportChildAlreadyBlocked();
     bool RequestRunToCompletion();
@@ -103,10 +102,6 @@ class ContentParent : public PContentParent
 
     void SetChildMemoryReporters(const InfallibleTArray<MemoryReport>& report);
 
-    GeckoChildProcessHost* Process() {
-        return mSubprocess;
-    }
-
 protected:
     void OnChannelConnected(int32 pid);
     virtual void ActorDestroy(ActorDestroyReason why);
@@ -127,8 +122,7 @@ class ContentParent : public PContentParent
     virtual PBrowserParent* AllocPBrowser(const PRUint32& aChromeFlags);
     virtual bool DeallocPBrowser(PBrowserParent* frame);
 
-    virtual PCrashReporterParent* AllocPCrashReporter(const NativeThreadId& tid,
-                                                      const PRUint32& processType);
+    virtual PCrashReporterParent* AllocPCrashReporter();
     virtual bool DeallocPCrashReporter(PCrashReporterParent* crashreporter);
 
     virtual PMemoryReportRequestParent* AllocPMemoryReportRequest();
@@ -234,8 +228,7 @@ class ContentParent : public PContentParent
 
     bool mIsAlive;
     nsCOMPtr<nsIPrefServiceInternal> mPrefService;
-
-    friend class CrashReporterParent;
+    time_t mProcessStartTime;
 };
 
 } // namespace dom

diff --git a/dom/ipc/CrashReporterChild.cpp b/dom/ipc/CrashReporterChild.cpp
diff --git a/dom/ipc/CrashReporterChild.h b/dom/ipc/CrashReporterChild.h
@@ -37,11 +37,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "mozilla/dom/PCrashReporterChild.h"
-#include "mozilla/Util.h"
-#ifdef MOZ_CRASHREPORTER
-#include "nsExceptionHandler.h"
-#include "nsXULAppAPI.h"
-#endif
 
 namespace mozilla {
 namespace dom {
@@ -50,22 +45,10 @@ class CrashReporterChild :
 {
  public:
     CrashReporterChild() {
-        MOZ_COUNT_CTOR(CrashReporterChild);
+      MOZ_COUNT_CTOR(CrashReporterChild);
     }
-    ~CrashReporterChild() {
-        MOZ_COUNT_DTOR(CrashReporterChild);
-    }
-
-    static PCrashReporterChild* GetCrashReporter();
-
-    template<class Toplevel>
-    static void CreateCrashReporter(Toplevel* actor) {
-#ifdef MOZ_CRASHREPORTER
-        MOZ_ASSERT(actor->ManagedPCrashReporterChild().Length() == 0);
-        actor->SendPCrashReporterConstructor(
-                CrashReporter::CurrentThreadId(),
-                XRE_GetProcessType());
-#endif
+    virtual ~CrashReporterChild() {
+      MOZ_COUNT_DTOR(CrashReporterChild);
     }
 };
 } // namespace dom

diff --git a/dom/ipc/CrashReporterParent.cpp b/dom/ipc/CrashReporterParent.cpp
@@ -37,11 +37,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "CrashReporterParent.h"
+#if defined(MOZ_CRASHREPORTER)
+#include "nsExceptionHandler.h"
+#endif
 
 #include "base/process_util.h"
 
-#include <time.h>
-
 using namespace base;
 
 namespace mozilla {
@@ -72,91 +73,15 @@ CrashReporterParent::RecvAddLibraryMappings(const InfallibleTArray<Mapping>& map
   return true;
 }
 
-bool
-CrashReporterParent::RecvAnnotateCrashReport(const nsCString& key,
-                                             const nsCString& data)
-{
-#ifdef MOZ_CRASHREPORTER
-    mNotes.Put(key, data);
-#endif
-    return true;
-}
-
-bool
-CrashReporterParent::RecvAppendAppNotes(const nsCString& data)
-{
-    mAppNotes.Append(data);
-    return true;
-}
-
-CrashReporterParent::CrashReporterParent(const NativeThreadId& tid,
-                                         const PRUint32& processType)
-: mMainThread(tid)
-, mStartTime(time(NULL))
-, mProcessType(processType)
+CrashReporterParent::CrashReporterParent()
 {
     MOZ_COUNT_CTOR(CrashReporterParent);
-
-#ifdef MOZ_CRASHREPORTER
-    mNotes.Init(4);
-#endif
 }
 
 CrashReporterParent::~CrashReporterParent()
 {
     MOZ_COUNT_DTOR(CrashReporterParent);
 }
 
-#ifdef MOZ_CRASHREPORTER
-bool
-CrashReporterParent::GenerateHangCrashReport(const AnnotationTable* processNotes)
-{
-    if (mChildDumpID.IsEmpty())
-        return false;
-
-    GenerateChildData(processNotes);
-
-    CrashReporter::AnnotationTable notes;
-    if (!notes.Init(4))
-        return false;
-    notes.Put(nsDependentCString("HangID"), NS_ConvertUTF16toUTF8(mHangID));
-    if (!CrashReporter::AppendExtraData(mParentDumpID, notes))
-        NS_WARNING("problem appending parent data to .extra");
-    return true;
-}
-
-bool
-CrashReporterParent::GenerateChildData(const AnnotationTable* processNotes)
-{
-    nsCAutoString type;
-    switch (mProcessType) {
-        case GeckoProcessType_Content:
-            type = NS_LITERAL_CSTRING("content");
-            break;
-        case GeckoProcessType_Plugin:
-            type = NS_LITERAL_CSTRING("plugin");
-            break;
-        default:
-            NS_ERROR("unknown process type");
-            break;
-    }
-    mNotes.Put(NS_LITERAL_CSTRING("ProcessType"), type);
-
-    char startTime[32];
-    sprintf(startTime, "%lld", static_cast<PRInt64>(mStartTime));
-    mNotes.Put(NS_LITERAL_CSTRING("StartupTime"), nsDependentCString(startTime));
-
-    if (!mAppNotes.IsEmpty())
-        mNotes.Put(NS_LITERAL_CSTRING("Notes"), mAppNotes);
-
-    bool ret = CrashReporter::AppendExtraData(mChildDumpID, mNotes);
-    if (ret && processNotes)
-        ret = CrashReporter::AppendExtraData(mChildDumpID, *processNotes);
-    if (!ret)
-        NS_WARNING("problem appending child data to .extra");
-    return ret;
-}
-#endif
-
 } // namespace dom
 } // namespace mozilla