Hash :
44c6effd
Author :
Date :
2023-09-20T11:21:49
Fix potential timeout of FixedQueue.ConcurrentPushPop test The test some times times out in bots. I think what happens is that when dequeue thread went to sleep and then wake up, during sleep the enqueue thread already finished and exited (maybe because of timer runs out), then it will forever stuck in the while loop. This CL adds the check for other thread is finished or not and exit while loop if other thread has finished. Bug: b/301283364 Change-Id: Id6d846600b1749ce0bcb7b080b3b8ce3ad3d1dc4 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4879083 Commit-Queue: Charlie Lao <cclao@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186
//
// Copyright 2023 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// CircularBuffer_unittest:
// Tests of the CircularBuffer class
//
#include <gtest/gtest.h>
#include "common/FixedQueue.h"
#include <chrono>
#include <thread>
namespace angle
{
// Make sure the various constructors compile and do basic checks
TEST(FixedQueue, Constructors)
{
FixedQueue<int, 5> q;
EXPECT_EQ(0u, q.size());
EXPECT_EQ(true, q.empty());
}
// Make sure the destructor destroys all elements.
TEST(FixedQueue, Destructor)
{
struct s
{
s() : counter(nullptr) {}
s(int *c) : counter(c) {}
~s()
{
if (counter)
{
++*counter;
}
}
s(const s &) = default;
s &operator=(const s &) = default;
int *counter;
};
int destructorCount = 0;
{
FixedQueue<s, 11> q;
q.push(s(&destructorCount));
// Destructor called once for the temporary above.
EXPECT_EQ(1, destructorCount);
}
// Destructor should be called one more time for the element we pushed.
EXPECT_EQ(2, destructorCount);
}
// Make sure the pop destroys the element.
TEST(FixedQueue, Pop)
{
struct s
{
s() : counter(nullptr) {}
s(int *c) : counter(c) {}
~s()
{
if (counter)
{
++*counter;
}
}
s(const s &) = default;
s &operator=(const s &s)
{
// increment if we are overwriting the custom initialized object
if (counter)
{
++*counter;
}
counter = s.counter;
return *this;
}
int *counter;
};
int destructorCount = 0;
FixedQueue<s, 11> q;
q.push(s(&destructorCount));
// Destructor called once for the temporary above.
EXPECT_EQ(1, destructorCount);
q.pop();
// Copy assignment should be called for the element we popped.
EXPECT_EQ(2, destructorCount);
}
// Test circulating behavior.
TEST(FixedQueue, WrapAround)
{
FixedQueue<int, 7> q;
for (int i = 0; i < 7; ++i)
{
q.push(i);
}
EXPECT_EQ(0, q.front());
q.pop();
// This should wrap around
q.push(7);
for (int i = 0; i < 7; ++i)
{
EXPECT_EQ(i + 1, q.front());
q.pop();
}
}
// Test concurrent push and pop behavior.
TEST(FixedQueue, ConcurrentPushPop)
{
FixedQueue<uint64_t, 7> q;
double timeOut = 1.0;
uint64_t kMaxLoop = 1000000ull;
std::atomic<bool> enqueueThreadFinished;
enqueueThreadFinished = false;
std::atomic<bool> dequeueThreadFinished;
dequeueThreadFinished = false;
std::thread enqueueThread = std::thread([&]() {
std::time_t t1 = std::time(nullptr);
uint64_t value = 0;
do
{
while (q.full() && !dequeueThreadFinished)
{
std::this_thread::sleep_for(std::chrono::microseconds(1));
}
q.push(value);
value++;
} while (difftime(std::time(nullptr), t1) < timeOut && value < kMaxLoop);
ASSERT(difftime(std::time(nullptr), t1) >= timeOut || value >= kMaxLoop);
enqueueThreadFinished = true;
});
std::thread dequeueThread = std::thread([&]() {
std::time_t t1 = std::time(nullptr);
uint64_t expectedValue = 0;
do
{
while (q.empty() && !enqueueThreadFinished)
{
std::this_thread::sleep_for(std::chrono::microseconds(1));
}
EXPECT_EQ(expectedValue, q.front());
// test pop
q.pop();
expectedValue++;
} while (difftime(std::time(nullptr), t1) < timeOut && expectedValue < kMaxLoop);
ASSERT(difftime(std::time(nullptr), t1) >= timeOut || expectedValue >= kMaxLoop);
dequeueThreadFinished = true;
});
enqueueThread.join();
dequeueThread.join();
}
// Test clearing the queue
TEST(FixedQueue, Clear)
{
FixedQueue<int, 5> q;
for (int i = 0; i < 5; ++i)
{
q.push(i);
}
q.clear();
EXPECT_EQ(0u, q.size());
EXPECT_EQ(true, q.empty());
}
} // namespace angle