diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 19:41:01 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 19:41:01 +0000 |
| commit | 364803cebd77ab46bef9c5314d682021768d0e82 (patch) | |
| tree | 3b2e94997328f9b78988a166321108a57ced4b69 /mojo/system/waiter_test_utils.cc | |
| parent | 5b8d5cc06daf401951511f146ace2d2e8b7e52a1 (diff) | |
| download | chromium_src-364803cebd77ab46bef9c5314d682021768d0e82.zip chromium_src-364803cebd77ab46bef9c5314d682021768d0e82.tar.gz chromium_src-364803cebd77ab46bef9c5314d682021768d0e82.tar.bz2 | |
Mojo: Make Dispatcher::AddWaiter() (etc.) return the current HandleSignalsState on failure.
This will be needed for the new MojoWait/MojoWaitMany.
R=darin@chromium.org
Review URL: https://codereview.chromium.org/437573003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/system/waiter_test_utils.cc')
| -rw-r--r-- | mojo/system/waiter_test_utils.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mojo/system/waiter_test_utils.cc b/mojo/system/waiter_test_utils.cc index 83a7f17..5c2946a 100644 --- a/mojo/system/waiter_test_utils.cc +++ b/mojo/system/waiter_test_utils.cc @@ -55,13 +55,10 @@ WaiterThread::~WaiterThread() { void WaiterThread::Run() { waiter_.Init(); - *result_out_ = dispatcher_->AddWaiter(&waiter_, handle_signals_, context_); - if (*result_out_ != MOJO_RESULT_OK) { - // TODO(vtl): Get rid of this once we've added a |HandleSignalsState*| - // argument to |AddWaiter()|. - *signals_state_out_ = dispatcher_->GetHandleSignalsState(); + *result_out_ = dispatcher_->AddWaiter( + &waiter_, handle_signals_, context_, signals_state_out_); + if (*result_out_ != MOJO_RESULT_OK) return; - } *did_wait_out_ = true; *result_out_ = waiter_.Wait(deadline_, context_out_); |