| Index: mojo/edk/embedder/entrypoints.cc
|
| diff --git a/mojo/edk/embedder/entrypoints.cc b/mojo/edk/embedder/entrypoints.cc
|
| index 3a68dcd9b481bff6b6fdd82f4ddccf0e21a196d1..102b25f87cd5034574d9b01f9fbb24e378a0a6e1 100644
|
| --- a/mojo/edk/embedder/entrypoints.cc
|
| +++ b/mojo/edk/embedder/entrypoints.cc
|
| @@ -10,15 +10,13 @@
|
| #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/wait_set.h"
|
|
|
| using mojo::edk::internal::g_core;
|
|
|
| -// TODO(use_chrome_edk): commented out since for now we use the entrypoints in
|
| -// third_party and that checks the command line to redirect here.
|
| -/*
|
| -
|
| // Definitions of the system functions.
|
| extern "C" {
|
| +
|
| MojoTimeTicks MojoGetTimeTicksNow() {
|
| return g_core->GetTimeTicksNow();
|
| }
|
| @@ -44,6 +42,29 @@ MojoResult MojoWaitMany(const MojoHandle* handles,
|
| signals_states);
|
| }
|
|
|
| +MojoResult MojoCreateWaitSet(MojoHandle* wait_set_handle) {
|
| + return g_core->CreateWaitSet(wait_set_handle);
|
| +}
|
| +
|
| +MojoResult MojoAddHandle(MojoHandle wait_set_handle,
|
| + MojoHandle handle,
|
| + MojoHandleSignals signals) {
|
| + return g_core->AddHandle(wait_set_handle, handle, signals);
|
| +}
|
| +
|
| +MojoResult MojoRemoveHandle(MojoHandle wait_set_handle, MojoHandle handle) {
|
| + return g_core->RemoveHandle(wait_set_handle, handle);
|
| +}
|
| +
|
| +MojoResult MojoGetReadyHandles(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 MojoCreateMessagePipe(const MojoCreateMessagePipeOptions* options,
|
| MojoHandle* message_pipe_handle0,
|
| MojoHandle* message_pipe_handle1) {
|
| @@ -148,4 +169,3 @@ MojoResult MojoUnmapBuffer(void* buffer) {
|
| }
|
|
|
| } // extern "C"
|
| -*/
|
|
|