Commits

Andrew Sutherland committed 23ccf48

de-bitrot conflicts

  • Participants
  • Parent commits 722dd8b

Comments (0)

Files changed (3)

add-jsprobes-core-definitions

 # HG changeset patch
-# Parent 63c6a32bd458746a753183b038f06a16c26e9c61
+# Parent 330bde524b7f3a97104568467a339b40f07608c2
 Add the jsprobes.tbl data, as well as core structs in jsprobedefs.h such as ProbeType, ProbeValue, and other useful data.
 
 diff --git a/js/src/Makefile.in b/js/src/Makefile.in
 --- a/js/src/Makefile.in
 +++ b/js/src/Makefile.in
-@@ -130,16 +130,17 @@ CPPSRCS		= \
- 		jsnativestack.cpp \
- 		jsnum.cpp \
- 		jsobj.cpp \
- 		json.cpp \
- 		jsonparser.cpp \
+@@ -134,6 +134,7 @@
  		jsopcode.cpp \
  		jsproxy.cpp \
  		jsprf.cpp \
  		jsprobes.cpp \
  		jspropertycache.cpp \
  		jspropertytree.cpp \
- 		jsreflect.cpp \
- 		jsscope.cpp \
- 		jsscript.cpp \
- 		jsstr.cpp \
- 		jstypedarray.cpp \
-@@ -194,16 +195,18 @@ INSTALLED_HEADERS = \
- 		jsgc.h \
- 		jscell.h \
- 		jsgcstats.h \
- 		jshash.h \
- 		jslock.h \
+@@ -199,6 +200,8 @@
  		json.h \
  		jsproxy.h \
  		jsprf.h \
  		jsproto.tbl \
  		jsprvtd.h \
  		jspubtd.h \
- 		jstypedarray.h \
- 		jstypes.h \
- 		jsutil.h \
- 		jsversion.h \
- 		jswrapper.h \
 diff --git a/js/src/jsprobedefs.cpp b/js/src/jsprobedefs.cpp
 new file mode 100644
 --- /dev/null

jsprobes-dispatch-integration

 # HG changeset patch
-# Parent d4ef1c7150681cf048b3f3edc7c2ce8a5c8d8d56
+# Parent 04e45a2565c931e0251cee71f3299d05477116a0
 integrate ProbeManager with jsprobes.h and the js shell (js.cpp)
 
 diff --git a/js/src/gc/Statistics.cpp b/js/src/gc/Statistics.cpp
 --- a/js/src/gc/Statistics.cpp
 +++ b/js/src/gc/Statistics.cpp
-@@ -206,7 +206,7 @@
-     triggerReason = reason;
+@@ -250,13 +250,13 @@
+     slices.clearAndFree();
+     wasReset = false;
  
-     beginPhase(PHASE_GC);
 -    Probes::GCStart();
-+    Probes::GCStart(runtime, comp);
++    Probes::GCStart(runtime, compartment);
+ }
  
-     GCCrashData crashData;
-     crashData.isCompartment = !!compartment;
-@@ -283,7 +283,7 @@
  void
  Statistics::endGC()
  {
 -    Probes::GCEnd();
 +    Probes::GCEnd(runtime, compartment);
-     endPhase(PHASE_GC);
      crash::SnapshotGCStack();
  
+     for (int i = 0; i < PHASE_LIMIT; i++)
 diff --git a/js/src/jsprobes.cpp b/js/src/jsprobes.cpp
 --- a/js/src/jsprobes.cpp
 +++ b/js/src/jsprobes.cpp

provide-all-compartment-ptrs

 # HG changeset patch
-# Parent dab5ad4034f71d0c71a7f5136616f8016a613f35
+# Parent 8f1b95652662b6225895149203a10e6b238c9c07
 
 diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
 --- a/js/xpconnect/src/XPCJSRuntime.cpp
 +++ b/js/xpconnect/src/XPCJSRuntime.cpp
-@@ -1249,12 +1249,12 @@
+@@ -1232,13 +1232,13 @@
                      name->AppendLiteral(", ");
                      name->Append(compartmentPrivate->location);
                  }
 +            }
  
--                // ample; 64-bit address max is 18 chars
--                static const int maxLength = 31;
--                nsPrintfCString address(maxLength, ", 0x%llx", PRUint64(c));
--                name->Append(address);
--            }
-+            // ample; 64-bit address max is 18 chars
-+            static const int maxLength = 31;
-+            nsPrintfCString address(maxLength, ", 0x%llx", PRUint64(c));
-+            name->Append(address);
+-                if (getAddress) {
+-                    // ample; 64-bit address max is 18 chars
+-                    static const int maxLength = 31;
+-                    nsPrintfCString address(maxLength, ", 0x%llx", PRUint64(c));
+-                    name->Append(address);
+-                }
++            if (getAddress) {
++                // ample; 64-bit address max is 18 chars
++                static const int maxLength = 31;
++                nsPrintfCString address(maxLength, ", 0x%llx", PRUint64(c));
++                name->Append(address);
+             }
  
              // A hack: replace forward slashes with '\\' so they aren't
-             // treated as path separators.  Users of the reporters