[Storage] Consoliation of BlobItems with small size

content/child/webblobregistry_impl.cc

Index: content/child/webblobregistry_impl.cc
diff --git a/content/child/webblobregistry_impl.cc b/content/child/webblobregistry_impl.cc
index d673c2a657fddc9eb044eda48b4762719e8fb607..e162a73593467c4089411a27a01d6b3a8032c8ef 100644
--- a/content/child/webblobregistry_impl.cc
+++ b/content/child/webblobregistry_impl.cc
@@ -13,6 +13,7 @@
 #include "content/child/thread_safe_sender.h"
 #include "content/common/fileapi/webblob_messages.h"
 #include "storage/common/blob/blob_data.h"
+#include "storage/common/data_element.h"
 #include "third_party/WebKit/public/platform/WebBlobData.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebThreadSafeData.h"
@@ -43,19 +44,32 @@ void WebBlobRegistryImpl::registerBlobData(
     const blink::WebString& uuid, const blink::WebBlobData& data) {
   const std::string uuid_str(uuid.utf8());
 
+  storage::DataElement data_buffer;
+  data_buffer.SetToEmptyBytes();
+
   sender_->Send(new BlobHostMsg_StartBuilding(uuid_str));
   size_t i = 0;
   WebBlobData::Item data_item;
   while (data.itemAt(i++, data_item)) {
+    // This skips empty files and blobs.  We skip empty data below.

[michaeln, 2015/01/22 21:57:46]

this comment seems unnecessary

[dmurph, 2015/01/23 00:42:00]

Done.

+    if (data_item.length == 0) {
+      continue;
+    }
+    if (data_item.type != WebBlobData::Item::TypeData &&
+        data_buffer.length() != 0) {
+      FlushBlobItemBuffer(uuid_str, &data_buffer);
+    }
     switch (data_item.type) {
       case WebBlobData::Item::TypeData: {
         // WebBlobData does not allow partial data items.
         DCHECK(!data_item.offset && data_item.length == -1);
-        SendDataForBlob(uuid_str, data_item.data);
+        if (data_item.data.size() == 0) {

[michaeln, 2015/01/22 21:57:46]

is WebBlobData::Item.data.size() ever != to WebBlobData::Item.length? if so, a
comment here noting that might make sense.

but more importantly, if so, could the check on line 55 be filtering out items
with data but with a .length field of 0?

[dmurph, 2015/01/23 00:42:00]

It never equals the size.  See the statement above, we DCHECK that
data_item.length is -1.

+          continue;
+        }
+        BufferBlobData(uuid_str, data_item.data, &data_buffer);
         break;
       }
       case WebBlobData::Item::TypeFile:
-        if (data_item.length) {
           storage::BlobData::Item item;

[michaeln, 2015/01/22 21:57:46]

there are compile errors about 'item' being defined multiple times

[dmurph, 2015/01/23 00:42:00]

Done.

           item.SetToFilePathRange(
               base::FilePath::FromUTF16Unsafe(data_item.filePath),
@@ -64,10 +78,8 @@ void WebBlobRegistryImpl::registerBlobData(
               base::Time::FromDoubleT(data_item.expectedModificationTime));
           sender_->Send(
               new BlobHostMsg_AppendBlobDataItem(uuid_str, item));
-        }
         break;
       case WebBlobData::Item::TypeBlob:
-        if (data_item.length) {
           storage::BlobData::Item item;
           item.SetToBlobRange(
               data_item.blobUUID.utf8(),
@@ -75,10 +87,8 @@ void WebBlobRegistryImpl::registerBlobData(
               static_cast<uint64>(data_item.length));
           sender_->Send(
               new BlobHostMsg_AppendBlobDataItem(uuid_str, item));
-        }
         break;
       case WebBlobData::Item::TypeFileSystemURL:
-        if (data_item.length) {
           // We only support filesystem URL as of now.
           DCHECK(GURL(data_item.fileSystemURL).SchemeIsFileSystem());
           storage::BlobData::Item item;
@@ -89,12 +99,14 @@ void WebBlobRegistryImpl::registerBlobData(
               base::Time::FromDoubleT(data_item.expectedModificationTime));
           sender_->Send(
               new BlobHostMsg_AppendBlobDataItem(uuid_str, item));
-        }
         break;
       default:
         NOTREACHED();
     }
   }
+  if (data_buffer.length() != 0) {
+    FlushBlobItemBuffer(uuid_str, &data_buffer);
+  }
   sender_->Send(new BlobHostMsg_FinishBuilding(
       uuid_str, data.contentType().utf8().data()));
 }
@@ -116,37 +128,56 @@ void WebBlobRegistryImpl::revokePublicBlobURL(const WebURL& url) {
   sender_->Send(new BlobHostMsg_RevokePublicURL(url));
 }
 
-void WebBlobRegistryImpl::SendDataForBlob(const std::string& uuid_str,
-                                          const WebThreadSafeData& data) {
+void WebBlobRegistryImpl::FlushBlobItemBuffer(
+    const std::string& uuid_str,
+    storage::DataElement* data_buffer) const {
+  DCHECK_NE(data_buffer->length(), 0ul);
+  DCHECK_LT(data_buffer->length(), kLargeThresholdBytes);
+  storage::BlobData::Item item;

[michaeln, 2015/01/22 21:57:46]

local no longer needed

[dmurph, 2015/01/23 00:42:00]

Done.

+  sender_->Send(new BlobHostMsg_AppendBlobDataItem(uuid_str, *data_buffer));
+  data_buffer->SetToEmptyBytes();
+}
 
-  if (data.size() == 0)
-    return;
-  if (data.size() < kLargeThresholdBytes) {
-    storage::BlobData::Item item;
-    item.SetToBytes(data.data(), data.size());
-    sender_->Send(new BlobHostMsg_AppendBlobDataItem(uuid_str, item));
+void WebBlobRegistryImpl::BufferBlobData(const std::string& uuid_str,
+                                         const blink::WebThreadSafeData& data,
+                                         storage::DataElement* data_buffer) {
+  size_t buffer_size = data_buffer->length();
+  size_t data_size = data.size();
+  DCHECK_NE(data_size, 0ul);
+  if (buffer_size != 0 && buffer_size + data_size >= kLargeThresholdBytes) {
+    FlushBlobItemBuffer(uuid_str, data_buffer);
+    buffer_size = 0;
+  }
+  if (data_size >= kLargeThresholdBytes) {
+    SendOversizedDataForBlob(uuid_str, data);
   } else {
-    // We handle larger amounts of data via SharedMemory instead of
-    // writing it directly to the IPC channel.
-    size_t shared_memory_size = std::min(
-        data.size(), kMaxSharedMemoryBytes);
-    scoped_ptr<base::SharedMemory> shared_memory(
-        ChildThread::AllocateSharedMemory(shared_memory_size,
-                                          sender_.get()));
-    CHECK(shared_memory.get());
-    if (!shared_memory->Map(shared_memory_size))
-      CHECK(false);
+    DCHECK_LT(buffer_size + data_size, kLargeThresholdBytes);
+    data_buffer->AppendBytes(data.data(), data_size);
+  }
+}
 
-    size_t data_size = data.size();
-    const char* data_ptr = data.data();
-    while (data_size) {
-      size_t chunk_size = std::min(data_size, shared_memory_size);
-      memcpy(shared_memory->memory(), data_ptr, chunk_size);
-      sender_->Send(new BlobHostMsg_SyncAppendSharedMemory(
-          uuid_str, shared_memory->handle(), chunk_size));
-      data_size -= chunk_size;
-      data_ptr += chunk_size;
-    }
+void WebBlobRegistryImpl::SendOversizedDataForBlob(
+    const std::string& uuid_str,
+    const blink::WebThreadSafeData& data) {
+  DCHECK_GE(data.size(), kLargeThresholdBytes);
+  // We handle larger amounts of data via SharedMemory instead of
+  // writing it directly to the IPC channel.
+  size_t shared_memory_size = std::min(data.size(), kMaxSharedMemoryBytes);
+  scoped_ptr<base::SharedMemory> shared_memory(
+      ChildThread::AllocateSharedMemory(shared_memory_size, sender_.get()));
+  CHECK(shared_memory.get());
+  if (!shared_memory->Map(shared_memory_size))
+    CHECK(false);
+
+  size_t data_size = data.size();
+  const char* data_ptr = data.data();
+  while (data_size) {
+    size_t chunk_size = std::min(data_size, shared_memory_size);
+    memcpy(shared_memory->memory(), data_ptr, chunk_size);
+    sender_->Send(new BlobHostMsg_SyncAppendSharedMemory(
+        uuid_str, shared_memory->handle(), chunk_size));
+    data_size -= chunk_size;
+    data_ptr += chunk_size;
   }
 }