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

Side by Side Diff: components/discardable_memory/service/discardable_shared_memory_manager.cc

Issue 2485623002: discardable_memory: Using mojo IPC to replace Chrome IPC (Closed)
Patch Set: Address review issues 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/discardable_memory/service/discardable_shared_memory_manage r.h" 5 #include "components/discardable_memory/service/discardable_shared_memory_manage r.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/atomic_sequence_num.h" 10 #include "base/atomic_sequence_num.h"
(...skipping 11 matching lines...) Expand all
22 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
23 #include "base/strings/stringprintf.h" 23 #include "base/strings/stringprintf.h"
24 #include "base/sys_info.h" 24 #include "base/sys_info.h"
25 #include "base/threading/thread_task_runner_handle.h" 25 #include "base/threading/thread_task_runner_handle.h"
26 #include "base/trace_event/memory_allocator_dump.h" 26 #include "base/trace_event/memory_allocator_dump.h"
27 #include "base/trace_event/memory_dump_manager.h" 27 #include "base/trace_event/memory_dump_manager.h"
28 #include "base/trace_event/process_memory_dump.h" 28 #include "base/trace_event/process_memory_dump.h"
29 #include "base/trace_event/trace_event.h" 29 #include "base/trace_event/trace_event.h"
30 #include "build/build_config.h" 30 #include "build/build_config.h"
31 #include "components/discardable_memory/common/discardable_shared_memory_heap.h" 31 #include "components/discardable_memory/common/discardable_shared_memory_heap.h"
32 #include "mojo/public/cpp/bindings/strong_binding.h"
33 #include "mojo/public/cpp/system/platform_handle.h"
32 34
33 #if defined(OS_LINUX) 35 #if defined(OS_LINUX)
34 #include "base/files/file_path.h" 36 #include "base/files/file_path.h"
35 #include "base/files/file_util.h" 37 #include "base/files/file_util.h"
36 #include "base/metrics/histogram_macros.h" 38 #include "base/metrics/histogram_macros.h"
37 #endif 39 #endif
38 40
39 namespace discardable_memory { 41 namespace discardable_memory {
40 namespace { 42 namespace {
41 43
42 const char kSingleProcess[] = "single-process"; 44 const char kSingleProcess[] = "single-process";
43 45
44 const int kInvalidUniqueClientID = -1; 46 const int kInvalidUniqueClientID = -1;
45 47
46 const uint64_t kBrowserTracingProcessId = std::numeric_limits<uint64_t>::max(); 48 const uint64_t kBrowserTracingProcessId = std::numeric_limits<uint64_t>::max();
47 49
48 uint64_t ClientProcessUniqueIdToTracingProcessId(int client_id) { 50 uint64_t ClientProcessUniqueIdToTracingProcessId(int client_id) {
49 // TODO(penghuang): Move this function to right place. 51 // TODO(penghuang): Move this function to right place.
50 // https://crbug.com/661257 52 // https://crbug.com/661257
51 if (base::CommandLine::ForCurrentProcess()->HasSwitch(kSingleProcess)) 53 if (base::CommandLine::ForCurrentProcess()->HasSwitch(kSingleProcess))
52 return kBrowserTracingProcessId; 54 return kBrowserTracingProcessId;
53 // The hash value is incremented so that the tracing id is never equal to 55 // The hash value is incremented so that the tracing id is never equal to
54 // MemoryDumpManager::kInvalidTracingProcessId. 56 // MemoryDumpManager::kInvalidTracingProcessId.
55 return static_cast<uint64_t>(base::Hash( 57 return static_cast<uint64_t>(base::Hash(
56 reinterpret_cast<const char*>(&client_id), sizeof(client_id))) + 58 reinterpret_cast<const char*>(&client_id), sizeof(client_id))) +
57 1; 59 1;
58 } 60 }
59 61
62 class MojoDiscardableSharedMemoryManagerImpl
63 : public mojom::DiscardableSharedMemoryManager {
64 public:
65 MojoDiscardableSharedMemoryManagerImpl(
66 int32_t client_id,
67 ::discardable_memory::DiscardableSharedMemoryManager* manager)
68 : client_id_(client_id), manager_(manager) {}
69
70 ~MojoDiscardableSharedMemoryManagerImpl() override {
71 manager_->ClientRemoved(client_id_);
72 }
73
74 // mojom::DiscardableSharedMemoryManager overrides:
75 void AllocateLockedDiscardableSharedMemory(
76 uint32_t size,
77 int32_t id,
78 const AllocateLockedDiscardableSharedMemoryCallback& callback) override {
79 base::SharedMemoryHandle handle;
80 manager_->AllocateLockedDiscardableSharedMemoryForClient(client_id_, size,
81 id, &handle);
82 mojo::ScopedSharedBufferHandle memory =
83 mojo::WrapSharedMemoryHandle(handle, size, false /* read_only */);
84 return callback.Run(std::move(memory));
85 }
86
87 void DeletedDiscardableSharedMemory(int32_t id) override {
88 manager_->ClientDeletedDiscardableSharedMemory(id, client_id_);
89 }
90
91 private:
92 const int32_t client_id_;
93 ::discardable_memory::DiscardableSharedMemoryManager* const manager_;
94
95 DISALLOW_COPY_AND_ASSIGN(MojoDiscardableSharedMemoryManagerImpl);
96 };
97
60 class DiscardableMemoryImpl : public base::DiscardableMemory { 98 class DiscardableMemoryImpl : public base::DiscardableMemory {
61 public: 99 public:
62 DiscardableMemoryImpl( 100 DiscardableMemoryImpl(
63 std::unique_ptr<base::DiscardableSharedMemory> shared_memory, 101 std::unique_ptr<base::DiscardableSharedMemory> shared_memory,
64 const base::Closure& deleted_callback) 102 const base::Closure& deleted_callback)
65 : shared_memory_(std::move(shared_memory)), 103 : shared_memory_(std::move(shared_memory)),
66 deleted_callback_(deleted_callback), 104 deleted_callback_(deleted_callback),
67 is_locked_(true) {} 105 is_locked_(true) {}
68 106
69 ~DiscardableMemoryImpl() override { 107 ~DiscardableMemoryImpl() override {
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 211
174 } // namespace 212 } // namespace
175 213
176 DiscardableSharedMemoryManager::MemorySegment::MemorySegment( 214 DiscardableSharedMemoryManager::MemorySegment::MemorySegment(
177 std::unique_ptr<base::DiscardableSharedMemory> memory) 215 std::unique_ptr<base::DiscardableSharedMemory> memory)
178 : memory_(std::move(memory)) {} 216 : memory_(std::move(memory)) {}
179 217
180 DiscardableSharedMemoryManager::MemorySegment::~MemorySegment() {} 218 DiscardableSharedMemoryManager::MemorySegment::~MemorySegment() {}
181 219
182 DiscardableSharedMemoryManager::DiscardableSharedMemoryManager() 220 DiscardableSharedMemoryManager::DiscardableSharedMemoryManager()
183 : default_memory_limit_(GetDefaultMemoryLimit()), 221 : next_client_id_(1),
222 default_memory_limit_(GetDefaultMemoryLimit()),
184 memory_limit_(default_memory_limit_), 223 memory_limit_(default_memory_limit_),
185 bytes_allocated_(0), 224 bytes_allocated_(0),
186 memory_pressure_listener_(new base::MemoryPressureListener( 225 memory_pressure_listener_(new base::MemoryPressureListener(
187 base::Bind(&DiscardableSharedMemoryManager::OnMemoryPressure, 226 base::Bind(&DiscardableSharedMemoryManager::OnMemoryPressure,
188 base::Unretained(this)))), 227 base::Unretained(this)))),
189 // Current thread might not have a task runner in tests. 228 // Current thread might not have a task runner in tests.
190 enforce_memory_policy_task_runner_(base::ThreadTaskRunnerHandle::Get()), 229 enforce_memory_policy_task_runner_(base::ThreadTaskRunnerHandle::Get()),
191 enforce_memory_policy_pending_(false), 230 enforce_memory_policy_pending_(false),
192 weak_ptr_factory_(this) { 231 weak_ptr_factory_(this) {
193 DCHECK_NE(memory_limit_, 0u); 232 DCHECK_NE(memory_limit_, 0u);
194 enforce_memory_policy_callback_ = 233 enforce_memory_policy_callback_ =
195 base::Bind(&DiscardableSharedMemoryManager::EnforceMemoryPolicy, 234 base::Bind(&DiscardableSharedMemoryManager::EnforceMemoryPolicy,
196 weak_ptr_factory_.GetWeakPtr()); 235 weak_ptr_factory_.GetWeakPtr());
197 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( 236 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
198 this, "DiscardableSharedMemoryManager", 237 this, "DiscardableSharedMemoryManager",
199 base::ThreadTaskRunnerHandle::Get()); 238 base::ThreadTaskRunnerHandle::Get());
200 base::MemoryCoordinatorClientRegistry::GetInstance()->Register(this); 239 base::MemoryCoordinatorClientRegistry::GetInstance()->Register(this);
201 } 240 }
202 241
203 DiscardableSharedMemoryManager::~DiscardableSharedMemoryManager() { 242 DiscardableSharedMemoryManager::~DiscardableSharedMemoryManager() {
204 base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider( 243 base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
205 this); 244 this);
206 } 245 }
207 246
208 DiscardableSharedMemoryManager* DiscardableSharedMemoryManager::current() { 247 // static
248 DiscardableSharedMemoryManager*
249 DiscardableSharedMemoryManager::CreateInstance() {
250 DCHECK(g_discardable_shared_memory_manager == nullptr);
209 return g_discardable_shared_memory_manager.Pointer(); 251 return g_discardable_shared_memory_manager.Pointer();
210 } 252 }
211 253
254 // static
255 DiscardableSharedMemoryManager* DiscardableSharedMemoryManager::GetInstance() {
256 DCHECK(!(g_discardable_shared_memory_manager == nullptr));
257 return g_discardable_shared_memory_manager.Pointer();
258 }
259
260 void DiscardableSharedMemoryManager::Bind(
261 mojom::DiscardableSharedMemoryManagerRequest request) {
262 mojo::MakeStrongBinding(
263 base::MakeUnique<MojoDiscardableSharedMemoryManagerImpl>(
264 next_client_id_++, this),
265 std::move(request));
266 }
267
212 std::unique_ptr<base::DiscardableMemory> 268 std::unique_ptr<base::DiscardableMemory>
213 DiscardableSharedMemoryManager::AllocateLockedDiscardableMemory(size_t size) { 269 DiscardableSharedMemoryManager::AllocateLockedDiscardableMemory(size_t size) {
214 DCHECK_NE(size, 0u); 270 DCHECK_NE(size, 0u);
215 271
216 DiscardableSharedMemoryId new_id = 272 int32_t new_id = g_next_discardable_shared_memory_id.GetNext();
217 g_next_discardable_shared_memory_id.GetNext();
218 base::ProcessHandle current_process_handle = base::GetCurrentProcessHandle();
219 273
220 // Note: Use DiscardableSharedMemoryHeap for in-process allocation 274 // Note: Use DiscardableSharedMemoryHeap for in-process allocation
221 // of discardable memory if the cost of each allocation is too high. 275 // of discardable memory if the cost of each allocation is too high.
222 base::SharedMemoryHandle handle; 276 base::SharedMemoryHandle handle;
223 AllocateLockedDiscardableSharedMemory( 277 AllocateLockedDiscardableSharedMemory(kInvalidUniqueClientID, size, new_id,
224 current_process_handle, kInvalidUniqueClientID, size, new_id, &handle); 278 &handle);
225 std::unique_ptr<base::DiscardableSharedMemory> memory( 279 std::unique_ptr<base::DiscardableSharedMemory> memory(
226 new base::DiscardableSharedMemory(handle)); 280 new base::DiscardableSharedMemory(handle));
227 if (!memory->Map(size)) 281 if (!memory->Map(size))
228 base::TerminateBecauseOutOfMemory(size); 282 base::TerminateBecauseOutOfMemory(size);
229 // Close file descriptor to avoid running out. 283 // Close file descriptor to avoid running out.
230 memory->Close(); 284 memory->Close();
231 return base::MakeUnique<DiscardableMemoryImpl>( 285 return base::MakeUnique<DiscardableMemoryImpl>(
232 std::move(memory), 286 std::move(memory),
233 base::Bind( 287 base::Bind(
234 &DiscardableSharedMemoryManager::DeletedDiscardableSharedMemory, 288 &DiscardableSharedMemoryManager::DeletedDiscardableSharedMemory,
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 static_cast<uint64_t>(resident_size)); 355 static_cast<uint64_t>(resident_size));
302 } 356 }
303 #endif // defined(COUNT_RESIDENT_BYTES_SUPPORTED) 357 #endif // defined(COUNT_RESIDENT_BYTES_SUPPORTED)
304 } 358 }
305 } 359 }
306 return true; 360 return true;
307 } 361 }
308 362
309 void DiscardableSharedMemoryManager:: 363 void DiscardableSharedMemoryManager::
310 AllocateLockedDiscardableSharedMemoryForClient( 364 AllocateLockedDiscardableSharedMemoryForClient(
311 base::ProcessHandle process_handle,
312 int client_id, 365 int client_id,
313 size_t size, 366 size_t size,
314 DiscardableSharedMemoryId id, 367 int32_t id,
315 base::SharedMemoryHandle* shared_memory_handle) { 368 base::SharedMemoryHandle* shared_memory_handle) {
316 AllocateLockedDiscardableSharedMemory(process_handle, client_id, size, id, 369 AllocateLockedDiscardableSharedMemory(client_id, size, id,
317 shared_memory_handle); 370 shared_memory_handle);
318 } 371 }
319 372
320 void DiscardableSharedMemoryManager::ClientDeletedDiscardableSharedMemory( 373 void DiscardableSharedMemoryManager::ClientDeletedDiscardableSharedMemory(
321 DiscardableSharedMemoryId id, 374 int32_t id,
322 int client_id) { 375 int client_id) {
323 DeletedDiscardableSharedMemory(id, client_id); 376 DeletedDiscardableSharedMemory(id, client_id);
324 } 377 }
325 378
326 void DiscardableSharedMemoryManager::ClientRemoved(int client_id) { 379 void DiscardableSharedMemoryManager::ClientRemoved(int client_id) {
327 base::AutoLock lock(lock_); 380 base::AutoLock lock(lock_);
328 381
329 auto it = clients_.find(client_id); 382 auto it = clients_.find(client_id);
330 if (it == clients_.end()) 383 if (it == clients_.end())
331 return; 384 return;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 case base::MemoryState::SUSPENDED: 426 case base::MemoryState::SUSPENDED:
374 // Note that SUSPENDED never occurs in the main browser process so far. 427 // Note that SUSPENDED never occurs in the main browser process so far.
375 // Fall through. 428 // Fall through.
376 case base::MemoryState::UNKNOWN: 429 case base::MemoryState::UNKNOWN:
377 NOTREACHED(); 430 NOTREACHED();
378 break; 431 break;
379 } 432 }
380 } 433 }
381 434
382 void DiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory( 435 void DiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory(
383 base::ProcessHandle process_handle,
384 int client_id, 436 int client_id,
385 size_t size, 437 size_t size,
386 DiscardableSharedMemoryId id, 438 int32_t id,
387 base::SharedMemoryHandle* shared_memory_handle) { 439 base::SharedMemoryHandle* shared_memory_handle) {
388 base::AutoLock lock(lock_); 440 base::AutoLock lock(lock_);
389 441
390 // Make sure |id| is not already in use. 442 // Make sure |id| is not already in use.
391 MemorySegmentMap& client_segments = clients_[client_id]; 443 MemorySegmentMap& client_segments = clients_[client_id];
392 if (client_segments.find(id) != client_segments.end()) { 444 if (client_segments.find(id) != client_segments.end()) {
393 LOG(ERROR) << "Invalid discardable shared memory ID"; 445 LOG(ERROR) << "Invalid discardable shared memory ID";
394 *shared_memory_handle = base::SharedMemory::NULLHandle(); 446 *shared_memory_handle = base::SharedMemory::NULLHandle();
395 return; 447 return;
396 } 448 }
(...skipping 12 matching lines...) Expand all
409 if (bytes_allocated_ > limit) 461 if (bytes_allocated_ > limit)
410 ReduceMemoryUsageUntilWithinLimit(limit); 462 ReduceMemoryUsageUntilWithinLimit(limit);
411 463
412 std::unique_ptr<base::DiscardableSharedMemory> memory( 464 std::unique_ptr<base::DiscardableSharedMemory> memory(
413 new base::DiscardableSharedMemory); 465 new base::DiscardableSharedMemory);
414 if (!memory->CreateAndMap(size)) { 466 if (!memory->CreateAndMap(size)) {
415 *shared_memory_handle = base::SharedMemory::NULLHandle(); 467 *shared_memory_handle = base::SharedMemory::NULLHandle();
416 return; 468 return;
417 } 469 }
418 470
419 if (!memory->ShareToProcess(process_handle, shared_memory_handle)) { 471 *shared_memory_handle = base::SharedMemory::DuplicateHandle(memory->handle());
420 LOG(ERROR) << "Cannot share discardable memory segment";
421 *shared_memory_handle = base::SharedMemory::NULLHandle();
422 return;
423 }
424 472
425 // Close file descriptor to avoid running out. 473 // Close file descriptor to avoid running out.
426 memory->Close(); 474 memory->Close();
427 475
428 base::CheckedNumeric<size_t> checked_bytes_allocated = bytes_allocated_; 476 base::CheckedNumeric<size_t> checked_bytes_allocated = bytes_allocated_;
429 checked_bytes_allocated += memory->mapped_size(); 477 checked_bytes_allocated += memory->mapped_size();
430 if (!checked_bytes_allocated.IsValid()) { 478 if (!checked_bytes_allocated.IsValid()) {
479 base::SharedMemory::CloseHandle(*shared_memory_handle);
431 *shared_memory_handle = base::SharedMemory::NULLHandle(); 480 *shared_memory_handle = base::SharedMemory::NULLHandle();
432 return; 481 return;
433 } 482 }
434 483
435 bytes_allocated_ = checked_bytes_allocated.ValueOrDie(); 484 bytes_allocated_ = checked_bytes_allocated.ValueOrDie();
436 BytesAllocatedChanged(bytes_allocated_); 485 BytesAllocatedChanged(bytes_allocated_);
437 486
438 scoped_refptr<MemorySegment> segment(new MemorySegment(std::move(memory))); 487 scoped_refptr<MemorySegment> segment(new MemorySegment(std::move(memory)));
439 client_segments[id] = segment.get(); 488 client_segments[id] = segment.get();
440 segments_.push_back(segment.get()); 489 segments_.push_back(segment.get());
441 std::push_heap(segments_.begin(), segments_.end(), CompareMemoryUsageTime); 490 std::push_heap(segments_.begin(), segments_.end(), CompareMemoryUsageTime);
442 491
443 if (bytes_allocated_ > memory_limit_) 492 if (bytes_allocated_ > memory_limit_)
444 ScheduleEnforceMemoryPolicy(); 493 ScheduleEnforceMemoryPolicy();
445 } 494 }
446 495
447 void DiscardableSharedMemoryManager::DeletedDiscardableSharedMemory( 496 void DiscardableSharedMemoryManager::DeletedDiscardableSharedMemory(
448 DiscardableSharedMemoryId id, 497 int32_t id,
449 int client_id) { 498 int client_id) {
450 base::AutoLock lock(lock_); 499 base::AutoLock lock(lock_);
451 500
452 MemorySegmentMap& client_segments = clients_[client_id]; 501 MemorySegmentMap& client_segments = clients_[client_id];
453 502
454 MemorySegmentMap::iterator segment_it = client_segments.find(id); 503 MemorySegmentMap::iterator segment_it = client_segments.find(id);
455 if (segment_it == client_segments.end()) { 504 if (segment_it == client_segments.end()) {
456 LOG(ERROR) << "Invalid discardable shared memory ID"; 505 LOG(ERROR) << "Invalid discardable shared memory ID";
457 return; 506 return;
458 } 507 }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 return; 630 return;
582 631
583 enforce_memory_policy_pending_ = true; 632 enforce_memory_policy_pending_ = true;
584 DCHECK(enforce_memory_policy_task_runner_); 633 DCHECK(enforce_memory_policy_task_runner_);
585 enforce_memory_policy_task_runner_->PostDelayedTask( 634 enforce_memory_policy_task_runner_->PostDelayedTask(
586 FROM_HERE, enforce_memory_policy_callback_, 635 FROM_HERE, enforce_memory_policy_callback_,
587 base::TimeDelta::FromMilliseconds(kEnforceMemoryPolicyDelayMs)); 636 base::TimeDelta::FromMilliseconds(kEnforceMemoryPolicyDelayMs));
588 } 637 }
589 638
590 } // namespace discardable_memory 639 } // namespace discardable_memory
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698