1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
|
From 5794a8df921586417f6ffd6e05214b0258df7a00 Mon Sep 17 00:00:00 2001
From: Daniel Playfair Cal <daniel.playfair.cal@gmail.com>
Date: Sat, 11 Apr 2020 13:01:16 +1000
Subject: [PATCH 6/8] Revert "[PM] Add calculation of maximum simultaneous
load"
This reverts commit b759260ca14691c4ffc386a4c64aef6f4b404618.
---
chrome/browser/BUILD.gn | 2 -
.../policies/background_tab_loading_policy.cc | 19 -------
.../policies/background_tab_loading_policy.h | 4 --
.../background_tab_loading_policy_helpers.cc | 39 --------------
.../background_tab_loading_policy_helpers.h | 25 ---------
...und_tab_loading_policy_helpers_unittest.cc | 54 -------------------
chrome/test/BUILD.gn | 1 -
7 files changed, 144 deletions(-)
delete mode 100644 chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.cc
delete mode 100644 chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.h
delete mode 100644 chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers_unittest.cc
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 023024e81c99..61c2784bd4c7 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3376,8 +3376,6 @@ jumbo_static_library("browser") {
"page_load_metrics/observers/session_restore_page_load_metrics_observer.h",
"performance_manager/graph/policies/background_tab_loading_policy.cc",
"performance_manager/graph/policies/background_tab_loading_policy.h",
- "performance_manager/graph/policies/background_tab_loading_policy_helpers.cc",
- "performance_manager/graph/policies/background_tab_loading_policy_helpers.h",
"performance_manager/graph/policies/urgent_page_discarding_policy.cc",
"performance_manager/graph/policies/urgent_page_discarding_policy.h",
"performance_manager/mechanisms/page_discarder.cc",
diff --git a/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy.cc b/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy.cc
index 7f68ad5c9c81..eb8c5a1ff489 100644
--- a/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy.cc
+++ b/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy.cc
@@ -4,8 +4,6 @@
#include "chrome/browser/performance_manager/graph/policies/background_tab_loading_policy.h"
-#include "base/system/sys_info.h"
-#include "chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.h"
#include "chrome/browser/performance_manager/mechanisms/page_loader.h"
#include "components/performance_manager/public/decorators/tab_properties_decorator.h"
#include "components/performance_manager/public/graph/policies/background_tab_loading_policy.h"
@@ -16,21 +14,7 @@ namespace performance_manager {
namespace policies {
namespace {
-
-// Pointer to the instance of itself.
BackgroundTabLoadingPolicy* g_background_tab_loading_policy = nullptr;
-
-// Lower bound for the maximum number of tabs to load simultaneously.
-uint32_t kMinSimultaneousTabLoads = 1;
-
-// Upper bound for the maximum number of tabs to load simultaneously.
-// Setting to zero means no upper bound is applied.
-uint32_t kMaxSimultaneousTabLoads = 4;
-
-// The number of CPU cores required per permitted simultaneous tab
-// load. Setting to zero means no CPU core limit applies.
-uint32_t kCoresPerSimultaneousTabLoad = 2;
-
} // namespace
void ScheduleLoadForRestoredTabs(
@@ -64,9 +48,6 @@ BackgroundTabLoadingPolicy::BackgroundTabLoadingPolicy()
: page_loader_(std::make_unique<mechanism::PageLoader>()) {
DCHECK(!g_background_tab_loading_policy);
g_background_tab_loading_policy = this;
- simultaneous_tab_loads_ = CalculateMaxSimultaneousTabLoads(
- kMinSimultaneousTabLoads, kMaxSimultaneousTabLoads,
- kCoresPerSimultaneousTabLoad, base::SysInfo::NumberOfProcessors());
}
BackgroundTabLoadingPolicy::~BackgroundTabLoadingPolicy() {
diff --git a/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy.h b/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy.h
index e9ea7180444a..b9187bfb2ae8 100644
--- a/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy.h
+++ b/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy.h
@@ -69,10 +69,6 @@ class BackgroundTabLoadingPolicy : public GraphOwned,
// The set of PageNodes that are currently loading.
std::vector<const PageNode*> page_nodes_loading_;
-
- // The number of simultaneous tab loads that are permitted by policy. This
- // is computed based on the number of cores on the machine.
- size_t simultaneous_tab_loads_;
};
} // namespace policies
diff --git a/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.cc b/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.cc
deleted file mode 100644
index 6ab117bc44c8..000000000000
--- a/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.h"
-#include "base/logging.h"
-
-namespace performance_manager {
-
-namespace policies {
-
-size_t CalculateMaxSimultaneousTabLoads(size_t lower_bound,
- size_t upper_bound,
- size_t cores_per_load,
- size_t num_cores) {
- DCHECK(upper_bound == 0 || lower_bound <= upper_bound);
- DCHECK(num_cores > 0);
-
- size_t loads = 0;
-
- // Setting |cores_per_load| == 0 means that no per-core limit is applied.
- if (cores_per_load == 0) {
- loads = std::numeric_limits<size_t>::max();
- } else {
- loads = num_cores / cores_per_load;
- }
-
- // If |upper_bound| isn't zero then apply the maximum that it implies.
- if (upper_bound != 0)
- loads = std::min(loads, upper_bound);
-
- loads = std::max(loads, lower_bound);
-
- return loads;
-}
-
-} // namespace policies
-
-} // namespace performance_manager
diff --git a/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.h b/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.h
deleted file mode 100644
index fae53ab119bd..000000000000
--- a/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_PERFORMANCE_MANAGER_GRAPH_POLICIES_BACKGROUND_TAB_LOADING_POLICY_HELPERS_H_
-#define CHROME_BROWSER_PERFORMANCE_MANAGER_GRAPH_POLICIES_BACKGROUND_TAB_LOADING_POLICY_HELPERS_H_
-
-#include <stddef.h>
-
-namespace performance_manager {
-
-namespace policies {
-
-// Helper function for BackgroundTabLoadingPolicy to compute the number of
-// tabs that can load simultaneously.
-size_t CalculateMaxSimultaneousTabLoads(size_t lower_bound,
- size_t upper_bound,
- size_t cores_per_load,
- size_t num_cores);
-
-} // namespace policies
-
-} // namespace performance_manager
-
-#endif // CHROME_BROWSER_PERFORMANCE_MANAGER_GRAPH_POLICIES_BACKGROUND_TAB_LOADING_POLICY_HELPERS_H_
diff --git a/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers_unittest.cc b/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers_unittest.cc
deleted file mode 100644
index 4429a0e982f9..000000000000
--- a/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers_unittest.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.h"
-
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace performance_manager {
-
-namespace policies {
-
-namespace {
-
-class BackgroundTabLoadingPolicyHelpersTest : public ::testing::Test {};
-
-} // namespace
-
-TEST_F(BackgroundTabLoadingPolicyHelpersTest,
- CalculateMaxSimultaneousTabLoads) {
- // Test the lower bound is enforced.
- EXPECT_EQ(10u, CalculateMaxSimultaneousTabLoads(
- 10 /* lower_bound */, 20 /* upper_bound */,
- 1 /* cores_per_load */, 1 /* cores */));
-
- // Test the upper bound is enforced.
- EXPECT_EQ(20u, CalculateMaxSimultaneousTabLoads(
- 10 /* lower_bound */, 20 /* upper_bound */,
- 1 /* cores_per_load */, 30 /* cores */));
-
- // Test the per-core calculation is correct.
- EXPECT_EQ(15u, CalculateMaxSimultaneousTabLoads(
- 10 /* lower_bound */, 20 /* upper_bound */,
- 1 /* cores_per_load */, 15 /* cores */));
- EXPECT_EQ(15u, CalculateMaxSimultaneousTabLoads(
- 10 /* lower_bound */, 20 /* upper_bound */,
- 2 /* cores_per_load */, 30 /* cores */));
-
- // If no per-core is specified then upper_bound is returned.
- EXPECT_EQ(5u, CalculateMaxSimultaneousTabLoads(
- 1 /* lower_bound */, 5 /* upper_bound */,
- 0 /* cores_per_load */, 10 /* cores */));
-
- // If no per-core and no upper_bound is applied, then "upper_bound" is
- // returned.
- EXPECT_EQ(
- std::numeric_limits<size_t>::max(),
- CalculateMaxSimultaneousTabLoads(3 /* lower_bound */, 0 /* upper_bound */,
- 0 /* cores_per_load */, 4 /* cores */));
-}
-
-} // namespace policies
-
-} // namespace performance_manager
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 2bce2f66a1ec..f7886e10f3eb 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -3991,7 +3991,6 @@ test("unit_tests") {
"../browser/performance_manager/graph/policies/urgent_page_discarding_policy_unittest.cc",
# Background tab loading from performance_manager isn't supported on Android.
- "../browser/performance_manager/graph/policies/background_tab_loading_policy_helpers_unittest.cc",
"../browser/performance_manager/graph/policies/background_tab_loading_policy_unittest.cc",
# Android does not use the Message Center notification system.
--
2.26.1
|