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

Side by Side Diff: components/task_scheduler_util/browser/initialization.cc

Issue 2625213003: Rename *FileIO TaskScheduler worker pools to *Blocking. (Closed)
Patch Set: update dates Created 3 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/task_scheduler_util/browser/initialization.h" 5 #include "components/task_scheduler_util/browser/initialization.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/task_scheduler/scheduler_worker_params.h" 12 #include "base/task_scheduler/scheduler_worker_params.h"
13 #include "base/task_scheduler/switches.h" 13 #include "base/task_scheduler/switches.h"
14 #include "base/task_scheduler/task_traits.h" 14 #include "base/task_scheduler/task_traits.h"
15 #include "base/threading/platform_thread.h" 15 #include "base/threading/platform_thread.h"
16 #include "base/threading/sequenced_worker_pool.h" 16 #include "base/threading/sequenced_worker_pool.h"
17 #include "components/task_scheduler_util/common/variations_util.h" 17 #include "components/task_scheduler_util/common/variations_util.h"
18 #include "components/variations/variations_associated_data.h" 18 #include "components/variations/variations_associated_data.h"
19 19
20 namespace task_scheduler_util { 20 namespace task_scheduler_util {
21 21
22 namespace { 22 namespace {
23 23
24 constexpr char kFieldTrialName[] = "BrowserScheduler"; 24 constexpr char kFieldTrialName[] = "BrowserScheduler";
25 25
26 enum WorkerPoolType : size_t { 26 enum WorkerPoolType : size_t {
27 BACKGROUND = 0, 27 BACKGROUND = 0,
28 BACKGROUND_FILE_IO, 28 BACKGROUND_BLOCKING,
29 FOREGROUND, 29 FOREGROUND,
30 FOREGROUND_FILE_IO, 30 FOREGROUND_BLOCKING,
31 WORKER_POOL_COUNT // Always last. 31 WORKER_POOL_COUNT // Always last.
32 }; 32 };
33 33
34 } // namespace 34 } // namespace
35 35
36 std::vector<base::SchedulerWorkerPoolParams> 36 std::vector<base::SchedulerWorkerPoolParams>
37 GetBrowserWorkerPoolParamsFromVariations() { 37 GetBrowserWorkerPoolParamsFromVariations() {
38 using ThreadPriority = base::ThreadPriority; 38 using ThreadPriority = base::ThreadPriority;
39 39
40 std::map<std::string, std::string> variation_params; 40 std::map<std::string, std::string> variation_params;
41 if (!::variations::GetVariationParams(kFieldTrialName, &variation_params)) 41 if (!::variations::GetVariationParams(kFieldTrialName, &variation_params))
42 return std::vector<base::SchedulerWorkerPoolParams>(); 42 return std::vector<base::SchedulerWorkerPoolParams>();
43 43
44 std::vector<SchedulerImmutableWorkerPoolParams> immutable_worker_pool_params; 44 std::vector<SchedulerImmutableWorkerPoolParams> immutable_worker_pool_params;
45 DCHECK_EQ(BACKGROUND, immutable_worker_pool_params.size()); 45 DCHECK_EQ(BACKGROUND, immutable_worker_pool_params.size());
46 immutable_worker_pool_params.emplace_back("Background", 46 immutable_worker_pool_params.emplace_back("Background",
47 ThreadPriority::BACKGROUND); 47 ThreadPriority::BACKGROUND);
48 DCHECK_EQ(BACKGROUND_FILE_IO, immutable_worker_pool_params.size()); 48 DCHECK_EQ(BACKGROUND_BLOCKING, immutable_worker_pool_params.size());
49 immutable_worker_pool_params.emplace_back("BackgroundFileIO", 49 immutable_worker_pool_params.emplace_back("BackgroundBlocking",
50 ThreadPriority::BACKGROUND); 50 ThreadPriority::BACKGROUND);
51 DCHECK_EQ(FOREGROUND, immutable_worker_pool_params.size()); 51 DCHECK_EQ(FOREGROUND, immutable_worker_pool_params.size());
52 immutable_worker_pool_params.emplace_back("Foreground", 52 immutable_worker_pool_params.emplace_back("Foreground",
53 ThreadPriority::NORMAL); 53 ThreadPriority::NORMAL);
54 // Tasks posted to SequencedWorkerPool or BrowserThreadImpl may be redirected 54 // Tasks posted to SequencedWorkerPool or BrowserThreadImpl may be redirected
55 // to this pool. Since COM STA is initialized in these environments, it must 55 // to this pool. Since COM STA is initialized in these environments, it must
56 // also be initialized in this pool. 56 // also be initialized in this pool.
57 DCHECK_EQ(FOREGROUND_FILE_IO, immutable_worker_pool_params.size()); 57 DCHECK_EQ(FOREGROUND_BLOCKING, immutable_worker_pool_params.size());
58 immutable_worker_pool_params.emplace_back( 58 immutable_worker_pool_params.emplace_back(
59 "ForegroundFileIO", ThreadPriority::NORMAL, 59 "ForegroundBlocking", ThreadPriority::NORMAL,
60 base::SchedulerBackwardCompatibility::INIT_COM_STA); 60 base::SchedulerBackwardCompatibility::INIT_COM_STA);
61 61
62 return GetWorkerPoolParams(immutable_worker_pool_params, variation_params); 62 return GetWorkerPoolParams(immutable_worker_pool_params, variation_params);
63 } 63 }
64 64
65 size_t BrowserWorkerPoolIndexForTraits(const base::TaskTraits& traits) { 65 size_t BrowserWorkerPoolIndexForTraits(const base::TaskTraits& traits) {
66 const bool is_background = 66 const bool is_background =
67 traits.priority() == base::TaskPriority::BACKGROUND; 67 traits.priority() == base::TaskPriority::BACKGROUND;
68 if (traits.may_block() || traits.with_base_sync_primitives()) 68 if (traits.may_block() || traits.with_base_sync_primitives())
69 return is_background ? BACKGROUND_FILE_IO : FOREGROUND_FILE_IO; 69 return is_background ? BACKGROUND_BLOCKING : FOREGROUND_BLOCKING;
70 return is_background ? BACKGROUND : FOREGROUND; 70 return is_background ? BACKGROUND : FOREGROUND;
71 } 71 }
72 72
73 void MaybePerformBrowserTaskSchedulerRedirection() { 73 void MaybePerformBrowserTaskSchedulerRedirection() {
74 // TODO(gab): Remove this when http://crbug.com/622400 concludes. 74 // TODO(gab): Remove this when http://crbug.com/622400 concludes.
75 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 75 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
76 switches::kDisableBrowserTaskScheduler) && 76 switches::kDisableBrowserTaskScheduler) &&
77 variations::GetVariationParamValue( 77 variations::GetVariationParamValue(
78 kFieldTrialName, "RedirectSequencedWorkerPools") == "true") { 78 kFieldTrialName, "RedirectSequencedWorkerPools") == "true") {
79 const base::TaskPriority max_task_priority = 79 const base::TaskPriority max_task_priority =
80 variations::GetVariationParamValue( 80 variations::GetVariationParamValue(
81 kFieldTrialName, "CapSequencedWorkerPoolsAtUserVisible") == "true" 81 kFieldTrialName, "CapSequencedWorkerPoolsAtUserVisible") == "true"
82 ? base::TaskPriority::USER_VISIBLE 82 ? base::TaskPriority::USER_VISIBLE
83 : base::TaskPriority::HIGHEST; 83 : base::TaskPriority::HIGHEST;
84 base::SequencedWorkerPool::EnableWithRedirectionToTaskSchedulerForProcess( 84 base::SequencedWorkerPool::EnableWithRedirectionToTaskSchedulerForProcess(
85 max_task_priority); 85 max_task_priority);
86 } 86 }
87 } 87 }
88 88
89 } // namespace task_scheduler_util 89 } // namespace task_scheduler_util
OLDNEW
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | content/browser/browser_main_loop.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698