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

Side by Side Diff: content/browser/blob_storage/chrome_blob_storage_context.cc

Issue 2516713002: [BlobStorage] Implementing disk. (Closed)
Patch Set: comments, and attempt at force flushing all tasks so Windows/Android test works Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/blob_storage/chrome_blob_storage_context.h" 5 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file.h"
11 #include "base/files/file_enumerator.h"
12 #include "base/files/file_util.h"
10 #include "base/guid.h" 13 #include "base/guid.h"
14 #include "base/metrics/histogram_macros.h"
15 #include "base/single_thread_task_runner.h"
16 #include "base/task_runner.h"
17 #include "base/threading/sequenced_worker_pool.h"
11 #include "content/public/browser/blob_handle.h" 18 #include "content/public/browser/blob_handle.h"
12 #include "content/public/browser/browser_context.h" 19 #include "content/public/browser/browser_context.h"
13 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
14 #include "storage/browser/blob/blob_data_builder.h" 21 #include "storage/browser/blob/blob_data_builder.h"
15 #include "storage/browser/blob/blob_data_handle.h" 22 #include "storage/browser/blob/blob_data_handle.h"
16 #include "storage/browser/blob/blob_storage_context.h" 23 #include "storage/browser/blob/blob_storage_context.h"
17 24
25 using base::FilePath;
18 using base::UserDataAdapter; 26 using base::UserDataAdapter;
19 using storage::BlobStorageContext; 27 using storage::BlobStorageContext;
20 28
21 namespace content { 29 namespace content {
22 30
23 namespace { 31 namespace {
32 const FilePath::CharType kBlobStorageContextKeyName[] =
33 FILE_PATH_LITERAL("content_blob_storage_context");
34 const FilePath::CharType kBlobStorageParentDirectory[] =
35 FILE_PATH_LITERAL("blob_storage");
24 36
25 const char kBlobStorageContextKeyName[] = "content_blob_storage_context"; 37 // Removes all folders in the parent directory except for the
38 // |current_run_dir| folder. If this path is empty, then we delete all folders.
39 void RemoveOldBlobStorageDirectories(FilePath blob_storage_parent,
40 const FilePath& current_run_dir) {
41 if (!base::DirectoryExists(blob_storage_parent)) {
42 return;
43 }
44 base::FileEnumerator enumerator(blob_storage_parent, /* recursive */ false,
kinuko 2016/12/01 05:10:04 nit: false /* recursive */, is probably more com
dmurph 2016/12/01 20:41:00 Done.
45 base::FileEnumerator::DIRECTORIES);
46 bool success = true;
47 for (FilePath name = enumerator.Next(); !name.empty();
48 name = enumerator.Next()) {
49 if (current_run_dir.empty() || name != current_run_dir)
50 success &= base::DeleteFile(name, /* recursive */ true);
kinuko 2016/12/01 05:10:05 ditto
dmurph 2016/12/01 20:41:00 Done.
51 }
52 LOCAL_HISTOGRAM_BOOLEAN("Storage.Blob.CleanupSuccess", success);
53 }
26 54
27 class BlobHandleImpl : public BlobHandle { 55 class BlobHandleImpl : public BlobHandle {
28 public: 56 public:
29 explicit BlobHandleImpl(std::unique_ptr<storage::BlobDataHandle> handle) 57 explicit BlobHandleImpl(std::unique_ptr<storage::BlobDataHandle> handle)
30 : handle_(std::move(handle)) {} 58 : handle_(std::move(handle)) {}
31 59
32 ~BlobHandleImpl() override {} 60 ~BlobHandleImpl() override {}
33 61
34 std::string GetUUID() override { return handle_->uuid(); } 62 std::string GetUUID() override { return handle_->uuid(); }
35 63
36 private: 64 private:
37 std::unique_ptr<storage::BlobDataHandle> handle_; 65 std::unique_ptr<storage::BlobDataHandle> handle_;
38 }; 66 };
39 67
40 } // namespace 68 } // namespace
41 69
42 ChromeBlobStorageContext::ChromeBlobStorageContext() {} 70 ChromeBlobStorageContext::ChromeBlobStorageContext() {}
43 71
44 ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor( 72 ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
45 BrowserContext* context) { 73 BrowserContext* context) {
46 if (!context->GetUserData(kBlobStorageContextKeyName)) { 74 if (!context->GetUserData(kBlobStorageContextKeyName)) {
47 scoped_refptr<ChromeBlobStorageContext> blob = 75 scoped_refptr<ChromeBlobStorageContext> blob =
48 new ChromeBlobStorageContext(); 76 new ChromeBlobStorageContext();
49 context->SetUserData( 77 context->SetUserData(
50 kBlobStorageContextKeyName, 78 kBlobStorageContextKeyName,
51 new UserDataAdapter<ChromeBlobStorageContext>(blob.get())); 79 new UserDataAdapter<ChromeBlobStorageContext>(blob.get()));
80
52 // Check first to avoid memory leak in unittests. 81 // Check first to avoid memory leak in unittests.
53 if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) { 82 bool io_thread_valid = BrowserThread::IsMessageLoopValid(BrowserThread::IO);
83
84 // Resolve our storage directories.
85 FilePath blob_storage_parent =
86 context->GetPath().Append(kBlobStorageParentDirectory);
87 FilePath blob_storage_dir = blob_storage_parent.Append(
88 FilePath::FromUTF8Unsafe(base::GenerateGUID()));
89
90 // Only populate the task runner if we're not off the record. This enables
91 // paging/saving blob data to disk.
92 scoped_refptr<base::TaskRunner> file_task_runner;
93
94 // If we're not incognito mode, schedule all of our file tasks to enable
95 // disk on the storage context.
96 if (!context->IsOffTheRecord() && io_thread_valid) {
97 file_task_runner =
98 BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior(
99 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
100 // Removes our old blob directories if they exist.
101 BrowserThread::PostAfterStartupTask(
102 FROM_HERE, file_task_runner,
103 base::Bind(&RemoveOldBlobStorageDirectories,
104 base::Passed(&blob_storage_parent), blob_storage_dir));
105 }
106
107 if (io_thread_valid) {
54 BrowserThread::PostTask( 108 BrowserThread::PostTask(
55 BrowserThread::IO, FROM_HERE, 109 BrowserThread::IO, FROM_HERE,
56 base::Bind(&ChromeBlobStorageContext::InitializeOnIOThread, blob)); 110 base::Bind(&ChromeBlobStorageContext::InitializeOnIOThread, blob,
111 base::Passed(&blob_storage_dir),
112 base::Passed(&file_task_runner)));
57 } 113 }
58 } 114 }
59 115
60 return UserDataAdapter<ChromeBlobStorageContext>::Get( 116 return UserDataAdapter<ChromeBlobStorageContext>::Get(
61 context, kBlobStorageContextKeyName); 117 context, kBlobStorageContextKeyName);
62 } 118 }
63 119
64 void ChromeBlobStorageContext::InitializeOnIOThread() { 120 void ChromeBlobStorageContext::InitializeOnIOThread(
121 FilePath blob_storage_dir,
122 scoped_refptr<base::TaskRunner> file_task_runner) {
65 DCHECK_CURRENTLY_ON(BrowserThread::IO); 123 DCHECK_CURRENTLY_ON(BrowserThread::IO);
66 context_.reset(new BlobStorageContext()); 124 context_.reset(new BlobStorageContext(std::move(blob_storage_dir),
125 std::move(file_task_runner)));
67 } 126 }
68 127
69 std::unique_ptr<BlobHandle> ChromeBlobStorageContext::CreateMemoryBackedBlob( 128 std::unique_ptr<BlobHandle> ChromeBlobStorageContext::CreateMemoryBackedBlob(
70 const char* data, 129 const char* data,
71 size_t length) { 130 size_t length) {
72 DCHECK_CURRENTLY_ON(BrowserThread::IO); 131 DCHECK_CURRENTLY_ON(BrowserThread::IO);
73 132
74 std::string uuid(base::GenerateGUID()); 133 std::string uuid(base::GenerateGUID());
75 storage::BlobDataBuilder blob_data_builder(uuid); 134 storage::BlobDataBuilder blob_data_builder(uuid);
76 blob_data_builder.AppendData(data, length); 135 blob_data_builder.AppendData(data, length);
77 136
78 std::unique_ptr<storage::BlobDataHandle> blob_data_handle = 137 std::unique_ptr<storage::BlobDataHandle> blob_data_handle =
79 context_->AddFinishedBlob(&blob_data_builder); 138 context_->AddFinishedBlob(&blob_data_builder);
80 if (!blob_data_handle) 139 if (!blob_data_handle)
81 return std::unique_ptr<BlobHandle>(); 140 return std::unique_ptr<BlobHandle>();
82 141
83 std::unique_ptr<BlobHandle> blob_handle( 142 std::unique_ptr<BlobHandle> blob_handle(
84 new BlobHandleImpl(std::move(blob_data_handle))); 143 new BlobHandleImpl(std::move(blob_data_handle)));
85 return blob_handle; 144 return blob_handle;
86 } 145 }
87 146
88 std::unique_ptr<BlobHandle> ChromeBlobStorageContext::CreateFileBackedBlob( 147 std::unique_ptr<BlobHandle> ChromeBlobStorageContext::CreateFileBackedBlob(
89 const base::FilePath& path, 148 const FilePath& path,
90 int64_t offset, 149 int64_t offset,
91 int64_t size, 150 int64_t size,
92 const base::Time& expected_modification_time) { 151 const base::Time& expected_modification_time) {
93 DCHECK_CURRENTLY_ON(BrowserThread::IO); 152 DCHECK_CURRENTLY_ON(BrowserThread::IO);
94 153
95 std::string uuid(base::GenerateGUID()); 154 std::string uuid(base::GenerateGUID());
96 storage::BlobDataBuilder blob_data_builder(uuid); 155 storage::BlobDataBuilder blob_data_builder(uuid);
97 blob_data_builder.AppendFile(path, offset, size, expected_modification_time); 156 blob_data_builder.AppendFile(path, offset, size, expected_modification_time);
98 157
99 std::unique_ptr<storage::BlobDataHandle> blob_data_handle = 158 std::unique_ptr<storage::BlobDataHandle> blob_data_handle =
(...skipping 11 matching lines...) Expand all
111 void ChromeBlobStorageContext::DeleteOnCorrectThread() const { 170 void ChromeBlobStorageContext::DeleteOnCorrectThread() const {
112 if (BrowserThread::IsMessageLoopValid(BrowserThread::IO) && 171 if (BrowserThread::IsMessageLoopValid(BrowserThread::IO) &&
113 !BrowserThread::CurrentlyOn(BrowserThread::IO)) { 172 !BrowserThread::CurrentlyOn(BrowserThread::IO)) {
114 BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); 173 BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this);
115 return; 174 return;
116 } 175 }
117 delete this; 176 delete this;
118 } 177 }
119 178
120 } // namespace content 179 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698