Commit 37d24e56 authored by Omer Katz's avatar Omer Katz Committed by Commit Bot

cppgc: Change histograms from ms to us

Bug: chromium:1056170
Change-Id: Iaa3cefc652657246fffe7998dd8faa9d008d9195
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2652496
Commit-Queue: Omer Katz <omerkatz@chromium.org>
Reviewed-by: 's avatarMichael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72370}
parent 7af731c9
...@@ -21,14 +21,14 @@ class StatsCollector; ...@@ -21,14 +21,14 @@ class StatsCollector;
class MetricRecorder { class MetricRecorder {
public: public:
struct CppGCCycleEndMetricSamples { struct CppGCCycleEndMetricSamples {
int64_t atomic_mark_ms; int64_t atomic_mark_us;
int64_t atomic_weak_ms; int64_t atomic_weak_us;
int64_t atomic_compact_ms; int64_t atomic_compact_us;
int64_t atomic_sweep_ms; int64_t atomic_sweep_us;
int64_t incremental_mark_ms; int64_t incremental_mark_us;
int64_t incremental_sweep_ms; int64_t incremental_sweep_us;
int64_t concurrent_mark_ms; int64_t concurrent_mark_us;
int64_t concurrent_sweep_ms; int64_t concurrent_sweep_us;
int64_t objects_before_bytes; int64_t objects_before_bytes;
int64_t objects_after_bytes; int64_t objects_after_bytes;
...@@ -39,11 +39,11 @@ class MetricRecorder { ...@@ -39,11 +39,11 @@ class MetricRecorder {
}; };
struct CppGCIncrementalMarkMetricSample { struct CppGCIncrementalMarkMetricSample {
int64_t duration_ms; int64_t duration_us;
}; };
struct CppGCIncrementalSweepMetricSample { struct CppGCIncrementalSweepMetricSample {
int64_t duration_ms; int64_t duration_us;
}; };
virtual ~MetricRecorder() = default; virtual ~MetricRecorder() = default;
......
...@@ -130,12 +130,12 @@ void StatsCollector::NotifySweepingCompleted() { ...@@ -130,12 +130,12 @@ void StatsCollector::NotifySweepingCompleted() {
current_ = Event(); current_ = Event();
if (metric_recorder_) { if (metric_recorder_) {
MetricRecorder::CppGCCycleEndMetricSamples event{ MetricRecorder::CppGCCycleEndMetricSamples event{
previous_.scope_data[kAtomicMark].InMilliseconds(), previous_.scope_data[kAtomicMark].InMicroseconds(),
previous_.scope_data[kAtomicWeak].InMilliseconds(), previous_.scope_data[kAtomicWeak].InMicroseconds(),
previous_.scope_data[kAtomicCompact].InMilliseconds(), previous_.scope_data[kAtomicCompact].InMicroseconds(),
previous_.scope_data[kAtomicSweep].InMilliseconds(), previous_.scope_data[kAtomicSweep].InMicroseconds(),
previous_.scope_data[kIncrementalMark].InMilliseconds(), previous_.scope_data[kIncrementalMark].InMicroseconds(),
previous_.scope_data[kIncrementalSweep].InMilliseconds(), previous_.scope_data[kIncrementalSweep].InMicroseconds(),
previous_.concurrent_scope_data[kConcurrentMark], previous_.concurrent_scope_data[kConcurrentMark],
previous_.concurrent_scope_data[kConcurrentSweep], previous_.concurrent_scope_data[kConcurrentSweep],
previous_.object_size_before_sweep_bytes /* objects_before */, previous_.object_size_before_sweep_bytes /* objects_before */,
...@@ -176,13 +176,13 @@ void StatsCollector::RecordHistogramSample(ScopeId scope_id_, ...@@ -176,13 +176,13 @@ void StatsCollector::RecordHistogramSample(ScopeId scope_id_,
switch (scope_id_) { switch (scope_id_) {
case kIncrementalMark: { case kIncrementalMark: {
MetricRecorder::CppGCIncrementalMarkMetricSample event{ MetricRecorder::CppGCIncrementalMarkMetricSample event{
time.InMilliseconds()}; time.InMicroseconds()};
metric_recorder_->AddMainThreadEvent(event); metric_recorder_->AddMainThreadEvent(event);
break; break;
} }
case kIncrementalSweep: { case kIncrementalSweep: {
MetricRecorder::CppGCIncrementalSweepMetricSample event{ MetricRecorder::CppGCIncrementalSweepMetricSample event{
time.InMilliseconds()}; time.InMicroseconds()};
metric_recorder_->AddMainThreadEvent(event); metric_recorder_->AddMainThreadEvent(event);
break; break;
} }
......
...@@ -425,11 +425,11 @@ void StatsCollector::InternalScope<trace_category, ...@@ -425,11 +425,11 @@ void StatsCollector::InternalScope<trace_category,
} }
// scope_category == StatsCollector::ScopeContext::kConcurrentThread // scope_category == StatsCollector::ScopeContext::kConcurrentThread
using Atomic32 = v8::base::Atomic32; using Atomic32 = v8::base::Atomic32;
const int64_t ms = time.InMicroseconds(); const int64_t us = time.InMicroseconds();
DCHECK(ms <= std::numeric_limits<Atomic32>::max()); DCHECK_LE(us, std::numeric_limits<Atomic32>::max());
v8::base::Relaxed_AtomicIncrement( v8::base::Relaxed_AtomicIncrement(
&stats_collector_->current_.concurrent_scope_data[scope_id_], &stats_collector_->current_.concurrent_scope_data[scope_id_],
static_cast<Atomic32>(ms)); static_cast<Atomic32>(us));
} }
} // namespace internal } // namespace internal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment