Add TaskScheduler::InitParams and accept it in TaskSchedulerImpl constructor.

base/task_scheduler/task_scheduler_impl.cc

 // Copyright 2016 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 "base/task_scheduler/task_scheduler_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "base/task_scheduler/delayed_task_manager.h"
 #include "base/task_scheduler/scheduler_single_thread_task_runner_manager.h"
 #include "base/task_scheduler/scheduler_worker_pool_params.h"
 #include "base/task_scheduler/sequence_sort_key.h"
 #include "base/task_scheduler/task.h"
 #include "base/task_scheduler/task_tracker.h"
 #include "build/build_config.h"
 
 #if defined(OS_POSIX) && !defined(OS_NACL_SFI)
 #include "base/task_scheduler/task_tracker_posix.h"
 #endif
 
 namespace base {
 namespace internal {
 
+namespace {
+
+enum EnvironmentType {
+  BACKGROUND = 0,
+  BACKGROUND_BLOCKING,
+  FOREGROUND,
+  FOREGROUND_BLOCKING,
+  ENVIRONMENT_COUNT  // Always last.
+};
+
+// Order must match the EnvironmentType enum.
+constexpr struct {
+  // The threads and histograms of this environment will be labeled with
+  // task scheduler name + |name_suffix|.

[robliao, 2017/03/23 18:00:52]

Might be clearer to say the name from InitParams + |name_suffix|

[fdoray, 2017/03/24 14:00:38]

We don't use the name from InitParams, we use the |name| argument of
TaskSchedulerImpl::Create() + |name_suffix|.

+  const char* name_suffix;
+
+  // Preferred priority for threads in this environment; the actual thread
+  // priority depends on shutdown state and platform capabilities.
+  ThreadPriority priority_hint;
+
+  // Offset of the SchedulerWorkerPoolParams corresponding to this environement
+  // in TaskSchedulerInitParams.

[robliao, 2017/03/23 18:00:52]

Worth discussing that this allows us to easily use a for loop to get the right
init params.

[fdoray, 2017/03/24 14:00:38]

Done.

+  size_t offset;
+} kEnvironmentParams[] = {
+    {"Background", base::ThreadPriority::BACKGROUND,
+     offsetof(TaskScheduler::InitParams, background_worker_pool_params)},
+    {"BackgroundBlocking", base::ThreadPriority::BACKGROUND,
+     offsetof(TaskScheduler::InitParams,
+              background_blocking_worker_pool_params)},
+    {"Foreground", base::ThreadPriority::NORMAL,
+     offsetof(TaskScheduler::InitParams, foreground_worker_pool_params)},
+    {"ForegroundBlocking", base::ThreadPriority::NORMAL,
+     offsetof(TaskScheduler::InitParams,
+              foreground_blocking_worker_pool_params)},
+};
+
+size_t GetEnvironmentIndexForTraits(const TaskTraits& traits) {
+  const bool is_background =
+      traits.priority() == base::TaskPriority::BACKGROUND;
+  if (traits.may_block() || traits.with_base_sync_primitives())
+    return is_background ? BACKGROUND_BLOCKING : FOREGROUND_BLOCKING;
+  return is_background ? BACKGROUND : FOREGROUND;
+}
+
+}  // namespace
+
 // static
 std::unique_ptr<TaskSchedulerImpl> TaskSchedulerImpl::Create(
     const std::vector<SchedulerWorkerPoolParams>& worker_pool_params_vector,
     const WorkerPoolIndexForTraitsCallback&
         worker_pool_index_for_traits_callback) {
   std::unique_ptr<TaskSchedulerImpl> scheduler(
       new TaskSchedulerImpl(worker_pool_index_for_traits_callback));
   scheduler->Initialize(worker_pool_params_vector);
   return scheduler;
 }
 
+// static
+std::unique_ptr<TaskSchedulerImpl> TaskSchedulerImpl::Create(
+    const std::string& name,
+    const TaskScheduler::InitParams& init_params) {
+  // Create a vector of SchedulerWorkerPoolParams using names and priority hints
+  // derived from |kEnvironmentParams| and other params from |init_params|.
+  std::vector<SchedulerWorkerPoolParams> worker_pool_params_vector;
+  for (const auto& environment_params : kEnvironmentParams) {
+    const SchedulerWorkerPoolParams& worker_pool_params_in =
+        *reinterpret_cast<const SchedulerWorkerPoolParams*>(
+            reinterpret_cast<const char*>(&init_params) +

[robliao, 2017/03/23 18:00:52]

Instead of const char*, should this be uintptr_t instead to allow for varying
bitness?

[fdoray, 2017/03/24 14:00:38]

Done.

+            environment_params.offset);
+    worker_pool_params_vector.emplace_back(
+        name + environment_params.name_suffix, environment_params.priority_hint,
+        worker_pool_params_in.standby_thread_policy(),
+        worker_pool_params_in.max_threads(),
+        worker_pool_params_in.suggested_reclaim_time(),
+        worker_pool_params_in.backward_compatibility());
+  }
+  DCHECK_EQ(static_cast<size_t>(ENVIRONMENT_COUNT),
+            worker_pool_params_vector.size());
+
+  return Create(worker_pool_params_vector, Bind(&GetEnvironmentIndexForTraits));
+}
+
 TaskSchedulerImpl::~TaskSchedulerImpl() {
 #if DCHECK_IS_ON()
   DCHECK(join_for_testing_returned_.IsSet());
 #endif
 }
 
 void TaskSchedulerImpl::PostDelayedTaskWithTraits(
     const tracked_objects::Location& from_here,
     const TaskTraits& traits,
     const Closure& task,
@@ skipping 143 matching lines @@
   // in |sequence|.
   const TaskTraits traits =
       sequence->PeekTaskTraits().WithPriority(sort_key.priority());
 
   GetWorkerPoolForTraits(traits)->ReEnqueueSequence(std::move(sequence),
                                                     sort_key);
 }
 
 }  // namespace internal
 }  // namespace base