| Index: base/trace_event/heap_profiler_allocation_context_tracker_unittest.cc
|
| diff --git a/base/trace_event/heap_profiler_allocation_context_tracker_unittest.cc b/base/trace_event/heap_profiler_allocation_context_tracker_unittest.cc
|
| index 056aa2c001d78a62db10b9bd9db7dcd3490305f0..577f50043dae4100cd353123438425d9e37ebe6a 100644
|
| --- a/base/trace_event/heap_profiler_allocation_context_tracker_unittest.cc
|
| +++ b/base/trace_event/heap_profiler_allocation_context_tracker_unittest.cc
|
| @@ -43,9 +43,9 @@ const char kFilteringTraceConfig[] =
|
| // in |AllocationContextTracker::GetContextSnapshot|.
|
| template <size_t N>
|
| void AssertBacktraceEquals(const StackFrame(&expected_backtrace)[N]) {
|
| - AllocationContext ctx =
|
| - AllocationContextTracker::GetInstanceForCurrentThread()
|
| - ->GetContextSnapshot();
|
| + AllocationContext ctx;
|
| + ASSERT_TRUE(AllocationContextTracker::GetInstanceForCurrentThread()
|
| + ->GetContextSnapshot(&ctx));
|
|
|
| auto* actual = std::begin(ctx.backtrace.frames);
|
| auto* actual_bottom = actual + ctx.backtrace.frame_count;
|
| @@ -65,9 +65,9 @@ void AssertBacktraceEquals(const StackFrame(&expected_backtrace)[N]) {
|
|
|
| void AssertBacktraceContainsOnlyThreadName() {
|
| StackFrame t = StackFrame::FromThreadName(kThreadName);
|
| - AllocationContext ctx =
|
| - AllocationContextTracker::GetInstanceForCurrentThread()
|
| - ->GetContextSnapshot();
|
| + AllocationContext ctx;
|
| + ASSERT_TRUE(AllocationContextTracker::GetInstanceForCurrentThread()
|
| + ->GetContextSnapshot(&ctx));
|
|
|
| ASSERT_EQ(1u, ctx.backtrace.frame_count);
|
| ASSERT_EQ(t, ctx.backtrace.frames[0]);
|
| @@ -243,9 +243,9 @@ TEST_F(AllocationContextTrackerTest, BacktraceTakesTop) {
|
|
|
| {
|
| TRACE_EVENT0("Testing", kGingerbread);
|
| - AllocationContext ctx =
|
| - AllocationContextTracker::GetInstanceForCurrentThread()
|
| - ->GetContextSnapshot();
|
| + AllocationContext ctx;
|
| + ASSERT_TRUE(AllocationContextTracker::GetInstanceForCurrentThread()
|
| + ->GetContextSnapshot(&ctx));
|
|
|
| // The pseudo stack relies on pointer equality, not deep string comparisons.
|
| ASSERT_EQ(t, ctx.backtrace.frames[0]);
|
| @@ -254,9 +254,9 @@ TEST_F(AllocationContextTrackerTest, BacktraceTakesTop) {
|
| }
|
|
|
| {
|
| - AllocationContext ctx =
|
| - AllocationContextTracker::GetInstanceForCurrentThread()
|
| - ->GetContextSnapshot();
|
| + AllocationContext ctx;
|
| + ASSERT_TRUE(AllocationContextTracker::GetInstanceForCurrentThread()
|
| + ->GetContextSnapshot(&ctx));
|
| ASSERT_EQ(t, ctx.backtrace.frames[0]);
|
| ASSERT_EQ(c, ctx.backtrace.frames[1]);
|
| ASSERT_EQ(f, ctx.backtrace.frames[11]);
|
| @@ -269,39 +269,39 @@ TEST_F(AllocationContextTrackerTest, TrackCategoryName) {
|
| {
|
| // The context from the scoped task event should be used as type name.
|
| TRACE_HEAP_PROFILER_API_SCOPED_TASK_EXECUTION event1(kContext1);
|
| - AllocationContext ctx1 =
|
| - AllocationContextTracker::GetInstanceForCurrentThread()
|
| - ->GetContextSnapshot();
|
| + AllocationContext ctx1;
|
| + ASSERT_TRUE(AllocationContextTracker::GetInstanceForCurrentThread()
|
| + ->GetContextSnapshot(&ctx1));
|
| ASSERT_EQ(kContext1, ctx1.type_name);
|
|
|
| // In case of nested events, the last event's context should be used.
|
| TRACE_HEAP_PROFILER_API_SCOPED_TASK_EXECUTION event2(kContext2);
|
| - AllocationContext ctx2 =
|
| - AllocationContextTracker::GetInstanceForCurrentThread()
|
| - ->GetContextSnapshot();
|
| + AllocationContext ctx2;
|
| + ASSERT_TRUE(AllocationContextTracker::GetInstanceForCurrentThread()
|
| + ->GetContextSnapshot(&ctx2));
|
| ASSERT_EQ(kContext2, ctx2.type_name);
|
| }
|
|
|
| {
|
| // Type should be category name of the last seen trace event.
|
| TRACE_EVENT0("Testing", kCupcake);
|
| - AllocationContext ctx1 =
|
| - AllocationContextTracker::GetInstanceForCurrentThread()
|
| - ->GetContextSnapshot();
|
| + AllocationContext ctx1;
|
| + ASSERT_TRUE(AllocationContextTracker::GetInstanceForCurrentThread()
|
| + ->GetContextSnapshot(&ctx1));
|
| ASSERT_EQ("Testing", std::string(ctx1.type_name));
|
|
|
| TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("Testing"), kCupcake);
|
| - AllocationContext ctx2 =
|
| - AllocationContextTracker::GetInstanceForCurrentThread()
|
| - ->GetContextSnapshot();
|
| + AllocationContext ctx2;
|
| + ASSERT_TRUE(AllocationContextTracker::GetInstanceForCurrentThread()
|
| + ->GetContextSnapshot(&ctx2));
|
| ASSERT_EQ(TRACE_DISABLED_BY_DEFAULT("Testing"),
|
| std::string(ctx2.type_name));
|
| }
|
|
|
| // Type should be nullptr without task event.
|
| - AllocationContext ctx =
|
| - AllocationContextTracker::GetInstanceForCurrentThread()
|
| - ->GetContextSnapshot();
|
| + AllocationContext ctx;
|
| + ASSERT_TRUE(AllocationContextTracker::GetInstanceForCurrentThread()
|
| + ->GetContextSnapshot(&ctx));
|
| ASSERT_FALSE(ctx.type_name);
|
| }
|
|
|
| @@ -309,13 +309,9 @@ TEST_F(AllocationContextTrackerTest, IgnoreAllocationTest) {
|
| TRACE_EVENT0("Testing", kCupcake);
|
| TRACE_EVENT0("Testing", kDonut);
|
| HEAP_PROFILER_SCOPED_IGNORE;
|
| - AllocationContext ctx =
|
| - AllocationContextTracker::GetInstanceForCurrentThread()
|
| - ->GetContextSnapshot();
|
| - const StringPiece kTracingOverhead("tracing_overhead");
|
| - ASSERT_EQ(kTracingOverhead,
|
| - static_cast<const char*>(ctx.backtrace.frames[0].value));
|
| - ASSERT_EQ(1u, ctx.backtrace.frame_count);
|
| + AllocationContext ctx;
|
| + ASSERT_FALSE(AllocationContextTracker::GetInstanceForCurrentThread()
|
| + ->GetContextSnapshot(&ctx));
|
| }
|
|
|
| } // namespace trace_event
|
|
|