| Index: third_party/mojo/src/mojo/edk/embedder/entrypoints.cc
|
| diff --git a/third_party/mojo/src/mojo/edk/embedder/entrypoints.cc b/third_party/mojo/src/mojo/edk/embedder/entrypoints.cc
|
| deleted file mode 100644
|
| index 992bbd66f7c2249e3c86bcbe243006024bfc3679..0000000000000000000000000000000000000000
|
| --- a/third_party/mojo/src/mojo/edk/embedder/entrypoints.cc
|
| +++ /dev/null
|
| @@ -1,267 +0,0 @@
|
| -// 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/embedder_internal.h"
|
| -#include "../../../../../../mojo/edk/system/core.h"
|
| -#include "base/command_line.h"
|
| -#include "base/lazy_instance.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/wait_set.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/embedder_internal.h"
|
| -#include "third_party/mojo/src/mojo/edk/system/core.h"
|
| -
|
| -using mojo::embedder::internal::g_core;
|
| -using mojo::system::MakeUserPointer;
|
| -
|
| -namespace {
|
| -
|
| -struct UseNewEDKChecker {
|
| - UseNewEDKChecker() {
|
| - use_new = base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk");
|
| - }
|
| -
|
| - bool use_new;
|
| -};
|
| -
|
| -// This is Leaky to avoid a recursive lock acquisition in AtExitManager.
|
| -base::LazyInstance<UseNewEDKChecker>::Leaky g_use_new_checker =
|
| - LAZY_INSTANCE_INITIALIZER;
|
| -
|
| -bool UseNewEDK() {
|
| - return g_use_new_checker.Get().use_new;
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -// Definitions of the system functions.
|
| -extern "C" {
|
| -MojoTimeTicks MojoGetTimeTicksNow() {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->GetTimeTicksNow();
|
| - return g_core->GetTimeTicksNow();
|
| -}
|
| -
|
| -MojoResult MojoClose(MojoHandle handle) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->Close(handle);
|
| - return g_core->Close(handle);
|
| -}
|
| -
|
| -MojoResult MojoWait(MojoHandle handle,
|
| - MojoHandleSignals signals,
|
| - MojoDeadline deadline,
|
| - MojoHandleSignalsState* signals_state) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->Wait(
|
| - handle, signals, deadline, signals_state);
|
| - return g_core->Wait(handle, signals, deadline,
|
| - MakeUserPointer(signals_state));
|
| -}
|
| -
|
| -MojoResult MojoWaitMany(const MojoHandle* handles,
|
| - const MojoHandleSignals* signals,
|
| - uint32_t num_handles,
|
| - MojoDeadline deadline,
|
| - uint32_t* result_index,
|
| - MojoHandleSignalsState* signals_states) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->WaitMany(
|
| - handles, signals, num_handles, deadline, result_index, signals_states);
|
| - return g_core->WaitMany(MakeUserPointer(handles), MakeUserPointer(signals),
|
| - num_handles, deadline, MakeUserPointer(result_index),
|
| - MakeUserPointer(signals_states));
|
| -}
|
| -
|
| -MojoResult MojoCreateWaitSet(MojoHandle* wait_set_handle) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->CreateWaitSet(wait_set_handle);
|
| - return g_core->CreateWaitSet(MakeUserPointer(wait_set_handle));
|
| -}
|
| -
|
| -MojoResult MojoAddHandle(MojoHandle wait_set_handle,
|
| - MojoHandle handle,
|
| - MojoHandleSignals signals) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->AddHandle(wait_set_handle, handle,
|
| - signals);
|
| - return g_core->AddHandle(wait_set_handle, handle, signals);
|
| -}
|
| -
|
| -MojoResult MojoRemoveHandle(MojoHandle wait_set_handle,
|
| - MojoHandle handle) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->RemoveHandle(wait_set_handle, 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) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->GetReadyHandles(
|
| - wait_set_handle, count, handles, results, signals_states);
|
| - return g_core->GetReadyHandles(wait_set_handle, MakeUserPointer(count),
|
| - MakeUserPointer(handles),
|
| - MakeUserPointer(results),
|
| - MakeUserPointer(signals_states));
|
| -}
|
| -
|
| -MojoResult MojoCreateMessagePipe(const MojoCreateMessagePipeOptions* options,
|
| - MojoHandle* message_pipe_handle0,
|
| - MojoHandle* message_pipe_handle1) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->CreateMessagePipe(
|
| - options, message_pipe_handle0, message_pipe_handle1);
|
| - return g_core->CreateMessagePipe(MakeUserPointer(options),
|
| - MakeUserPointer(message_pipe_handle0),
|
| - MakeUserPointer(message_pipe_handle1));
|
| -}
|
| -
|
| -MojoResult MojoWriteMessage(MojoHandle message_pipe_handle,
|
| - const void* bytes,
|
| - uint32_t num_bytes,
|
| - const MojoHandle* handles,
|
| - uint32_t num_handles,
|
| - MojoWriteMessageFlags flags) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->WriteMessage(
|
| - message_pipe_handle, bytes, num_bytes, handles, num_handles, flags);
|
| - return g_core->WriteMessage(message_pipe_handle, MakeUserPointer(bytes),
|
| - num_bytes, MakeUserPointer(handles), num_handles,
|
| - flags);
|
| -}
|
| -
|
| -MojoResult MojoReadMessage(MojoHandle message_pipe_handle,
|
| - void* bytes,
|
| - uint32_t* num_bytes,
|
| - MojoHandle* handles,
|
| - uint32_t* num_handles,
|
| - MojoReadMessageFlags flags) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->ReadMessage(
|
| - message_pipe_handle, bytes, num_bytes, handles, num_handles, flags);
|
| - return g_core->ReadMessage(
|
| - message_pipe_handle, MakeUserPointer(bytes), MakeUserPointer(num_bytes),
|
| - MakeUserPointer(handles), MakeUserPointer(num_handles), flags);
|
| -}
|
| -
|
| -MojoResult MojoCreateDataPipe(const MojoCreateDataPipeOptions* options,
|
| - MojoHandle* data_pipe_producer_handle,
|
| - MojoHandle* data_pipe_consumer_handle) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->CreateDataPipe(
|
| - options, data_pipe_producer_handle, data_pipe_consumer_handle);
|
| - return g_core->CreateDataPipe(MakeUserPointer(options),
|
| - MakeUserPointer(data_pipe_producer_handle),
|
| - MakeUserPointer(data_pipe_consumer_handle));
|
| -}
|
| -
|
| -MojoResult MojoWriteData(MojoHandle data_pipe_producer_handle,
|
| - const void* elements,
|
| - uint32_t* num_elements,
|
| - MojoWriteDataFlags flags) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->WriteData(
|
| - data_pipe_producer_handle, elements, num_elements, flags);
|
| - return g_core->WriteData(data_pipe_producer_handle, MakeUserPointer(elements),
|
| - MakeUserPointer(num_elements), flags);
|
| -}
|
| -
|
| -MojoResult MojoBeginWriteData(MojoHandle data_pipe_producer_handle,
|
| - void** buffer,
|
| - uint32_t* buffer_num_elements,
|
| - MojoWriteDataFlags flags) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->BeginWriteData(
|
| - data_pipe_producer_handle, buffer, buffer_num_elements, flags);
|
| - return g_core->BeginWriteData(data_pipe_producer_handle,
|
| - MakeUserPointer(buffer),
|
| - MakeUserPointer(buffer_num_elements), flags);
|
| -}
|
| -
|
| -MojoResult MojoEndWriteData(MojoHandle data_pipe_producer_handle,
|
| - uint32_t num_elements_written) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->EndWriteData(
|
| - data_pipe_producer_handle, num_elements_written);
|
| - return g_core->EndWriteData(data_pipe_producer_handle, num_elements_written);
|
| -}
|
| -
|
| -MojoResult MojoReadData(MojoHandle data_pipe_consumer_handle,
|
| - void* elements,
|
| - uint32_t* num_elements,
|
| - MojoReadDataFlags flags) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->ReadData(
|
| - data_pipe_consumer_handle, elements, num_elements, flags);
|
| - return g_core->ReadData(data_pipe_consumer_handle, MakeUserPointer(elements),
|
| - MakeUserPointer(num_elements), flags);
|
| -}
|
| -
|
| -MojoResult MojoBeginReadData(MojoHandle data_pipe_consumer_handle,
|
| - const void** buffer,
|
| - uint32_t* buffer_num_elements,
|
| - MojoReadDataFlags flags) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->BeginReadData(
|
| - data_pipe_consumer_handle, buffer, buffer_num_elements, flags);
|
| - return g_core->BeginReadData(data_pipe_consumer_handle,
|
| - MakeUserPointer(buffer),
|
| - MakeUserPointer(buffer_num_elements), flags);
|
| -}
|
| -
|
| -MojoResult MojoEndReadData(MojoHandle data_pipe_consumer_handle,
|
| - uint32_t num_elements_read) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->EndReadData(
|
| - data_pipe_consumer_handle, num_elements_read);
|
| - return g_core->EndReadData(data_pipe_consumer_handle, num_elements_read);
|
| -}
|
| -
|
| -MojoResult MojoCreateSharedBuffer(
|
| - const struct MojoCreateSharedBufferOptions* options,
|
| - uint64_t num_bytes,
|
| - MojoHandle* shared_buffer_handle) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->CreateSharedBuffer(
|
| - options, num_bytes, shared_buffer_handle);
|
| - return g_core->CreateSharedBuffer(MakeUserPointer(options), num_bytes,
|
| - MakeUserPointer(shared_buffer_handle));
|
| -}
|
| -
|
| -MojoResult MojoDuplicateBufferHandle(
|
| - MojoHandle buffer_handle,
|
| - const struct MojoDuplicateBufferHandleOptions* options,
|
| - MojoHandle* new_buffer_handle) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->DuplicateBufferHandle(
|
| - buffer_handle, options, new_buffer_handle);
|
| - return g_core->DuplicateBufferHandle(buffer_handle, MakeUserPointer(options),
|
| - MakeUserPointer(new_buffer_handle));
|
| -}
|
| -
|
| -MojoResult MojoMapBuffer(MojoHandle buffer_handle,
|
| - uint64_t offset,
|
| - uint64_t num_bytes,
|
| - void** buffer,
|
| - MojoMapBufferFlags flags) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->MapBuffer(
|
| - buffer_handle, offset, num_bytes, buffer, flags);
|
| - return g_core->MapBuffer(buffer_handle, offset, num_bytes,
|
| - MakeUserPointer(buffer), flags);
|
| -}
|
| -
|
| -MojoResult MojoUnmapBuffer(void* buffer) {
|
| - if (UseNewEDK())
|
| - return mojo::edk::internal::g_core->UnmapBuffer(buffer);
|
| - return g_core->UnmapBuffer(MakeUserPointer(buffer));
|
| -}
|
| -
|
| -} // extern "C"
|
|
|