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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/platform/scheduler/base/work_queue_unittest.cc

Issue 2786083005: scheduler: Maintain a constant enqueue order for every task (Closed)
Patch Set: Update VirtualTimeTest Created 3 years, 8 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
« third_party/WebKit/Source/platform/scheduler/base/work_queue.cc ('K') | « third_party/WebKit/Source/platform/scheduler/base/work_queue_sets_unittest.cc ('k') | third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/scheduler/base/work_queue_unittest.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/base/work_queue_unittest.cc b/third_party/WebKit/Source/platform/scheduler/base/work_queue_unittest.cc
index 2045fead77c9147569fd6dce6cc98316f9709fd3..67a5a8285a6322b295e5d62559e6b38ca2ced75e 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/work_queue_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/base/work_queue_unittest.cc
@@ -39,8 +39,7 @@ class WorkQueueTest : public testing::Test {
protected:
TaskQueueImpl::Task FakeTaskWithEnqueueOrder(int enqueue_order) {
alex clarke (OOO till 29th) 2017/04/13 07:46:00 s/int/uint65_t
Sami 2017/04/18 10:47:49 Done.
TaskQueueImpl::Task fake_task(FROM_HERE, base::Bind(&NopTask),
- base::TimeTicks(), 0, true);
- fake_task.set_enqueue_order(enqueue_order);
+ {base::TimeTicks(), enqueue_order}, true);
return fake_task;
}
@@ -75,7 +74,7 @@ TEST_F(WorkQueueTest, GetFrontTaskEnqueueOrder) {
EnqueueOrder enqueue_order;
EXPECT_TRUE(work_queue_->GetFrontTaskEnqueueOrder(&enqueue_order));
- EXPECT_EQ(2ull, enqueue_order);
+ EXPECT_EQ(2ull, enqueue_order.sequence_num);
}
TEST_F(WorkQueueTest, GetFrontTaskQueueEmpty) {
@@ -88,7 +87,7 @@ TEST_F(WorkQueueTest, GetFrontTask) {
work_queue_->Push(FakeTaskWithEnqueueOrder(4));
ASSERT_NE(nullptr, work_queue_->GetFrontTask());
- EXPECT_EQ(2ull, work_queue_->GetFrontTask()->enqueue_order());
+ EXPECT_EQ(2ull, work_queue_->GetFrontTask()->enqueue_order().sequence_num);
}
TEST_F(WorkQueueTest, GetBackTask_Empty) {
@@ -101,7 +100,7 @@ TEST_F(WorkQueueTest, GetBackTask) {
work_queue_->Push(FakeTaskWithEnqueueOrder(4));
ASSERT_NE(nullptr, work_queue_->GetBackTask());
- EXPECT_EQ(4ull, work_queue_->GetBackTask()->enqueue_order());
+ EXPECT_EQ(4ull, work_queue_->GetBackTask()->enqueue_order().sequence_num);
}
TEST_F(WorkQueueTest, Push) {
@@ -136,10 +135,10 @@ TEST_F(WorkQueueTest, ReloadEmptyImmediateQueue) {
EXPECT_FALSE(work_queue_->Empty());
ASSERT_NE(nullptr, work_queue_->GetFrontTask());
- EXPECT_EQ(2ull, work_queue_->GetFrontTask()->enqueue_order());
+ EXPECT_EQ(2ull, work_queue_->GetFrontTask()->enqueue_order().sequence_num);
ASSERT_NE(nullptr, work_queue_->GetBackTask());
- EXPECT_EQ(4ull, work_queue_->GetBackTask()->enqueue_order());
+ EXPECT_EQ(4ull, work_queue_->GetBackTask()->enqueue_order().sequence_num);
}
TEST_F(WorkQueueTest, ReloadEmptyImmediateQueueAfterFenceHit) {
@@ -157,10 +156,10 @@ TEST_F(WorkQueueTest, ReloadEmptyImmediateQueueAfterFenceHit) {
EXPECT_FALSE(work_queue_->Empty());
ASSERT_NE(nullptr, work_queue_->GetFrontTask());
- EXPECT_EQ(2ull, work_queue_->GetFrontTask()->enqueue_order());
+ EXPECT_EQ(2ull, work_queue_->GetFrontTask()->enqueue_order().sequence_num);
ASSERT_NE(nullptr, work_queue_->GetBackTask());
- EXPECT_EQ(4ull, work_queue_->GetBackTask()->enqueue_order());
+ EXPECT_EQ(4ull, work_queue_->GetBackTask()->enqueue_order().sequence_num);
}
TEST_F(WorkQueueTest, TakeTaskFromWorkQueue) {
@@ -172,9 +171,12 @@ TEST_F(WorkQueueTest, TakeTaskFromWorkQueue) {
EXPECT_TRUE(work_queue_sets_->GetOldestQueueInSet(0, &work_queue));
EXPECT_FALSE(work_queue_->Empty());
- EXPECT_EQ(2ull, work_queue_->TakeTaskFromWorkQueue().enqueue_order());
- EXPECT_EQ(3ull, work_queue_->TakeTaskFromWorkQueue().enqueue_order());
- EXPECT_EQ(4ull, work_queue_->TakeTaskFromWorkQueue().enqueue_order());
+ EXPECT_EQ(2ull,
+ work_queue_->TakeTaskFromWorkQueue().enqueue_order().sequence_num);
+ EXPECT_EQ(3ull,
+ work_queue_->TakeTaskFromWorkQueue().enqueue_order().sequence_num);
+ EXPECT_EQ(4ull,
+ work_queue_->TakeTaskFromWorkQueue().enqueue_order().sequence_num);
EXPECT_FALSE(work_queue_sets_->GetOldestQueueInSet(0, &work_queue));
EXPECT_TRUE(work_queue_->Empty());
@@ -191,7 +193,8 @@ TEST_F(WorkQueueTest, TakeTaskFromWorkQueue_HitFence) {
EXPECT_FALSE(work_queue_->Empty());
EXPECT_FALSE(work_queue_->BlockedByFence());
- EXPECT_EQ(2ull, work_queue_->TakeTaskFromWorkQueue().enqueue_order());
+ EXPECT_EQ(2ull,
+ work_queue_->TakeTaskFromWorkQueue().enqueue_order().sequence_num);
EXPECT_FALSE(work_queue_sets_->GetOldestQueueInSet(0, &work_queue));
EXPECT_FALSE(work_queue_->Empty());
EXPECT_TRUE(work_queue_->BlockedByFence());
@@ -219,7 +222,8 @@ TEST_F(WorkQueueTest, InsertFenceAfterEnqueueingNonBlocking) {
EnqueueOrder enqueue_order;
EXPECT_TRUE(work_queue_->GetFrontTaskEnqueueOrder(&enqueue_order));
- EXPECT_EQ(2ull, work_queue_->TakeTaskFromWorkQueue().enqueue_order());
+ EXPECT_EQ(2ull,
+ work_queue_->TakeTaskFromWorkQueue().enqueue_order().sequence_num);
}
TEST_F(WorkQueueTest, InsertFenceAfterEnqueueing) {
@@ -247,9 +251,10 @@ TEST_F(WorkQueueTest, InsertNewFence) {
// Note until TakeTaskFromWorkQueue() is called we don't hit the fence.
EnqueueOrder enqueue_order;
EXPECT_TRUE(work_queue_->GetFrontTaskEnqueueOrder(&enqueue_order));
- EXPECT_EQ(2ull, enqueue_order);
+ EXPECT_EQ(2ull, enqueue_order.sequence_num);
- EXPECT_EQ(2ull, work_queue_->TakeTaskFromWorkQueue().enqueue_order());
+ EXPECT_EQ(2ull,
+ work_queue_->TakeTaskFromWorkQueue().enqueue_order().sequence_num);
EXPECT_FALSE(work_queue_->GetFrontTaskEnqueueOrder(&enqueue_order));
EXPECT_TRUE(work_queue_->BlockedByFence());
@@ -259,8 +264,9 @@ TEST_F(WorkQueueTest, InsertNewFence) {
EXPECT_FALSE(work_queue_->BlockedByFence());
EXPECT_TRUE(work_queue_->GetFrontTaskEnqueueOrder(&enqueue_order));
- EXPECT_EQ(4ull, enqueue_order);
- EXPECT_EQ(4ull, work_queue_->TakeTaskFromWorkQueue().enqueue_order());
+ EXPECT_EQ(4ull, enqueue_order.sequence_num);
+ EXPECT_EQ(4ull,
+ work_queue_->TakeTaskFromWorkQueue().enqueue_order().sequence_num);
EXPECT_TRUE(work_queue_->GetFrontTaskEnqueueOrder(&enqueue_order));
EXPECT_FALSE(work_queue_->BlockedByFence());
}
@@ -282,13 +288,15 @@ TEST_F(WorkQueueTest, RemoveFence) {
EXPECT_TRUE(work_queue_sets_->GetOldestQueueInSet(0, &work_queue));
EXPECT_FALSE(work_queue_->Empty());
- EXPECT_EQ(2ull, work_queue_->TakeTaskFromWorkQueue().enqueue_order());
+ EXPECT_EQ(2ull,
+ work_queue_->TakeTaskFromWorkQueue().enqueue_order().sequence_num);
EXPECT_FALSE(work_queue_sets_->GetOldestQueueInSet(0, &work_queue));
EXPECT_FALSE(work_queue_->Empty());
EXPECT_TRUE(work_queue_->BlockedByFence());
EXPECT_TRUE(work_queue_->RemoveFence());
- EXPECT_EQ(4ull, work_queue_->TakeTaskFromWorkQueue().enqueue_order());
+ EXPECT_EQ(4ull,
+ work_queue_->TakeTaskFromWorkQueue().enqueue_order().sequence_num);
EXPECT_TRUE(work_queue_sets_->GetOldestQueueInSet(0, &work_queue));
EXPECT_FALSE(work_queue_->BlockedByFence());
}
@@ -316,7 +324,8 @@ TEST_F(WorkQueueTest, BlockedByFencePopBecomesEmpty) {
EXPECT_FALSE(work_queue_->InsertFence(2));
EXPECT_FALSE(work_queue_->BlockedByFence());
- EXPECT_EQ(1ull, work_queue_->TakeTaskFromWorkQueue().enqueue_order());
+ EXPECT_EQ(1ull,
+ work_queue_->TakeTaskFromWorkQueue().enqueue_order().sequence_num);
EXPECT_TRUE(work_queue_->BlockedByFence());
}
@@ -328,7 +337,8 @@ TEST_F(WorkQueueTest, BlockedByFencePop) {
work_queue_->Push(FakeTaskWithEnqueueOrder(3));
EXPECT_FALSE(work_queue_->BlockedByFence());
- EXPECT_EQ(1ull, work_queue_->TakeTaskFromWorkQueue().enqueue_order());
+ EXPECT_EQ(1ull,
+ work_queue_->TakeTaskFromWorkQueue().enqueue_order().sequence_num);
EXPECT_TRUE(work_queue_->BlockedByFence());
}
@@ -349,7 +359,8 @@ TEST_F(WorkQueueTest, BlockedByFenceNewFenceUnblocks) {
work_queue_->Push(FakeTaskWithEnqueueOrder(3));
EXPECT_FALSE(work_queue_->BlockedByFence());
- EXPECT_EQ(1ull, work_queue_->TakeTaskFromWorkQueue().enqueue_order());
+ EXPECT_EQ(1ull,
+ work_queue_->TakeTaskFromWorkQueue().enqueue_order().sequence_num);
EXPECT_TRUE(work_queue_->BlockedByFence());
EXPECT_TRUE(work_queue_->InsertFence(4));
« third_party/WebKit/Source/platform/scheduler/base/work_queue.cc ('K') | « third_party/WebKit/Source/platform/scheduler/base/work_queue_sets_unittest.cc ('k') | third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698