Mojo: Plumb new Wait/WaitMany API out to Core.

mojo/system/entrypoints.cc

 // Copyright 2014 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/system/entrypoints.h"
 
+#include "base/logging.h"
 #include "mojo/public/c/system/buffer.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/functions.h"
 #include "mojo/public/c/system/message_pipe.h"
 #include "mojo/system/core.h"
 
 static mojo::system::Core* g_core = NULL;
 
 using mojo::system::MakeUserPointer;
 
@@ skipping 19 matching lines @@
   return g_core->GetTimeTicksNow();
 }
 
 MojoResult MojoClose(MojoHandle handle) {
   return g_core->Close(handle);
 }
 
 MojoResult MojoWait(MojoHandle handle,
                     MojoHandleSignals signals,
                     MojoDeadline deadline) {
-  return g_core->Wait(handle, signals, deadline);
+  return g_core->Wait(
+      handle, signals, deadline, mojo::system::NullUserPointer());
 }
 
 MojoResult MojoWaitMany(const MojoHandle* handles,
                         const MojoHandleSignals* signals,
                         uint32_t num_handles,
                         MojoDeadline deadline) {
-  return g_core->WaitMany(MakeUserPointer(handles),
-                          MakeUserPointer(signals),
-                          num_handles,
-                          deadline);
+  uint32_t result_index = static_cast<uint32_t>(-1);
+  MojoResult result = g_core->WaitMany(MakeUserPointer(handles),
+                                       MakeUserPointer(signals),
+                                       num_handles,
+                                       deadline,
+                                       MakeUserPointer(&result_index),
+                                       mojo::system::NullUserPointer());
+  return (result == MOJO_RESULT_OK) ? static_cast<MojoResult>(result_index)
+                                    : result;
 }
 
 MojoResult MojoCreateMessagePipe(const MojoCreateMessagePipeOptions* options,
                                  MojoHandle* message_pipe_handle0,
                                  MojoHandle* message_pipe_handle1) {
   return g_core->CreateMessagePipe(MakeUserPointer(options),
                                    MakeUserPointer(message_pipe_handle0),
                                    MakeUserPointer(message_pipe_handle1));
 }
 
@@ skipping 108 matching lines @@
                          MojoMapBufferFlags flags) {
   return g_core->MapBuffer(
       buffer_handle, offset, num_bytes, MakeUserPointer(buffer), flags);
 }
 
 MojoResult MojoUnmapBuffer(void* buffer) {
   return g_core->UnmapBuffer(MakeUserPointer(buffer));
 }
 
 }  // extern "C"