Commit 7ae56a02 authored by Matthew Gaudet's avatar Matthew Gaudet Committed by mgaudet@mozilla.com
Browse files

Bug 1964451 - Add use counters for OOM handling r=sfink,mccr8 

So the goal here is that we get OOM data where processes survive long enough
send telemetry. To get the case where processes -crash- we'll also have to
get crash data. See Bug 1964092 for that half.

Differential Revision: https://phabricator.services.mozilla.com/D248083
parent c40926da

dom/base/UseCounters.conf

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ custom JS_errorstack_setter_no_errordata called error.stack setter on object wit 
custom JS_dateparse called Date.parse

custom JS_dateparse_impl_def call to Date.parse used implementation defined behaviour

custom JS_regexp_symbol_protocol_on_primitive passed a primitive with a custom implementation of the regexp protocol symbols to one of the String methods that accept a regexp

custom JS_large_oom_reported reported a large oom

custom JS_small_oom_reported reported a small oom

custom JS_large_oom_recovered recovered a large oom

custom JS_small_oom_recovered recovered a small oom



// Console API

method console.assert

dom/base/use_counter_metrics.yaml

+139 −3
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ use.counter: 
    send_in_pings:

      - use-counters









# Total of 2397 use counter metrics (excludes denominators).









# Total of 358 'page' use counters.









# Total of 2405 use counter metrics (excludes denominators).









# Total of 362 'page' use counters.









use.counter.page:









  svgsvgelement_getelementbyid:









    type: counter








@@ -824,6 +824,74 @@ use.counter.page:







    send_in_pings:









      - use-counters

















  js_large_oom_reported:









    type: counter









    description: >









      Whether a page reported a large oom.









      Compare against `use.counter.top_level_content_documents_destroyed`









      to calculate the rate.









    bugs:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    data_reviews:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    notification_emails:









      - dom-core@mozilla.com









      - emilio@mozilla.com









    expires: never









    send_in_pings:









      - use-counters

















  js_small_oom_reported:









    type: counter









    description: >









      Whether a page reported a small oom.









      Compare against `use.counter.top_level_content_documents_destroyed`









      to calculate the rate.









    bugs:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    data_reviews:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    notification_emails:









      - dom-core@mozilla.com









      - emilio@mozilla.com









    expires: never









    send_in_pings:









      - use-counters

















  js_large_oom_recovered:









    type: counter









    description: >









      Whether a page recovered a large oom.









      Compare against `use.counter.top_level_content_documents_destroyed`









      to calculate the rate.









    bugs:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    data_reviews:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    notification_emails:









      - dom-core@mozilla.com









      - emilio@mozilla.com









    expires: never









    send_in_pings:









      - use-counters

















  js_small_oom_recovered:









    type: counter









    description: >









      Whether a page recovered a small oom.









      Compare against `use.counter.top_level_content_documents_destroyed`









      to calculate the rate.









    bugs:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    data_reviews:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    notification_emails:









      - dom-core@mozilla.com









      - emilio@mozilla.com









    expires: never









    send_in_pings:









      - use-counters

















  console_assert:









    type: counter









    description: >








@@ -6196,7 +6264,7 @@ use.counter.page:







    send_in_pings:









      - use-counters

















# Total of 358 'document' use counters.









# Total of 362 'document' use counters.









use.counter.doc:









  svgsvgelement_getelementbyid:









    type: counter








@@ -6912,6 +6980,74 @@ use.counter.doc:







    send_in_pings:









      - use-counters

















  js_large_oom_reported:









    type: counter









    description: >









      Whether a document reported a large oom.









      Compare against `use.counter.content_documents_destroyed`









      to calculate the rate.









    bugs:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    data_reviews:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    notification_emails:









      - dom-core@mozilla.com









      - emilio@mozilla.com









    expires: never









    send_in_pings:









      - use-counters

















  js_small_oom_reported:









    type: counter









    description: >









      Whether a document reported a small oom.









      Compare against `use.counter.content_documents_destroyed`









      to calculate the rate.









    bugs:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    data_reviews:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    notification_emails:









      - dom-core@mozilla.com









      - emilio@mozilla.com









    expires: never









    send_in_pings:









      - use-counters

















  js_large_oom_recovered:









    type: counter









    description: >









      Whether a document recovered a large oom.









      Compare against `use.counter.content_documents_destroyed`









      to calculate the rate.









    bugs:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    data_reviews:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    notification_emails:









      - dom-core@mozilla.com









      - emilio@mozilla.com









    expires: never









    send_in_pings:









      - use-counters

















  js_small_oom_recovered:









    type: counter









    description: >









      Whether a document recovered a small oom.









      Compare against `use.counter.content_documents_destroyed`









      to calculate the rate.









    bugs:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    data_reviews:









      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098









    notification_emails:









      - dom-core@mozilla.com









      - emilio@mozilla.com









    expires: never









    send_in_pings:









      - use-counters

















  console_assert:









    type: counter









    description: >

























xpcom/base/CycleCollectedJSRuntime.cpp



+29
−0






























Original line number
Diff line number
Diff line







@@ -1992,7 +1992,13 @@ bool CycleCollectedJSRuntime::OOMReported() {

















void CycleCollectedJSRuntime::AnnotateAndSetOutOfMemory(OOMState* aStatePtr,









                                                        OOMState aNewState) {









  enum class Size { Large, Small };



















  Size size = aStatePtr == &mOutOfMemoryState ? Size::Small : Size::Large;









  MOZ_ASSERT_IF(size == Size::Large, aStatePtr == &mLargeAllocationFailureState);



















  *aStatePtr = aNewState;



















  CrashReporter::Annotation annotation =









      (aStatePtr == &mOutOfMemoryState)









          ? CrashReporter::Annotation::JSOutOfMemory








@@ -2000,6 +2006,29 @@ void CycleCollectedJSRuntime::AnnotateAndSetOutOfMemory(OOMState* aStatePtr,

















  CrashReporter::RecordAnnotationCString(annotation,









                                         OOMStateToString(aNewState));



















  // Attempt to report telemetry.









  if (JSObject* global = JS::CurrentGlobalOrNull(GetContext()->Context())) {









    if (aNewState == OOMState::Recovered) {









      switch (size) {









        case Size::Large:









          SetUseCounter(global, eUseCounter_custom_JS_large_oom_recovered);









          break;









        case Size::Small:









          SetUseCounter(global, eUseCounter_custom_JS_small_oom_recovered);









          break;









      }









    } else {









      switch (size) {









        case Size::Large:









          SetUseCounter(global, eUseCounter_custom_JS_large_oom_reported);









          break;









        case Size::Small:









          SetUseCounter(global, eUseCounter_custom_JS_small_oom_reported);









          break;









      }









    }









  }









}



















void CycleCollectedJSRuntime::OnGC(JSContext* aContext, JSGCStatus aStatus,