summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-01-29 00:40:24 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-01-29 00:40:24 +0100
commitabcaa560fcaf2f814fc40eef46557033c910eb96 (patch)
tree22acce9135d8f314d3e690cd743b42bcda968d52 /js
parent3476c1d60ec29c5497123194acd7a9310b1023d2 (diff)
downloadUXP-abcaa560fcaf2f814fc40eef46557033c910eb96.tar
UXP-abcaa560fcaf2f814fc40eef46557033c910eb96.tar.gz
UXP-abcaa560fcaf2f814fc40eef46557033c910eb96.tar.lz
UXP-abcaa560fcaf2f814fc40eef46557033c910eb96.tar.xz
UXP-abcaa560fcaf2f814fc40eef46557033c910eb96.zip
Revert "Reduce number of allocations in AutoStopwatch"
This reverts commit 3476c1d60ec29c5497123194acd7a9310b1023d2.
Diffstat (limited to 'js')
-rw-r--r--js/src/jsapi.h2
-rw-r--r--js/src/vm/Stopwatch.cpp24
2 files changed, 8 insertions, 18 deletions
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 799396a0a..0983f034f 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -6566,7 +6566,7 @@ struct JS_PUBLIC_API(PerformanceGroup) {
uint64_t refCount_;
};
-using PerformanceGroupVector = mozilla::Vector<RefPtr<js::PerformanceGroup>, 8, SystemAllocPolicy>;
+using PerformanceGroupVector = mozilla::Vector<RefPtr<js::PerformanceGroup>, 0, SystemAllocPolicy>;
/**
* Commit any Performance Monitoring data.
diff --git a/js/src/vm/Stopwatch.cpp b/js/src/vm/Stopwatch.cpp
index 49b70c478..7a6acb970 100644
--- a/js/src/vm/Stopwatch.cpp
+++ b/js/src/vm/Stopwatch.cpp
@@ -136,9 +136,6 @@ PerformanceMonitoring::start()
bool
PerformanceMonitoring::commit()
{
- // Maximum initialization size, in elements for the vector of groups.
- static const size_t MAX_GROUPS_INIT_CAPACITY = 1024;
-
#if !defined(MOZ_HAVE_RDTSC)
// The AutoStopwatch is only executed if `MOZ_HAVE_RDTSC`.
return false;
@@ -155,19 +152,12 @@ PerformanceMonitoring::commit()
return true;
}
- // The move operation is generally constant time, unless `recentGroups_.length()` is very small, in which case it's
- // fast anyway because it's small.
- PerformanceGroupVector recentGroups(Move(recentGroups_));
- recentGroups_ = PerformanceGroupVector(); // Reconstruct after `Move`.
+ PerformanceGroupVector recentGroups;
+ recentGroups_.swap(recentGroups);
bool success = true;
- if (stopwatchCommitCallback) {
- success = stopwatchCommitCallback(iteration_, recentGroups, stopwatchCommitClosure);
- }
-
- // Heuristic use: we expect to have roughly the same number of groups as in the previous iteration.
- const size_t capacity = std::min(recentGroups.capacity(), MAX_GROUPS_INIT_CAPACITY);
- success = recentGroups_.reserve(capacity) && success;
+ if (stopwatchCommitCallback)
+ success = stopwatchCommitCallback(iteration_, recentGroups, stopwatchCommitClosure);
// Reset immediately, to make sure that we're not hit by the end
// of a nested event loop (which would cause `commit` to be called
@@ -237,7 +227,7 @@ AutoStopwatch::AutoStopwatch(JSContext* cx MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IM
MOZ_GUARD_OBJECT_NOTIFIER_INIT;
JSCompartment* compartment = cx_->compartment();
- if (MOZ_UNLIKELY(compartment->scheduledForDestruction))
+ if (compartment->scheduledForDestruction)
return;
JSRuntime* runtime = cx_->runtime();
@@ -276,11 +266,11 @@ AutoStopwatch::~AutoStopwatch()
}
JSCompartment* compartment = cx_->compartment();
- if (MOZ_UNLIKELY(compartment->scheduledForDestruction))
+ if (compartment->scheduledForDestruction)
return;
JSRuntime* runtime = cx_->runtime();
- if (MOZ_UNLIKELY(iteration_ != runtime->performanceMonitoring.iteration())) {
+ if (iteration_ != runtime->performanceMonitoring.iteration()) {
// We have entered a nested event loop at some point.
// Any information we may have is obsolete.
return;