Commit f10f623f authored by Xida Chen's avatar Xida Chen Committed by Commit Bot

Revert "[debug] Add DumpWithoutCrashing in FrameSequenceTracker"

This reverts commit 15ef3e19.

Reason for revert: Got enough crash to analyze

Original change's description:
> [debug] Add DumpWithoutCrashing in FrameSequenceTracker
> 
> We are seeing OOM crashes from FrameSequenceTracker, and suspect that
> a tracker may never be terminated.
> 
> This CL adds some debugging instrumentation to investigate what
> happens after a tracker is scheduled to terminate.
> 
> Bug: 1072482
> Change-Id: Id0e685e8d178688200d910ee22a8c6b0130979bf
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2157868
> Reviewed-by: Robert Flack <flackr@chromium.org>
> Commit-Queue: Xida Chen <xidachen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#762613}

TBR=flackr@chromium.org,xidachen@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1072482
Change-Id: I0b569d2d2082701f7f2fdeb5200d02da2bbbb39b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2167104Reviewed-by: default avatarXida Chen <xidachen@chromium.org>
Commit-Queue: Xida Chen <xidachen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#762691}
parent fd389e5b
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
#include "cc/metrics/frame_sequence_tracker.h" #include "cc/metrics/frame_sequence_tracker.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/debug/crash_logging.h"
#include "base/debug/dump_without_crashing.h"
#include "base/metrics/histogram.h" #include "base/metrics/histogram.h"
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event.h"
...@@ -83,7 +81,6 @@ FrameSequenceTracker::FrameSequenceTracker( ...@@ -83,7 +81,6 @@ FrameSequenceTracker::FrameSequenceTracker(
FrameSequenceTracker::~FrameSequenceTracker() = default; FrameSequenceTracker::~FrameSequenceTracker() = default;
void FrameSequenceTracker::ScheduleTerminate() { void FrameSequenceTracker::ScheduleTerminate() {
TRACKER_TRACE_STREAM << "t";
// If the last frame has ended and there is no frame awaiting presentation, // If the last frame has ended and there is no frame awaiting presentation,
// then it is ready to terminate. // then it is ready to terminate.
if (!is_inside_frame_ && last_submitted_frame_ == 0) if (!is_inside_frame_ && last_submitted_frame_ == 0)
...@@ -233,16 +230,6 @@ void FrameSequenceTracker::ReportSubmitFrame( ...@@ -233,16 +230,6 @@ void FrameSequenceTracker::ReportSubmitFrame(
last_submitted_frame_ != 0 && last_submitted_frame_ != 0 &&
viz::FrameTokenGT(frame_token, viz::FrameTokenGT(frame_token,
last_submitted_frame_ + frames_to_terminate_tracker)) { last_submitted_frame_ + frames_to_terminate_tracker)) {
#if DCHECK_IS_ON()
std::string full_str = frame_sequence_trace_.str();
std::string crash_str = full_str.size() < 255
? full_str
: full_str.substr(full_str.size() - 255, 255);
static auto* crash_key = base::debug::AllocateCrashKeyString(
"tracker-sequence", base::debug::CrashKeySize::Size256);
base::debug::SetCrashKeyString(crash_key, crash_str);
base::debug::DumpWithoutCrashing();
#endif
termination_status_ = TerminationStatus::kReadyForTermination; termination_status_ = TerminationStatus::kReadyForTermination;
return; return;
} }
......
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