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

Unified Diff: base/task_scheduler/scheduler_thread_pool_impl.cc

Issue 1958973003: Revert of Name TaskScheduler's worker threads (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@b7_fdoray_fixtracing
Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: base/task_scheduler/scheduler_thread_pool_impl.cc
diff --git a/base/task_scheduler/scheduler_thread_pool_impl.cc b/base/task_scheduler/scheduler_thread_pool_impl.cc
index b514f0d8354aad5d1b0695a701ee156418b3f434..dc88a871b6e35b2e3d2df8a4a569f991f2dff1ac 100644
--- a/base/task_scheduler/scheduler_thread_pool_impl.cc
+++ b/base/task_scheduler/scheduler_thread_pool_impl.cc
@@ -3,8 +3,6 @@
// found in the LICENSE file.
#include "base/task_scheduler/scheduler_thread_pool_impl.h"
-
-#include <stddef.h>
#include <algorithm>
#include <utility>
@@ -15,10 +13,8 @@
#include "base/memory/ptr_util.h"
#include "base/sequenced_task_runner.h"
#include "base/single_thread_task_runner.h"
-#include "base/strings/stringprintf.h"
#include "base/task_scheduler/delayed_task_manager.h"
#include "base/task_scheduler/task_tracker.h"
-#include "base/threading/platform_thread.h"
#include "base/threading/thread_local.h"
#include "base/threading/thread_restrictions.h"
@@ -184,13 +180,11 @@
// |re_enqueue_sequence_callback| is invoked when ReEnqueueSequence() is
// called with a non-single-threaded Sequence. |shared_priority_queue| is a
// PriorityQueue whose transactions may overlap with the worker thread's
- // single-threaded PriorityQueue's transactions. |index| will be appended to
- // this thread's name to uniquely identify it.
+ // single-threaded PriorityQueue's transactions.
SchedulerWorkerThreadDelegateImpl(
SchedulerThreadPoolImpl* outer,
const ReEnqueueSequenceCallback& re_enqueue_sequence_callback,
- const PriorityQueue* shared_priority_queue,
- int index);
+ const PriorityQueue* shared_priority_queue);
~SchedulerWorkerThreadDelegateImpl() override;
PriorityQueue* single_threaded_priority_queue() {
@@ -214,8 +208,6 @@
// |single_threaded_priority_queue_|.
bool last_sequence_is_single_threaded_ = false;
- const int index_;
-
DISALLOW_COPY_AND_ASSIGN(SchedulerWorkerThreadDelegateImpl);
};
@@ -227,7 +219,6 @@
// static
std::unique_ptr<SchedulerThreadPoolImpl> SchedulerThreadPoolImpl::Create(
- StringPiece name,
ThreadPriority thread_priority,
size_t max_threads,
IORestriction io_restriction,
@@ -235,7 +226,7 @@
TaskTracker* task_tracker,
DelayedTaskManager* delayed_task_manager) {
std::unique_ptr<SchedulerThreadPoolImpl> thread_pool(
- new SchedulerThreadPoolImpl(name, io_restriction, task_tracker,
+ new SchedulerThreadPoolImpl(io_restriction, task_tracker,
delayed_task_manager));
if (thread_pool->Initialize(thread_priority, max_threads,
re_enqueue_sequence_callback)) {
@@ -377,12 +368,10 @@
SchedulerWorkerThreadDelegateImpl(
SchedulerThreadPoolImpl* outer,
const ReEnqueueSequenceCallback& re_enqueue_sequence_callback,
- const PriorityQueue* shared_priority_queue,
- int index)
+ const PriorityQueue* shared_priority_queue)
: outer_(outer),
re_enqueue_sequence_callback_(re_enqueue_sequence_callback),
- single_threaded_priority_queue_(shared_priority_queue),
- index_(index) {}
+ single_threaded_priority_queue_(shared_priority_queue) {}
SchedulerThreadPoolImpl::SchedulerWorkerThreadDelegateImpl::
~SchedulerWorkerThreadDelegateImpl() = default;
@@ -395,9 +384,6 @@
outer_->threads_created_.Wait();
DCHECK(ContainsWorkerThread(outer_->worker_threads_, worker_thread));
#endif
-
- PlatformThread::SetName(
- StringPrintf("%sWorker%d", outer_->name_.c_str(), index_));
DCHECK(!tls_current_worker_thread.Get().Get());
DCHECK(!tls_current_thread_pool.Get().Get());
@@ -480,12 +466,10 @@
}
SchedulerThreadPoolImpl::SchedulerThreadPoolImpl(
- StringPiece name,
IORestriction io_restriction,
TaskTracker* task_tracker,
DelayedTaskManager* delayed_task_manager)
- : name_(name.as_string()),
- io_restriction_(io_restriction),
+ : io_restriction_(io_restriction),
idle_worker_threads_stack_lock_(shared_priority_queue_.container_lock()),
idle_worker_threads_stack_cv_for_testing_(
idle_worker_threads_stack_lock_.CreateConditionVariable()),
@@ -510,9 +494,9 @@
for (size_t i = 0; i < max_threads; ++i) {
std::unique_ptr<SchedulerWorkerThread> worker_thread =
SchedulerWorkerThread::Create(
- thread_priority, WrapUnique(new SchedulerWorkerThreadDelegateImpl(
- this, re_enqueue_sequence_callback,
- &shared_priority_queue_, i)),
+ thread_priority,
+ WrapUnique(new SchedulerWorkerThreadDelegateImpl(
+ this, re_enqueue_sequence_callback, &shared_priority_queue_)),
task_tracker_);
if (!worker_thread)
break;
« no previous file with comments | « base/task_scheduler/scheduler_thread_pool_impl.h ('k') | base/task_scheduler/scheduler_thread_pool_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698