[BlobStorage] BlobMemoryController & tests

storage/browser/blob/shareable_blob_data_item.h

Index: storage/browser/blob/shareable_blob_data_item.h
diff --git a/storage/browser/blob/shareable_blob_data_item.h b/storage/browser/blob/shareable_blob_data_item.h
index 4c2f9c1833262d18dfa82b622abdfef8585b9541..1a6f6759f83dd5358c3c6e4eb76c5f784ed71e86 100644
--- a/storage/browser/blob/shareable_blob_data_item.h
+++ b/storage/browser/blob/shareable_blob_data_item.h
@@ -11,40 +11,83 @@
 #include "base/hash.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "storage/browser/storage_browser_export.h"
 #include "storage/common/data_element.h"
 
 namespace storage {
 class BlobDataItem;
 class InternalBlobData;
 
-// This class allows blob items to be shared between blobs, and is only used by
-// BlobStorageContext. This class contains both the blob data item and the uuids
-// of all the blobs using this item.
+// This class allows blob items to be shared between blobs.  This class contains
+// both the blob data item and the uuids of all the blobs using this item.
 // The data in this class (the item) is immutable, but the item itself can be
 // swapped out with an item with the same data but a different backing (think
 // RAM vs file backed).
-class ShareableBlobDataItem : public base::RefCounted<ShareableBlobDataItem> {
+// We need to be RefCountedThreadSafe as references of this item is passed to a

[pwnall, 2016/09/21 09:03:35]

references are passed

[dmurph, 2016/09/21 23:45:52]

Done.

+// file thread to save old memory items to disk.
+class STORAGE_EXPORT ShareableBlobDataItem
+    : public base::RefCountedThreadSafe<ShareableBlobDataItem> {
  public:
-  ShareableBlobDataItem(const std::string& blob_uuid,
-                        const scoped_refptr<BlobDataItem>& item);
+  enum State {
+    // We're an item that needs quota (either disk or memory).
+    QUOTA_NEEDED,
+    // We have requested quota from the BlobMemoryController.
+    QUOTA_REQUESTED,
+    // Space has been allocated for this item in the BlobMemoryController, but
+    // it may not yet be populated.
+    QUOTA_GRANTED,
+    // We're a populated item that needed quota.
+    POPULATED_WITH_QUOTA,
+    // We're a populated item that didn't need quota.
+    POPULATED_WITHOUT_QUOTA
+  };
 
-  const scoped_refptr<BlobDataItem>& item();
+  ShareableBlobDataItem(const std::string& target_uuid,
+                        scoped_refptr<BlobDataItem> item,
+                        State state);
 
-  base::hash_set<std::string>& referencing_blobs() {
+  const scoped_refptr<BlobDataItem>& item() const;
+
+  // This is a unique auto-incrementing id assigned to this item on
+  // construction. It is used to keep track of this item in an LRU data
+  // structure for eviction to disk.
+  uint64_t item_id() const { return item_id_; }
+
+  const base::hash_set<std::string>& referencing_blobs() const {
     return referencing_blobs_;
   }
 
+  bool IsPopulated() const {
+    return state_ == POPULATED_WITH_QUOTA || state_ == POPULATED_WITHOUT_QUOTA;
+  }
+
+  State state() const { return state_; }
+
  private:
-  friend class base::RefCounted<ShareableBlobDataItem>;
+  friend class base::RefCountedThreadSafe<ShareableBlobDataItem>;
+  friend struct BlobFlattener;

[pwnall, 2016/09/21 09:03:35]

These are a lot of friends. Would it make more sense to add inline public
methods for adding and removing referencing blob UUIDs?

[dmurph, 2016/09/21 23:45:52]

Mmmm it's actually for state and item modification. I could make those
public.... especially because this class is only used in the blob storage
internals. WDYT?

+  friend class BlobMemoryController;
+  friend class BlobMemoryControllerTest;
+  friend class BlobStorageContext;
   friend class InternalBlobData;
+  friend STORAGE_EXPORT void PrintTo(const ShareableBlobDataItem& x,
+                                     ::std::ostream* os);
+
   ~ShareableBlobDataItem();
 
+  // This is a unique identifier for this ShareableBlobDataItem.
+  const uint64_t item_id_;
+  State state_;
   scoped_refptr<BlobDataItem> item_;
-
   base::hash_set<std::string> referencing_blobs_;
 
   DISALLOW_COPY_AND_ASSIGN(ShareableBlobDataItem);
 };
 
+STORAGE_EXPORT bool operator==(const ShareableBlobDataItem& a,
+                               const ShareableBlobDataItem& b);
+STORAGE_EXPORT bool operator!=(const ShareableBlobDataItem& a,
+                               const ShareableBlobDataItem& b);
+
 }  // namespace storage
 #endif  // STORAGE_BROWSER_BLOB_SHAREABLE_BLOB_DATA_ITEM_H_