mojo/edk/system/data_pipe_producer_dispatcher.cc - Issue 1475113004: Fix shutdown assert in new Mojo EDK.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/edk/system/data_pipe_producer_dispatcher.cc

Issue 1475113004: Fix shutdown assert in new Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: mojo/edk/system/data_pipe_producer_dispatcher.cc

diff --git a/mojo/edk/system/data_pipe_producer_dispatcher.cc b/mojo/edk/system/data_pipe_producer_dispatcher.cc

index 27113eb945ad90da9a7509d7354a1b032d8f9860..9a8163a8e7cd703722f6052c757250e1e3f06e9f 100644

--- a/mojo/edk/system/data_pipe_producer_dispatcher.cc

+++ b/mojo/edk/system/data_pipe_producer_dispatcher.cc

@@ -86,8 +86,11 @@ DataPipeProducerDispatcher::DataPipeProducerDispatcher(

}

DataPipeProducerDispatcher::~DataPipeProducerDispatcher() {

- // |Close()|/|CloseImplNoLock()| should have taken care of the channel.

- DCHECK(!channel_);

+ // See comment in ~MessagePipeDispatcher.

+ if (channel_ && internal::g_io_thread_task_runner->RunsTasksOnCurrentThread())

+ channel_->Shutdown();

+ else

+ DCHECK(!channel_);

}

void DataPipeProducerDispatcher::CancelAllAwakablesNoLock() {