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

Unified Diff: blimp/engine/renderer/blob_channel_sender_proxy.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: Created 4 years, 7 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/renderer/blob_channel_sender_proxy.cc
diff --git a/blimp/engine/renderer/blob_channel_sender_proxy.cc b/blimp/engine/renderer/blob_channel_sender_proxy.cc
index 8b689d36c73dd840878105bb72a926845ebe97be..b5e15babd7696666d8f7fa44703875ac892bf1de 100644
--- a/blimp/engine/renderer/blob_channel_sender_proxy.cc
+++ b/blimp/engine/renderer/blob_channel_sender_proxy.cc
@@ -19,6 +19,56 @@ mojom::BlobChannelPtr GetConnectedBlobChannel() {
return blob_channel_ptr;
}
+// Manages the creation and lifetime of Mojo shared memory buffers for blobs.
+// Cleans up the shared memory state when deleted.
+// Caller is responsible for ensuring that |this| is not deleted until the
+// remote side has acknowledged that it is finished using the buffer.
+class SharedMemoryBlob {
maniscalco 2016/06/03 16:43:53 I saw your note about adding a test for the proxy
Kevin M 2016/06/03 17:14:57 Good idea. I'll add it in this CL, I just wanted
+ public:
+ explicit SharedMemoryBlob(BlobDataPtr data) {
+ mojo::ScopedSharedBufferHandle local_handle;
+ MojoResult result =
+ mojo::CreateSharedBuffer(NULL, data->data.size(), &local_handle);
+ CHECK_EQ(MOJO_RESULT_OK, result)
+ << "Mojo error when creating shared buffer: " << result;
+
+ result = mojo::MapBuffer(local_handle.get(), 0, data->data.size(),
+ &mapped_data_, MOJO_MAP_BUFFER_FLAG_NONE);
+ CHECK_EQ(MOJO_RESULT_OK, result)
+ << "Mojo error when memory mapping shared buffer: " << result;
+ memcpy(mapped_data_, data->data.data(), data->data.size());
+
+ // Create read-only handle for browser-side consumption.
+ MojoDuplicateBufferHandleOptions options{
+ sizeof(MojoDuplicateBufferHandleOptions),
+ MOJO_DUPLICATE_BUFFER_HANDLE_OPTIONS_FLAG_READ_ONLY};
+ result =
+ mojo::DuplicateBuffer(local_handle.get(), &options, &remote_handle_);
+ CHECK_EQ(MOJO_RESULT_OK, result)
+ << "Mojo error when creating read-only buffer handle.";
+ DCHECK(remote_handle_.is_valid());
+ }
+
+ ~SharedMemoryBlob() { mojo::UnmapBuffer(mapped_data_); }
maniscalco 2016/06/03 16:43:53 Check result of UnmapBuffer?
Kevin M 2016/06/03 17:14:57 Done.
+
+ mojo::ScopedSharedBufferHandle take_remote_handle() {
+ return std::move(remote_handle_);
+ }
+
+ private:
+ // Pointer to shared memory buffer.
+ void* mapped_data_;
+
+ // Handle to be passed to the remote end of the BlobChannel Mojo service.
+ mojo::ScopedSharedBufferHandle remote_handle_;
+
+ DISALLOW_COPY_AND_ASSIGN(SharedMemoryBlob);
+};
+
+void PutComplete(std::unique_ptr<SharedMemoryBlob>) {
+ // Allow the blob to go out of scope and be deleted.
+}
+
} // namespace
BlobChannelSenderProxy::BlobChannelSenderProxy()
@@ -37,8 +87,13 @@ bool BlobChannelSenderProxy::IsInClientCache(const std::string& id) const {
void BlobChannelSenderProxy::PutBlob(const BlobId& id, BlobDataPtr data) {
DCHECK(!IsInEngineCache(id));
+ size_t size = data->data.size();
maniscalco 2016/06/03 16:43:53 I'm guessing it doesn't really make sense to const
Kevin M 2016/06/03 17:14:57 Should we prevent that? IIRC zero-length arrays ar
maniscalco 2016/06/06 15:43:56 I'm not real familiar with the applications that w
Kevin M 2016/06/09 00:08:32 You're right, thank you very much for looking into
+ std::unique_ptr<SharedMemoryBlob> shared_mem_blob(
+ new SharedMemoryBlob(std::move(data)));
+ blob_channel_->PutBlob(
+ id, shared_mem_blob->take_remote_handle(), size,
+ base::Bind(&PutComplete, base::Passed(std::move(shared_mem_blob))));
replication_state_[id] = false;
maniscalco 2016/06/03 16:43:53 Question about ordering. I noticed that the order
Kevin M 2016/06/03 17:14:57 Done. I put it there to emphasize the postcondit
- blob_channel_->PutBlob(id, data->data);
}
void BlobChannelSenderProxy::DeliverBlob(const std::string& id) {
« blimp/engine/mojo/blob_channel_service.cc ('K') | « blimp/engine/mojo/blob_channel_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698