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

Unified Diff: chrome/browser/task_management/sampling/task_group.cc

Issue 2028753002: Make Task Manager sort more meaningful (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unittest Created 4 years, 6 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: chrome/browser/task_management/sampling/task_group.cc
diff --git a/chrome/browser/task_management/sampling/task_group.cc b/chrome/browser/task_management/sampling/task_group.cc
index b8bd59d92e1d37d6d993800e0049c92fca5bf080..8fc2ffc8ccfbdb2ecc1ddef3fc84d13dcfdf905e 100644
--- a/chrome/browser/task_management/sampling/task_group.cc
+++ b/chrome/browser/task_management/sampling/task_group.cc
@@ -4,6 +4,9 @@
#include "chrome/browser/task_management/sampling/task_group.h"
+#include <algorithm>
+#include <limits>
+
#include "base/bind.h"
#include "base/callback.h"
#include "base/stl_util.h"
@@ -112,17 +115,12 @@ TaskGroup::~TaskGroup() {
void TaskGroup::AddTask(Task* task) {
DCHECK(task);
- DCHECK(task->process_id() == process_id_);
- DCHECK(!ContainsKey(tasks_, task->task_id()));
-
- tasks_[task->task_id()] = task;
+ tasks_.push_back(task);
}
void TaskGroup::RemoveTask(Task* task) {
DCHECK(task);
- DCHECK(ContainsKey(tasks_, task->task_id()));
-
- tasks_.erase(task->task_id());
+ tasks_.erase(std::remove(tasks_.begin(), tasks_.end(), task), tasks_.end());
}
void TaskGroup::Refresh(const gpu::VideoMemoryUsageStats& gpu_memory_stats,
@@ -140,8 +138,7 @@ void TaskGroup::Refresh(const gpu::VideoMemoryUsageStats& gpu_memory_stats,
TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_NETWORK_USAGE,
refresh_flags);
per_process_network_usage_ = network_usage_refresh_enabled ? 0 : -1;
- for (auto& task_pair : tasks_) {
- Task* task = task_pair.second;
+ for (Task* task : tasks_) {
task->Refresh(update_interval, refresh_flags);
if (network_usage_refresh_enabled && task->ReportsNetworkUsage())
@@ -167,7 +164,7 @@ void TaskGroup::Refresh(const gpu::VideoMemoryUsageStats& gpu_memory_stats,
if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_NACL,
refresh_flags) &&
!tasks_.empty()) {
- RefreshNaClDebugStubPort(tasks_.begin()->second->GetChildProcessUniqueID());
+ RefreshNaClDebugStubPort(tasks_[0]->GetChildProcessUniqueID());
}
#endif // !defined(DISABLE_NACL)
@@ -181,18 +178,13 @@ void TaskGroup::Refresh(const gpu::VideoMemoryUsageStats& gpu_memory_stats,
worker_thread_sampler_->Refresh(refresh_flags);
}
-void TaskGroup::AppendSortedTaskIds(TaskIdList* out_list) const {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- DCHECK(out_list);
-
- for (const auto& task_pair : tasks_)
- out_list->push_back(task_pair.first);
-}
-
Task* TaskGroup::GetTaskById(TaskId task_id) const {
- auto it = tasks_.find(task_id);
- DCHECK(it != tasks_.end());
- return it->second;
+ for (Task* task : tasks_) {
+ if (task->task_id() == task_id)
+ return task;
+ }
+ NOTREACHED();
+ return nullptr;
}
void TaskGroup::ClearCurrentBackgroundCalculationsFlags() {
« no previous file with comments | « chrome/browser/task_management/sampling/task_group.h ('k') | chrome/browser/task_management/sampling/task_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698