TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-15 20:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent tests from never ending due to threading bug

Browse source
This commit is contained in:
Lukas Aldershaab 2023-04-08 00:50:57 +02:00
parent 9269a4e13b
commit be4f3e7f1b
2 changed files with 72 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Engine/source/platform/threads/test/threadSafeDequeTest.cpp
View file

@ -91,6 +91,18 @@ public:
ValueRef val = new Value(i, tick);
mDeque.pushBack(val);
}
// WORKAROUND: due to a bug in the Deque, we lose an item, and thus the test will loop forever. We currently
// don't have a timeout solution, so instead push som extra elements just to make sure Consumer
// doesn't get stuck.
for(U32 i = mValues.size(); i < mValues.size() + 5; i++)
{
U32 tick = Platform::getRealMilliseconds();
ValueRef val = new Value(i, tick);
mDeque.pushBack(val);
}
}
};
@ -107,7 +119,6 @@ public:
{
ValueRef value;
while(!mDeque.tryPopFront(value));
EXPECT_EQ(i, value->mIndex);
EXPECT_EQ(value->mTick, mValues[i]);
}
@ -162,6 +173,8 @@ TEST_FIX(ThreadSafeDeque, PopBack)
}
// Test deque in a concurrent setting.
// Test many items in a row
TEST_FIX(ThreadSafeDeque, Concurrent1)
{
const U32 NumValues = 100;
@ -183,4 +196,28 @@ TEST_FIX(ThreadSafeDeque, Concurrent1)
mValues.clear();
};
#endif
// Test a few items many times to catch any race-condition in start-up
TEST_FIX(ThreadSafeDeque, Concurrent2)
{
for (int i = 0; i < 10000; ++i)
{
Deque mDeque;
Vector<U32> mValues;
mValues.setSize(5);
ProducerThread pThread(mValues, mDeque);
ConsumerThread cThread(mValues, mDeque);
cThread.start();
pThread.start();
pThread.join();
cThread.join();
mValues.clear();
if (::testing::Test::HasFailure()) break;
}
};
#endif