diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-02-20 12:00:26 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-02-20 12:00:26 +0100 |
| commit | 59f7a2cdb4f36f017586aa139a7fe8def39e777b (patch) | |
| tree | 45779e58d11a2e540cb7db858c383d4471ab475b /js/src/gc | |
| parent | e3d81b698ea104e4b55ee618b931ea1311c04169 (diff) | |
| download | UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.tar UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.tar.gz UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.tar.lz UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.tar.xz UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.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(); |