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

Side by Side Diff: content/common/gpu/gpu_memory_manager.cc

Issue 1711533002: Decouple browser-specific GPU IPC messages from GPU service IPCs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Mac Created 4 years, 10 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 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/common/gpu/gpu_memory_manager.h" 5 #include "content/common/gpu/gpu_memory_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/process/process_handle.h" 12 #include "base/process/process_handle.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/trace_event/trace_event.h" 14 #include "base/trace_event/trace_event.h"
15 #include "content/common/gpu/gpu_channel_manager.h" 15 #include "content/common/gpu/gpu_channel_manager.h"
16 #include "content/common/gpu/gpu_channel_manager_delegate.h"
16 #include "content/common/gpu/gpu_memory_tracking.h" 17 #include "content/common/gpu/gpu_memory_tracking.h"
17 #include "content/common/gpu/gpu_memory_uma_stats.h" 18 #include "content/common/gpu/gpu_memory_uma_stats.h"
18 #include "content/common/gpu/gpu_messages.h"
19 #include "gpu/command_buffer/common/gpu_memory_allocation.h" 19 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
20 #include "gpu/command_buffer/service/gpu_switches.h" 20 #include "gpu/command_buffer/service/gpu_switches.h"
21 #include "gpu/ipc/common/memory_stats.h" 21 #include "gpu/ipc/common/memory_stats.h"
22 22
23 using gpu::MemoryAllocation; 23 using gpu::MemoryAllocation;
24 24
25 namespace content { 25 namespace content {
26 namespace { 26 namespace {
27 27
28 const uint64_t kBytesAllocatedStep = 16 * 1024 * 1024; 28 const uint64_t kBytesAllocatedStep = 16 * 1024 * 1024;
(...skipping 22 matching lines...) Expand all
51 uint64_t old_size, 51 uint64_t old_size,
52 uint64_t new_size) { 52 uint64_t new_size) {
53 TrackValueChanged(old_size, new_size, &tracking_group->size_); 53 TrackValueChanged(old_size, new_size, &tracking_group->size_);
54 TrackValueChanged(old_size, new_size, &bytes_allocated_current_); 54 TrackValueChanged(old_size, new_size, &bytes_allocated_current_);
55 55
56 if (GetCurrentUsage() > bytes_allocated_historical_max_ + 56 if (GetCurrentUsage() > bytes_allocated_historical_max_ +
57 kBytesAllocatedStep) { 57 kBytesAllocatedStep) {
58 bytes_allocated_historical_max_ = GetCurrentUsage(); 58 bytes_allocated_historical_max_ = GetCurrentUsage();
59 // If we're blowing into new memory usage territory, spam the browser 59 // If we're blowing into new memory usage territory, spam the browser
60 // process with the most up-to-date information about our memory usage. 60 // process with the most up-to-date information about our memory usage.
61 SendUmaStatsToBrowser(); 61 SendUmaStatsToHost();
62 } 62 }
63 } 63 }
64 64
65 bool GpuMemoryManager::EnsureGPUMemoryAvailable(uint64_t /* size_needed */) { 65 bool GpuMemoryManager::EnsureGPUMemoryAvailable(uint64_t /* size_needed */) {
66 // TODO: Check if there is enough space. Lose contexts until there is. 66 // TODO: Check if there is enough space. Lose contexts until there is.
67 return true; 67 return true;
68 } 68 }
69 69
70 uint64_t GpuMemoryManager::GetTrackerMemoryUsage( 70 uint64_t GpuMemoryManager::GetTrackerMemoryUsage(
71 gpu::gles2::MemoryTracker* tracker) const { 71 gpu::gles2::MemoryTracker* tracker) const {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 video_memory_usage_stats->process_map[ 106 video_memory_usage_stats->process_map[
107 base::GetCurrentProcId()].video_memory = GetCurrentUsage(); 107 base::GetCurrentProcId()].video_memory = GetCurrentUsage();
108 video_memory_usage_stats->process_map[ 108 video_memory_usage_stats->process_map[
109 base::GetCurrentProcId()].has_duplicates = true; 109 base::GetCurrentProcId()].has_duplicates = true;
110 110
111 video_memory_usage_stats->bytes_allocated = GetCurrentUsage(); 111 video_memory_usage_stats->bytes_allocated = GetCurrentUsage();
112 video_memory_usage_stats->bytes_allocated_historical_max = 112 video_memory_usage_stats->bytes_allocated_historical_max =
113 bytes_allocated_historical_max_; 113 bytes_allocated_historical_max_;
114 } 114 }
115 115
116 void GpuMemoryManager::SendUmaStatsToBrowser() { 116 void GpuMemoryManager::SendUmaStatsToHost() {
117 if (!channel_manager_) 117 if (!channel_manager_)
118 return; 118 return;
119 GPUMemoryUmaStats params; 119 GPUMemoryUmaStats params;
120 params.bytes_allocated_current = GetCurrentUsage(); 120 params.bytes_allocated_current = GetCurrentUsage();
121 params.bytes_allocated_max = bytes_allocated_historical_max_; 121 params.bytes_allocated_max = bytes_allocated_historical_max_;
122 params.context_group_count = static_cast<uint32_t>(tracking_groups_.size()); 122 params.context_group_count = static_cast<uint32_t>(tracking_groups_.size());
123 channel_manager_->Send(new GpuHostMsg_GpuMemoryUmaStats(params)); 123 channel_manager_->delegate()->GpuMemoryUmaStats(params);
124 } 124 }
125 } // namespace content 125 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698