Commits

Andrew Sutherland committed 322ee97

gcLastBytes folded with glitches fixed

Comments (0)

Files changed (4)

add-jsprobes-core-definitions

 # HG changeset patch
-# Parent 330bde524b7f3a97104568467a339b40f07608c2
+# Parent 799e0e4a64d5fdf9cbee91a8dba41b8ae9c8d016
 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
  		jsprobes.cpp \
  		jspropertycache.cpp \
  		jspropertytree.cpp \
-@@ -199,6 +200,8 @@
+@@ -200,6 +201,8 @@
  		json.h \
  		jsproxy.h \
  		jsprf.h \
 new file mode 100644
 --- /dev/null
 +++ b/js/src/jsprobedefs.cpp
-@@ -0,0 +1,267 @@
+@@ -0,0 +1,255 @@
 +/* -*- Mode: c++; c-basic-offset: 4; tab-width: 40; indent-tabs-mode: nil -*- */
 +/* vim: set ts=40 sw=4 et tw=99: */
 +/* ***** BEGIN LICENSE BLOCK *****
 +}
 +
 +bool
-+compartment_gcLastBytes(JSRuntime *rt, ProbeValue *arg)
-+{
-+    JS_ASSERT(arg);
-+    JS_ASSERT(arg->ty == ProbeType_JSCompartmentPtr);
-+    JS_ASSERT(arg->data.as_JSCompartmentPtr);
-+    PROBE_VALUE_SET(arg, size_t, arg->data.as_JSCompartmentPtr->gcLastBytes);
-+    return true;
-+}
-+
-+
-+bool
 +compartment_id(JSRuntime *rt, ProbeValue *arg)
 +{
 +    JS_ASSERT(arg);
 +    return true;
 +}
 +
-+
 +bool
 +env_currentTimeMS(JSRuntime *rt, ProbeValue *arg)
 +{
 new file mode 100644
 --- /dev/null
 +++ b/js/src/jsprobedefs.h
-@@ -0,0 +1,169 @@
+@@ -0,0 +1,168 @@
 +/* -*- Mode: c++; c-basic-offset: 4; tab-width: 40; indent-tabs-mode: nil -*- */
 +/* vim: set ts=40 sw=4 et tw=99: */
 +/* ***** BEGIN LICENSE BLOCK *****
 +bool compartment_runtime(JSRuntime *rt, ProbeValue *val);
 +bool compartment_gcBytes(JSRuntime *rt, ProbeValue *val);
 +bool compartment_gcTriggerBytes(JSRuntime *rt, ProbeValue *val);
-+bool compartment_gcLastBytes(JSRuntime *rt, ProbeValue *val);
 +bool compartment_id(JSRuntime *rt, ProbeValue *val);
 +bool env_currentTimeMS(JSRuntime *rt, ProbeValue *val);
 +
 new file mode 100644
 --- /dev/null
 +++ b/js/src/jsprobes.tbl
-@@ -0,0 +1,230 @@
+@@ -0,0 +1,229 @@
 +/* -*- Mode: c++; c-basic-offset: 4; tab-width: 40; indent-tabs-mode: nil -*- */
 +/* vim: set ts=40 sw=4 et tw=99: */
 +/* ***** BEGIN LICENSE BLOCK *****
 +PROBE_TRANS(compartment_runtime,           runtime,            4,  JSCompartmentPtr,    JSRuntimePtr)
 +PROBE_TRANS(compartment_gcBytes,           gcBytes,            5,  JSCompartmentPtr,    size_t)
 +PROBE_TRANS(compartment_gcTriggerBytes,    gcTriggerBytes,     6,  JSCompartmentPtr,    size_t)
-+PROBE_TRANS(compartment_gcLastBytes,       gcLastBytes,        7,  JSCompartmentPtr,    size_t)
-+PROBE_TRANS(compartment_id,                id,                 8,  JSCompartmentPtr,    intptr_t)
-+PROBE_TRANS(env_currentTimeMS,             currentTimeMS,      9,  DummyGlobal,         double)
++PROBE_TRANS(compartment_id,                id,                 7,  JSCompartmentPtr,    intptr_t)
++PROBE_TRANS(env_currentTimeMS,             currentTimeMS,      8,  DummyGlobal,         double)
 +
 +/* teardown PROBE_POINT helpers */
 +#undef _NO_ARGS

gclast-core-fix

