Commit e67557cd authored by Wez's avatar Wez Committed by Commit Bot

Copy some more BlobReader state to the stack and alias it.

Temporarily add some values to minidumps, to help diagnose BlobReader
crash reports.

Bug: 864351
Change-Id: I048600d890496247fc966442d8f533d4b9eb51c8
Reviewed-on: https://chromium-review.googlesource.com/1196041Reviewed-by: default avatarMarijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587476}
parent fe176681
...@@ -226,6 +226,14 @@ BlobReader::Status BlobReader::Read(net::IOBuffer* buffer, ...@@ -226,6 +226,14 @@ BlobReader::Status BlobReader::Read(net::IOBuffer* buffer,
if (net_error_ != net::OK) if (net_error_ != net::OK)
return Status::NET_ERROR; return Status::NET_ERROR;
// TODO(https://crbug.com/864351): Temporary diagnostics.
base::debug::Alias(&buffer);
base::debug::Alias(&dest_size);
uint64_t remaining_bytes = remaining_bytes_;
base::debug::Alias(&remaining_bytes);
const char* buffer_data = buffer->data();
base::debug::Alias(&buffer_data);
DCHECK_GE(dest_size, 0ul); DCHECK_GE(dest_size, 0ul);
if (remaining_bytes_ < static_cast<uint64_t>(dest_size)) if (remaining_bytes_ < static_cast<uint64_t>(dest_size))
dest_size = static_cast<int>(remaining_bytes_); dest_size = static_cast<int>(remaining_bytes_);
...@@ -461,6 +469,10 @@ BlobReader::Status BlobReader::ReadLoop(int* bytes_read) { ...@@ -461,6 +469,10 @@ BlobReader::Status BlobReader::ReadLoop(int* bytes_read) {
BlobReader::Status BlobReader::ReadItem() { BlobReader::Status BlobReader::ReadItem() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
// TODO(https://crbug.com/864351): Temporary diagnostics.
uint64_t remaining_bytes = remaining_bytes_;
base::debug::Alias(&remaining_bytes);
// Are we done with reading all the blob data? // Are we done with reading all the blob data?
if (remaining_bytes_ == 0) if (remaining_bytes_ == 0)
return Status::DONE; return Status::DONE;
...@@ -484,6 +496,8 @@ BlobReader::Status BlobReader::ReadItem() { ...@@ -484,6 +496,8 @@ BlobReader::Status BlobReader::ReadItem() {
const BlobDataItem& item = *items.at(current_item_index_); const BlobDataItem& item = *items.at(current_item_index_);
// TODO(https://crbug.com/864351): Temporary diagnostics. // TODO(https://crbug.com/864351): Temporary diagnostics.
const BlobDataItem* item_ptr = &item;
base::debug::Alias(&item_ptr);
uint64_t item_offset = item.offset(); uint64_t item_offset = item.offset();
base::debug::Alias(&item_offset); base::debug::Alias(&item_offset);
uint64_t item_length = item.length(); uint64_t item_length = item.length();
...@@ -496,6 +510,12 @@ BlobReader::Status BlobReader::ReadItem() { ...@@ -496,6 +510,12 @@ BlobReader::Status BlobReader::ReadItem() {
// TODO(https://crbug.com/864351): Temporary diagnostics. // TODO(https://crbug.com/864351): Temporary diagnostics.
const char* item_bytes = item.bytes().data(); const char* item_bytes = item.bytes().data();
base::debug::Alias(&item_bytes); base::debug::Alias(&item_bytes);
const char* read_buf_bytes = read_buf_->data();
base::debug::Alias(&read_buf_bytes);
int read_buf_size = read_buf_->size();
base::debug::Alias(&read_buf_size);
int read_buf_remaining = read_buf_->BytesRemaining();
base::debug::Alias(&read_buf_remaining);
ReadBytesItem(item, bytes_to_read); ReadBytesItem(item, bytes_to_read);
return Status::DONE; return Status::DONE;
......
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