Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(852)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/mojo/system/raw_channel.cc

Issue 449063003: Revert 286239 "Reland r285211: "Debugging RawChannelWin: replace..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | trunk/src/mojo/system/raw_channel_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/mojo/system/raw_channel.cc
===================================================================
--- trunk/src/mojo/system/raw_channel.cc (revision 288091)
+++ trunk/src/mojo/system/raw_channel.cc (working copy)
@@ -30,7 +30,7 @@
}
void RawChannel::ReadBuffer::GetBuffer(char** addr, size_t* size) {
- CHECK_GE(buffer_.size(), num_valid_bytes_ + kReadSize);
+ DCHECK_GE(buffer_.size(), num_valid_bytes_ + kReadSize);
*addr = &buffer_[0] + num_valid_bytes_;
*size = kReadSize;
}
@@ -59,11 +59,11 @@
const embedder::PlatformHandleVector* all_platform_handles =
transport_data->platform_handles();
if (!all_platform_handles) {
- CHECK_EQ(platform_handles_offset_, 0u);
+ DCHECK_EQ(platform_handles_offset_, 0u);
return false;
}
if (platform_handles_offset_ >= all_platform_handles->size()) {
- CHECK_EQ(platform_handles_offset_, all_platform_handles->size());
+ DCHECK_EQ(platform_handles_offset_, all_platform_handles->size());
return false;
}
@@ -74,7 +74,7 @@
size_t* num_platform_handles,
embedder::PlatformHandle** platform_handles,
void** serialization_data) {
- CHECK(HavePlatformHandlesToSend());
+ DCHECK(HavePlatformHandlesToSend());
TransportData* transport_data = message_queue_.front()->transport_data();
embedder::PlatformHandleVector* all_platform_handles =
@@ -84,7 +84,7 @@
*platform_handles = &(*all_platform_handles)[platform_handles_offset_];
size_t serialization_data_offset =
transport_data->platform_handle_table_offset();
- CHECK_GT(serialization_data_offset, 0u);
+ DCHECK_GT(serialization_data_offset, 0u);
serialization_data_offset +=
platform_handles_offset_ * serialized_platform_handle_size_;
*serialization_data =
@@ -98,7 +98,7 @@
return;
MessageInTransit* message = message_queue_.front();
- CHECK_LT(data_offset_, message->total_size());
+ DCHECK_LT(data_offset_, message->total_size());
size_t bytes_to_write = message->total_size() - data_offset_;
size_t transport_data_buffer_size =
@@ -106,8 +106,8 @@
if (!transport_data_buffer_size) {
// Only write from the main buffer.
- CHECK_LT(data_offset_, message->main_buffer_size());
- CHECK_LE(bytes_to_write, message->main_buffer_size());
+ DCHECK_LT(data_offset_, message->main_buffer_size());
+ DCHECK_LE(bytes_to_write, message->main_buffer_size());
Buffer buffer = {
static_cast<const char*>(message->main_buffer()) + data_offset_,
bytes_to_write};
@@ -117,9 +117,9 @@
if (data_offset_ >= message->main_buffer_size()) {
// Only write from the transport data buffer.
- CHECK_LT(data_offset_ - message->main_buffer_size(),
- transport_data_buffer_size);
- CHECK_LE(bytes_to_write, transport_data_buffer_size);
+ DCHECK_LT(data_offset_ - message->main_buffer_size(),
+ transport_data_buffer_size);
+ DCHECK_LE(bytes_to_write, transport_data_buffer_size);
Buffer buffer = {
static_cast<const char*>(message->transport_data()->buffer()) +
(data_offset_ - message->main_buffer_size()),
@@ -133,7 +133,7 @@
// attached.
// Write from both buffers.
- CHECK_EQ(
+ DCHECK_EQ(
bytes_to_write,
message->main_buffer_size() - data_offset_ + transport_data_buffer_size);
Buffer buffer1 = {
@@ -157,30 +157,30 @@
}
RawChannel::~RawChannel() {
- CHECK(!read_buffer_);
- CHECK(!write_buffer_);
+ DCHECK(!read_buffer_);
+ DCHECK(!write_buffer_);
// No need to take the |write_lock_| here -- if there are still weak pointers
// outstanding, then we're hosed anyway (since we wouldn't be able to
// invalidate them cleanly, since we might not be on the I/O thread).
- CHECK(!weak_ptr_factory_.HasWeakPtrs());
+ DCHECK(!weak_ptr_factory_.HasWeakPtrs());
}
bool RawChannel::Init(Delegate* delegate) {
- CHECK(delegate);
+ DCHECK(delegate);
- CHECK(!delegate_);
+ DCHECK(!delegate_);
delegate_ = delegate;
CHECK_EQ(base::MessageLoop::current()->type(), base::MessageLoop::TYPE_IO);
- CHECK(!message_loop_for_io_);
+ DCHECK(!message_loop_for_io_);
message_loop_for_io_ =
static_cast<base::MessageLoopForIO*>(base::MessageLoop::current());
// No need to take the lock. No one should be using us yet.
- CHECK(!read_buffer_);
+ DCHECK(!read_buffer_);
read_buffer_.reset(new ReadBuffer);
- CHECK(!write_buffer_);
+ DCHECK(!write_buffer_);
write_buffer_.reset(new WriteBuffer(GetSerializedPlatformHandleSize()));
if (!OnInit()) {
@@ -207,7 +207,7 @@
}
void RawChannel::Shutdown() {
- CHECK_EQ(base::MessageLoop::current(), message_loop_for_io_);
+ DCHECK_EQ(base::MessageLoop::current(), message_loop_for_io_);
base::AutoLock locker(write_lock_);
@@ -225,7 +225,7 @@
// Reminder: This must be thread-safe.
bool RawChannel::WriteMessage(scoped_ptr<MessageInTransit> message) {
- CHECK(message);
+ DCHECK(message);
base::AutoLock locker(write_lock_);
if (write_stopped_)
@@ -237,7 +237,7 @@
}
EnqueueMessageNoLock(message.Pass());
- CHECK_EQ(write_buffer_->data_offset_, 0u);
+ DCHECK_EQ(write_buffer_->data_offset_, 0u);
size_t platform_handles_written = 0;
size_t bytes_written = 0;
@@ -266,7 +266,7 @@
}
void RawChannel::OnReadCompleted(bool result, size_t bytes_read) {
- CHECK_EQ(base::MessageLoop::current(), message_loop_for_io_);
+ DCHECK_EQ(base::MessageLoop::current(), message_loop_for_io_);
if (read_stopped_) {
NOTREACHED();
@@ -310,12 +310,12 @@
remaining_bytes >= message_size) {
MessageInTransit::View message_view(
message_size, &read_buffer_->buffer_[read_buffer_start]);
- CHECK_EQ(message_view.total_size(), message_size);
+ DCHECK_EQ(message_view.total_size(), message_size);
const char* error_message = NULL;
if (!message_view.IsValid(GetSerializedPlatformHandleSize(),
&error_message)) {
- CHECK(error_message);
+ DCHECK(error_message);
LOG(WARNING) << "Received invalid message: " << error_message;
read_stopped_ = true;
CallOnFatalError(Delegate::FATAL_ERROR_READ);
@@ -355,7 +355,7 @@
// for the POSIX implementation, we should confirm that none are stored.
// Dispatch the message.
- CHECK(delegate_);
+ DCHECK(delegate_);
delegate_->OnReadMessage(message_view, platform_handles.Pass());
if (read_stopped_) {
// |Shutdown()| was called in |OnReadMessage()|.
@@ -413,12 +413,12 @@
void RawChannel::OnWriteCompleted(bool result,
size_t platform_handles_written,
size_t bytes_written) {
- CHECK_EQ(base::MessageLoop::current(), message_loop_for_io_);
+ DCHECK_EQ(base::MessageLoop::current(), message_loop_for_io_);
bool did_fail = false;
{
base::AutoLock locker(write_lock_);
- CHECK_EQ(write_stopped_, write_buffer_->message_queue_.empty());
+ DCHECK_EQ(write_stopped_, write_buffer_->message_queue_.empty());
if (write_stopped_) {
NOTREACHED();
@@ -447,7 +447,7 @@
}
void RawChannel::CallOnFatalError(Delegate::FatalError fatal_error) {
- CHECK_EQ(base::MessageLoop::current(), message_loop_for_io_);
+ DCHECK_EQ(base::MessageLoop::current(), message_loop_for_io_);
// TODO(vtl): Add a "write_lock_.AssertNotAcquired()"?
if (delegate_)
delegate_->OnFatalError(fatal_error);
@@ -458,8 +458,8 @@
size_t bytes_written) {
write_lock_.AssertAcquired();
- CHECK(!write_stopped_);
- CHECK(!write_buffer_->message_queue_.empty());
+ DCHECK(!write_stopped_);
+ DCHECK(!write_buffer_->message_queue_.empty());
if (result) {
write_buffer_->platform_handles_offset_ += platform_handles_written;
@@ -468,7 +468,7 @@
MessageInTransit* message = write_buffer_->message_queue_.front();
if (write_buffer_->data_offset_ >= message->total_size()) {
// Complete write.
- CHECK_EQ(write_buffer_->data_offset_, message->total_size());
+ DCHECK_EQ(write_buffer_->data_offset_, message->total_size());
write_buffer_->message_queue_.pop_front();
delete message;
write_buffer_->platform_handles_offset_ = 0;
@@ -482,7 +482,7 @@
IOResult io_result = ScheduleWriteNoLock();
if (io_result == IO_PENDING)
return true;
- CHECK_EQ(io_result, IO_FAILED);
+ DCHECK_EQ(io_result, IO_FAILED);
}
write_stopped_ = true;
« no previous file with comments | « no previous file | trunk/src/mojo/system/raw_channel_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698