Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/mojo/src/mojo/edk/embedder/entrypoints.cc

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more cleanup Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« mojo/edk/system/raw_channel_posix.cc ('K') | « third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc ('k') | third_party/mojo/src/mojo/edk/embedder/test_embedder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
index feb7a8ec44978bb9b5131272c4f3606fc873ea18..22982ec5af33cfdf791e67d31a425554b97afbcb 100644
--- a/third_party/mojo/src/mojo/edk/embedder/entrypoints.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/entrypoints.cc
@@ -2,30 +2,52 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/command_line.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 "third_party/mojo/src/mojo/edk/embedder/embedder_internal.h"
#include "third_party/mojo/src/mojo/edk/system/core.h"
+#include "../../../../../../mojo/edk/system/core.h"
+#include "../../../../../../mojo/edk/embedder/embedder_internal.h"
using mojo::embedder::internal::g_core;
using mojo::system::MakeUserPointer;
+namespace {
+bool UseNewEDK() {
+ static bool checked = false;
+ static bool use_new = false;
+ if (!checked) {
+ use_new = base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk");
+ checked = true;
+ }
+ return use_new;
+}
+}
+
// 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) {
+ 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));
}
@@ -36,6 +58,9 @@ MojoResult MojoWaitMany(const MojoHandle* 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));
@@ -44,6 +69,9 @@ MojoResult MojoWaitMany(const MojoHandle* handles,
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));
@@ -55,6 +83,9 @@ MojoResult MojoWriteMessage(MojoHandle message_pipe_handle,
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);
@@ -66,6 +97,9 @@ MojoResult MojoReadMessage(MojoHandle message_pipe_handle,
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);
@@ -74,6 +108,9 @@ MojoResult MojoReadMessage(MojoHandle message_pipe_handle,
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));
@@ -83,6 +120,9 @@ 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);
}
@@ -91,6 +131,9 @@ 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);
@@ -98,6 +141,9 @@ MojoResult MojoBeginWriteData(MojoHandle data_pipe_producer_handle,
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);
}
@@ -105,6 +151,9 @@ 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);
}
@@ -113,6 +162,9 @@ 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);
@@ -120,6 +172,9 @@ MojoResult MojoBeginReadData(MojoHandle data_pipe_consumer_handle,
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);
}
@@ -127,6 +182,9 @@ 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));
}
@@ -135,6 +193,9 @@ 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));
}
@@ -144,11 +205,16 @@ MojoResult MojoMapBuffer(MojoHandle buffer_handle,
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));
}
« mojo/edk/system/raw_channel_posix.cc ('K') | « third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc ('k') | third_party/mojo/src/mojo/edk/embedder/test_embedder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698