diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-02-20 12:00:26 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:47:56 +0200 |
commit | 009c9dd2f82445de79cfedf03ddd8d321df9b69b (patch) | |
tree | bd5f8904957e6feb63af35b8008cd3ac9ada9647 /js/src/gc | |
parent | 6407f1abd4f2f598f42cd416d7de9345c77e2444 (diff) | |
download | UXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.tar UXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.tar.gz UXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.tar.lz UXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.tar.xz UXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.zip |
Issue #316 - Make the memory GC performance object conditional (WIP)
This was only added for GCubench and likely interfering with building
without devtools-server.
Diffstat (limited to 'js/src/gc')
-rw-r--r-- | js/src/gc/GCRuntime.h | 2 | ||||
-rw-r--r-- | js/src/gc/Nursery.cpp | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/js/src/gc/GCRuntime.h b/js/src/gc/GCRuntime.h index f102e9ef0..f43dcd351 100644 --- a/js/src/gc/GCRuntime.h +++ b/js/src/gc/GCRuntime.h @@ -741,7 +741,9 @@ class GCRuntime void removeBlackRootsTracer(JSTraceDataOp traceOp, void* data); void setMaxMallocBytes(size_t value); +#ifdef MOZ_DEVTOOLS_SERVER int32_t getMallocBytes() const { return mallocBytesUntilGC; } +#endif void resetMallocBytes(); bool isTooMuchMalloc() const { return mallocBytesUntilGC <= 0; } void updateMallocCounter(JS::Zone* zone, size_t nbytes); diff --git a/js/src/gc/Nursery.cpp b/js/src/gc/Nursery.cpp index 93a0eb6a8..737d68bd0 100644 --- a/js/src/gc/Nursery.cpp +++ b/js/src/gc/Nursery.cpp @@ -505,7 +505,10 @@ js::Nursery::collect(JSRuntime* rt, JS::gcreason::Reason reason) if (!isEnabled()) return; +#ifdef MOZ_DEVTOOLS_SERVER + // No need to obsessively track this without devtools rt->gc.incMinorGcNumber(); +#endif rt->gc.stats.beginNurseryCollection(reason); TraceMinorGCStart(); |