Add Core methods for wait set.

mojo/edk/system/dispatcher.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/system/dispatcher.h"
 
 #include "base/logging.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/data_pipe_consumer_dispatcher.h"
 #include "mojo/edk/system/data_pipe_producer_dispatcher.h"
@@ skipping 261 matching lines @@
   if (is_closed_)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   return MapBufferImplNoLock(offset, num_bytes, flags, mapping);
 }
 
 // Note: The following three wait set methods don't lock |mutex_|, and leave
 // everything for |WaitSet...Impl()| to do. (We could just make these methods
 // virtual, but we prefer to have a separate "impl" methods for consistency.)
 MojoResult Dispatcher::WaitSetAdd(
-    UserPointer<const MojoWaitSetAddOptions> options,
     RefPtr<Dispatcher>&& dispatcher,
     MojoHandleSignals signals,
-    uint64_t cookie) {
-  return WaitSetAddImpl(options, std::move(dispatcher), signals, cookie);
+    uint64_t cookie,
+    UserPointer<const MojoWaitSetAddOptions> options) {
+  return WaitSetAddImpl(std::move(dispatcher), signals, cookie, options);
 }
 
 MojoResult Dispatcher::WaitSetRemove(uint64_t cookie) {
   return WaitSetRemoveImpl(cookie);
 }
 
 MojoResult Dispatcher::WaitSetWait(MojoDeadline deadline,
                                    UserPointer<uint32_t> num_results,
                                    UserPointer<MojoWaitSetResult> results,
                                    UserPointer<uint32_t> max_results) {
@@ skipping 207 matching lines @@
   // By default, not supported. Only needed for buffer dispatchers.
   return MOJO_RESULT_INVALID_ARGUMENT;
 }
 
 // Note that the following three methods are *not* called under |mutex_| and
 // |is_closed_| hasn't been checked. However, since we'll return
 // |MOJO_RESULT_INVALID_ARGUMENT| regardless of the value of |is_closed_| (these
 // methods are only needed for wait set dispatchers), we don't need to lock
 // |mutex_| and check |is_closed_|.
 MojoResult Dispatcher::WaitSetAddImpl(
-    UserPointer<const MojoWaitSetAddOptions> /*options*/,
     RefPtr<Dispatcher>&& /*dispatcher*/,
     MojoHandleSignals /*signals*/,
-    uint64_t /*cookie*/) {
+    uint64_t /*cookie*/,
+    UserPointer<const MojoWaitSetAddOptions> /*options*/) {
   // See note above.
   return MOJO_RESULT_INVALID_ARGUMENT;
 }
 
 MojoResult Dispatcher::WaitSetRemoveImpl(uint64_t /*cookie*/) {
   // See note above |WaitSetAddImpl()|.
   return MOJO_RESULT_INVALID_ARGUMENT;
 }
 
 MojoResult Dispatcher::WaitSetWaitImpl(
@@ skipping 112 matching lines @@
   // want to remove or weaken).
   MutexLocker locker(&mutex_);
 #endif
 
   return EndSerializeAndCloseImplNoLock(channel, destination, actual_size,
                                         platform_handles);
 }
 
 }  // namespace system
 }  // namespace mojo