-# HG changeset patch
-# Parent b74240fcb02cdb9773434100bacecbdfb3b0d062
-
-diff --git a/js/src/jsprobedefs.cpp b/js/src/jsprobedefs.cpp
---- a/js/src/jsprobedefs.cpp
-+++ b/js/src/jsprobedefs.cpp
-@@ -189,17 +189,6 @@
- }
- 
- bool
--compartment_gcLastBytes(JSRuntime *rt, ProbeValue *arg)
--{
--    JS_ASSERT(arg);
--    JS_ASSERT(arg->ty == ProbeType_JSCompartmentPtr);
--    JS_ASSERT(arg->data.as_JSCompartmentPtr);
--    PROBE_VALUE_SET(arg, size_t, arg->data.as_JSCompartmentPtr->gcLastBytes);
--    return true;
--}
--
--
--bool
- compartment_id(JSRuntime *rt, ProbeValue *arg)
- {
-     JS_ASSERT(arg);
-@@ -209,7 +198,6 @@
-     return true;
- }
- 
--
- bool
- env_currentTimeMS(JSRuntime *rt, ProbeValue *arg)
- {
-diff --git a/js/src/jsprobedefs.h b/js/src/jsprobedefs.h
---- a/js/src/jsprobedefs.h
-+++ b/js/src/jsprobedefs.h
-@@ -153,7 +153,6 @@
- bool compartment_runtime(JSRuntime *rt, ProbeValue *val);
- bool compartment_gcBytes(JSRuntime *rt, ProbeValue *val);
- bool compartment_gcTriggerBytes(JSRuntime *rt, ProbeValue *val);
--bool compartment_gcLastBytes(JSRuntime *rt, ProbeValue *val);
- bool compartment_id(JSRuntime *rt, ProbeValue *val);
- bool env_currentTimeMS(JSRuntime *rt, ProbeValue *val);
- bool env_currentTimeUS(JSRuntime *rt, ProbeValue *val);
-diff --git a/js/src/jsprobes.tbl b/js/src/jsprobes.tbl
---- a/js/src/jsprobes.tbl
-+++ b/js/src/jsprobes.tbl
-@@ -200,12 +200,11 @@
- PROBE_TRANS(compartment_runtime,           runtime,            4,  JSCompartmentPtr,    JSRuntimePtr)
- PROBE_TRANS(compartment_gcBytes,           gcBytes,            5,  JSCompartmentPtr,    size_t)
- PROBE_TRANS(compartment_gcTriggerBytes,    gcTriggerBytes,     6,  JSCompartmentPtr,    size_t)
--PROBE_TRANS(compartment_gcLastBytes,       gcLastBytes,        7,  JSCompartmentPtr,    size_t)
--PROBE_TRANS(compartment_id,                id,                 8,  JSCompartmentPtr,    intptr_t)
--PROBE_TRANS(env_currentTimeMS,             currentTimeMS,      9,  DummyGlobal,         double)
--PROBE_TRANS(env_currentTimeUS,             currentTimeUS,     10,  DummyGlobal,         double)
--PROBE_TRANS(env_threadId,                  threadId,          11,  DummyGlobal,         intptr_t)
--PROBE_TRANS(context_to_compartment,        compartment,       12,  JSContextPtr,        JSCompartmentPtr)
-+PROBE_TRANS(compartment_id,                id,                 7,  JSCompartmentPtr,    intptr_t)
-+PROBE_TRANS(env_currentTimeMS,             currentTimeMS,      8,  DummyGlobal,         double)
-+PROBE_TRANS(env_currentTimeUS,             currentTimeUS,      9,  DummyGlobal,         double)
-+PROBE_TRANS(env_threadId,                  threadId,          10,  DummyGlobal,         intptr_t)
-+PROBE_TRANS(context_to_compartment,        compartment,       11,  JSContextPtr,        JSCompartmentPtr)
- 
- /* teardown PROBE_POINT helpers */
- #undef _NO_ARGS
 # HG changeset patch
-# Parent e421278596564dbbf75ea1b322f5086c797b18d3
+# Parent ccb7bba43d25882e6b3c4e6623d1fb5fbc4833c8
 
 diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
 --- a/js/src/jsinterp.cpp
 diff --git a/js/src/jsprobedefs.cpp b/js/src/jsprobedefs.cpp
 --- a/js/src/jsprobedefs.cpp
 +++ b/js/src/jsprobedefs.cpp
-@@ -218,6 +218,34 @@
+@@ -206,6 +206,34 @@
      return true;
  }
  
 diff --git a/js/src/jsprobedefs.h b/js/src/jsprobedefs.h
 --- a/js/src/jsprobedefs.h
 +++ b/js/src/jsprobedefs.h
-@@ -156,6 +156,9 @@
- bool compartment_gcLastBytes(JSRuntime *rt, ProbeValue *val);
+@@ -155,6 +155,9 @@
+ bool compartment_gcTriggerBytes(JSRuntime *rt, ProbeValue *val);
  bool compartment_id(JSRuntime *rt, ProbeValue *val);
  bool env_currentTimeMS(JSRuntime *rt, ProbeValue *val);
 +bool env_currentTimeUS(JSRuntime *rt, ProbeValue *val);
 diff --git a/js/src/jsprobes.tbl b/js/src/jsprobes.tbl
 --- a/js/src/jsprobes.tbl
 +++ b/js/src/jsprobes.tbl
-@@ -203,6 +203,9 @@
- PROBE_TRANS(compartment_gcLastBytes,       gcLastBytes,        7,  JSCompartmentPtr,    size_t)
- PROBE_TRANS(compartment_id,                id,                 8,  JSCompartmentPtr,    intptr_t)
- PROBE_TRANS(env_currentTimeMS,             currentTimeMS,      9,  DummyGlobal,         double)
-+PROBE_TRANS(env_currentTimeUS,             currentTimeUS,     10,  DummyGlobal,         double)
-+PROBE_TRANS(env_threadId,                  threadId,          11,  DummyGlobal,         intptr_t)
-+PROBE_TRANS(context_to_compartment,        compartment,       12,  JSContextPtr,        JSCompartmentPtr)
+@@ -202,6 +202,9 @@
+ PROBE_TRANS(compartment_gcTriggerBytes,    gcTriggerBytes,     6,  JSCompartmentPtr,    size_t)
+ PROBE_TRANS(compartment_id,                id,                 7,  JSCompartmentPtr,    intptr_t)
+ PROBE_TRANS(env_currentTimeMS,             currentTimeMS,      8,  DummyGlobal,         double)
++PROBE_TRANS(env_currentTimeUS,             currentTimeUS,      9,  DummyGlobal,         double)
++PROBE_TRANS(env_threadId,                  threadId,          10,  DummyGlobal,         intptr_t)
++PROBE_TRANS(context_to_compartment,        compartment,       11,  JSContextPtr,        JSCompartmentPtr)
  
  /* teardown PROBE_POINT helpers */
  #undef _NO_ARGS
 js-run-probes
 provide-all-compartment-ptrs
 jetpack-scriptcontext-naked-jscontext
-gclast-core-fix