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

Unified Diff: blimp/engine/mojo/blob_channel_service.cc

Issue 2033013003: Use shared memory for moving data over BlobChannel Mojo interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blobchannel-master
Patch Set: Added new test runner with Mojo initialization Created 4 years, 6 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
Index: blimp/engine/mojo/blob_channel_service.cc
diff --git a/blimp/engine/mojo/blob_channel_service.cc b/blimp/engine/mojo/blob_channel_service.cc
index 0234df60698b3a2c2628537b7e66cfd9ae44bfd9..79a95f6c87d08de7c3fb4b98da8ca3fe7a0dcee7 100644
--- a/blimp/engine/mojo/blob_channel_service.cc
+++ b/blimp/engine/mojo/blob_channel_service.cc
@@ -5,6 +5,7 @@
#include "blimp/engine/mojo/blob_channel_service.h"
#include "blimp/net/blob_channel/blob_channel_sender.h"
+#include "mojo/public/cpp/system/buffer.h"
namespace blimp {
namespace engine {
@@ -19,8 +20,34 @@ BlobChannelService::BlobChannelService(BlobChannelSender* blob_channel_sender,
BlobChannelService::~BlobChannelService() {}
void BlobChannelService::PutBlob(const mojo::String& id,
- const mojo::String& data) {
- blob_channel_sender_->PutBlob(id, new BlobData(data));
+ mojo::ScopedSharedBufferHandle data,
+ uint32_t size,
+ const PutBlobCallback& callback) {
+ // Map |data| into memory.
+ char* blob_buf = nullptr;
Wez 2016/06/11 00:16:37 nit: Should this be const char*? We don't really w
Kevin M 2016/06/16 21:00:38 MapBuffer() takes a non-const void*. I'd have to d
+ MojoResult result =
+ mojo::MapBuffer(data.get(), 0, size, reinterpret_cast<void**>(&blob_buf),
+ MOJO_MAP_BUFFER_FLAG_NONE);
+ if (result != MOJO_RESULT_OK) {
+ LOG(ERROR) << "Couldn't map buffer for blob ID: " << id;
Wez 2016/06/11 00:16:37 It's best not to log unbounded ERRORs - if we fail
maniscalco 2016/06/13 15:23:08 I asked for logging here because I'm operating und
Wez 2016/06/13 23:37:50 TBH I'd expect that both map & unmap should only f
maniscalco 2016/06/16 15:31:34 LOG(FATAL) SGTM
Kevin M 2016/06/16 21:00:38 Done.
+ DLOG(FATAL) << "Exiting.";
+ return;
+ }
+ DCHECK(blob_buf);
Wez 2016/06/11 00:16:37 nit: You're about to copy data from |blob_buf|, so
Kevin M 2016/06/16 21:00:38 Done.
+
+ scoped_refptr<BlobData> new_blob(new BlobData);
+ new_blob->data.assign(blob_buf, size);
+ blob_channel_sender_->PutBlob(id, std::move(new_blob));
Wez 2016/06/11 00:16:37 nit: Use a blank line here to separate the put-blo
Kevin M 2016/06/16 21:00:38 Done.
+ result = mojo::UnmapBuffer(blob_buf);
+ if (result != MOJO_RESULT_OK) {
+ LOG(ERROR) << "Couldn't unmap buffer for blob ID: " << id
+ << " (result code: " << result << ")";
+ DLOG(FATAL) << "Exiting.";
+ return;
Wez 2016/06/11 00:16:37 This feels like a use-case for CHECK_EQ() - we rea
Kevin M 2016/06/16 21:00:38 Done.
+ }
+
+ // Signals the renderer side that we are done with the shared memory |data|.
+ callback.Run();
}
void BlobChannelService::DeliverBlob(const mojo::String& id) {

Powered by Google App Engine
This is Rietveld 408576698