Mojo: Move waiting APIs to public library

mojo/edk/embedder/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/edk/embedder/entrypoints.h"
 
 #include <stdint.h>
 
 #include "mojo/edk/embedder/embedder_internal.h"
 #include "mojo/edk/system/core.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/public/c/system/platform_handle.h"
-#include "mojo/public/c/system/wait_set.h"
 
 using mojo::edk::internal::g_core;
 
 // Definitions of the system functions.
 extern "C" {
 
 MojoTimeTicks MojoGetTimeTicksNowImpl() {
   return g_core->GetTimeTicksNow();
 }
 
 MojoResult MojoCloseImpl(MojoHandle handle) {
   return g_core->Close(handle);
 }
 
 MojoResult MojoQueryHandleSignalsStateImpl(
     MojoHandle handle,
     MojoHandleSignalsState* signals_state) {
   return g_core->QueryHandleSignalsState(handle, signals_state);
 }
 
-MojoResult MojoWaitImpl(MojoHandle handle,
-                        MojoHandleSignals signals,
-                        MojoDeadline deadline,
-                        MojoHandleSignalsState* signals_state) {
-  return g_core->Wait(handle, signals, deadline, signals_state);
-}
-
-MojoResult MojoWaitManyImpl(const MojoHandle* handles,
-                            const MojoHandleSignals* signals,
-                            uint32_t num_handles,
-                            MojoDeadline deadline,
-                            uint32_t* result_index,
-                            MojoHandleSignalsState* signals_states) {
-  return g_core->WaitMany(handles, signals, num_handles, deadline, result_index,
-                          signals_states);
-}
-
 MojoResult MojoCreateWatcherImpl(MojoWatcherCallback callback,
                                  MojoHandle* watcher_handle) {
   return g_core->CreateWatcher(callback, watcher_handle);
 }
 
 MojoResult MojoArmWatcherImpl(MojoHandle watcher_handle,
                               uint32_t* num_ready_contexts,
                               uintptr_t* ready_contexts,
                               MojoResult* ready_results,
                               MojoHandleSignalsState* ready_signals_states) {
@@ skipping 21 matching lines @@
 }
 
 MojoResult MojoFreeMessageImpl(MojoMessageHandle message) {
   return g_core->FreeMessage(message);
 }
 
 MojoResult MojoGetMessageBufferImpl(MojoMessageHandle message, void** buffer) {
   return g_core->GetMessageBuffer(message, buffer);
 }
 
-MojoResult MojoCreateWaitSetImpl(MojoHandle* wait_set_handle) {
-  return g_core->CreateWaitSet(wait_set_handle);
-}
-
-MojoResult MojoAddHandleImpl(MojoHandle wait_set_handle,
-                             MojoHandle handle,
-                             MojoHandleSignals signals) {
-  return g_core->AddHandle(wait_set_handle, handle, signals);
-}
-
-MojoResult MojoRemoveHandleImpl(MojoHandle wait_set_handle, MojoHandle handle) {
-  return g_core->RemoveHandle(wait_set_handle, handle);
-}
-
-MojoResult MojoGetReadyHandlesImpl(
-    MojoHandle wait_set_handle,
-    uint32_t* count,
-    MojoHandle* handles,
-    MojoResult* results,
-    struct MojoHandleSignalsState* signals_states) {
-  return g_core->GetReadyHandles(wait_set_handle, count, handles, results,
-                                 signals_states);
-}
-
 MojoResult MojoCreateMessagePipeImpl(
     const MojoCreateMessagePipeOptions* options,
     MojoHandle* message_pipe_handle0,
     MojoHandle* message_pipe_handle1) {
   return g_core->CreateMessagePipe(options, message_pipe_handle0,
                                    message_pipe_handle1);
 }
 
 MojoResult MojoWriteMessageImpl(MojoHandle message_pipe_handle,
                                 const void* bytes,
@@ skipping 152 matching lines @@
 }  // extern "C"
 
 namespace mojo {
 namespace edk {
 
 MojoSystemThunks MakeSystemThunks() {
   MojoSystemThunks system_thunks = {sizeof(MojoSystemThunks),
                                     MojoGetTimeTicksNowImpl,
                                     MojoCloseImpl,
                                     MojoQueryHandleSignalsStateImpl,
-                                    MojoWaitImpl,
-                                    MojoWaitManyImpl,
                                     MojoCreateMessagePipeImpl,
                                     MojoWriteMessageImpl,
                                     MojoReadMessageImpl,
                                     MojoCreateDataPipeImpl,
                                     MojoWriteDataImpl,
                                     MojoBeginWriteDataImpl,
                                     MojoEndWriteDataImpl,
                                     MojoReadDataImpl,
                                     MojoBeginReadDataImpl,
                                     MojoEndReadDataImpl,
                                     MojoCreateSharedBufferImpl,
                                     MojoDuplicateBufferHandleImpl,
                                     MojoMapBufferImpl,
                                     MojoUnmapBufferImpl,
-                                    MojoCreateWaitSetImpl,
-                                    MojoAddHandleImpl,
-                                    MojoRemoveHandleImpl,
-                                    MojoGetReadyHandlesImpl,
                                     MojoCreateWatcherImpl,
                                     MojoWatchImpl,
                                     MojoCancelWatchImpl,
                                     MojoArmWatcherImpl,
                                     MojoFuseMessagePipesImpl,
                                     MojoWriteMessageNewImpl,
                                     MojoReadMessageNewImpl,
                                     MojoAllocMessageImpl,
                                     MojoFreeMessageImpl,
                                     MojoGetMessageBufferImpl,
                                     MojoWrapPlatformHandleImpl,
                                     MojoUnwrapPlatformHandleImpl,
                                     MojoWrapPlatformSharedBufferHandleImpl,
                                     MojoUnwrapPlatformSharedBufferHandleImpl,
                                     MojoNotifyBadMessageImpl,
                                     MojoGetPropertyImpl};
   return system_thunks;
 }
 
 }  // namespace edk
 }  // namespace mojo