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

Side by Side Diff: mojo/system/message_pipe_dispatcher.cc

Issue 345463003: Mojo: MojoWaitFlags -> MojoHandleSignals. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « mojo/system/message_pipe_dispatcher.h ('k') | mojo/system/message_pipe_endpoint.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/system/message_pipe_dispatcher.h" 5 #include "mojo/system/message_pipe_dispatcher.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "mojo/system/channel.h" 8 #include "mojo/system/channel.h"
9 #include "mojo/system/constants.h" 9 #include "mojo/system/constants.h"
10 #include "mojo/system/local_message_pipe_endpoint.h" 10 #include "mojo/system/local_message_pipe_endpoint.h"
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 return MOJO_RESULT_INVALID_ARGUMENT; 210 return MOJO_RESULT_INVALID_ARGUMENT;
211 if (!VerifyUserPointerWithSize<1>(bytes, *num_bytes)) 211 if (!VerifyUserPointerWithSize<1>(bytes, *num_bytes))
212 return MOJO_RESULT_INVALID_ARGUMENT; 212 return MOJO_RESULT_INVALID_ARGUMENT;
213 } 213 }
214 214
215 return message_pipe_->ReadMessage(port_, bytes, num_bytes, dispatchers, 215 return message_pipe_->ReadMessage(port_, bytes, num_bytes, dispatchers,
216 num_dispatchers, flags); 216 num_dispatchers, flags);
217 } 217 }
218 218
219 MojoResult MessagePipeDispatcher::AddWaiterImplNoLock(Waiter* waiter, 219 MojoResult MessagePipeDispatcher::AddWaiterImplNoLock(Waiter* waiter,
220 MojoWaitFlags flags, 220 MojoHandleSignals signals,
221 uint32_t context) { 221 uint32_t context) {
222 lock().AssertAcquired(); 222 lock().AssertAcquired();
223 return message_pipe_->AddWaiter(port_, waiter, flags, context); 223 return message_pipe_->AddWaiter(port_, waiter, signals, context);
224 } 224 }
225 225
226 void MessagePipeDispatcher::RemoveWaiterImplNoLock(Waiter* waiter) { 226 void MessagePipeDispatcher::RemoveWaiterImplNoLock(Waiter* waiter) {
227 lock().AssertAcquired(); 227 lock().AssertAcquired();
228 message_pipe_->RemoveWaiter(port_, waiter); 228 message_pipe_->RemoveWaiter(port_, waiter);
229 } 229 }
230 230
231 void MessagePipeDispatcher::StartSerializeImplNoLock( 231 void MessagePipeDispatcher::StartSerializeImplNoLock(
232 Channel* /*channel*/, 232 Channel* /*channel*/,
233 size_t* max_size, 233 size_t* max_size,
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 272
273 // MessagePipeDispatcherTransport ---------------------------------------------- 273 // MessagePipeDispatcherTransport ----------------------------------------------
274 274
275 MessagePipeDispatcherTransport::MessagePipeDispatcherTransport( 275 MessagePipeDispatcherTransport::MessagePipeDispatcherTransport(
276 DispatcherTransport transport) : DispatcherTransport(transport) { 276 DispatcherTransport transport) : DispatcherTransport(transport) {
277 DCHECK_EQ(message_pipe_dispatcher()->GetType(), Dispatcher::kTypeMessagePipe); 277 DCHECK_EQ(message_pipe_dispatcher()->GetType(), Dispatcher::kTypeMessagePipe);
278 } 278 }
279 279
280 } // namespace system 280 } // namespace system
281 } // namespace mojo 281 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/system/message_pipe_dispatcher.h ('k') | mojo/system/message_pipe_endpoint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698