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

threadsafeFreelist error reporting aug: get total and free values

Browse source 
gtest consumer lock prevention rev2- timeout baiilout
This commit is contained in:
AzaezelX 2023-07-12 13:20:09 -05:00
parent 581c54767b
commit c07d631b48
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -91,18 +91,6 @@ public:
ValueRef val = new Value(i, tick); ValueRef val = new Value(i, tick);
mDeque.pushBack(val); 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);
}
} }
}; };
@ -115,10 +103,27 @@ public:
virtual void run(void*) virtual void run(void*)
{ {
for(U32 i = 0; i < mValues.size(); i++) S32 timeOut = mValues.size() * 32;
U32 endTime = Platform::getRealMilliseconds() + timeOut;
for (U32 i = 0; i < mValues.size(); i++)
{ {
ValueRef value; ValueRef value;
while(!mDeque.tryPopFront(value)); bool timedOut = false;
while (!mDeque.tryPopFront(value))
{
if (timeOut && Platform::getRealMilliseconds() >= endTime)
{
timedOut = true;
break;
}
};
ASSERT_FALSE(timedOut)
<< "consumer thread timed out!";
if (timedOut) return;
EXPECT_EQ(i, value->mIndex); EXPECT_EQ(i, value->mIndex);
EXPECT_EQ(value->mTick, mValues[i]); EXPECT_EQ(value->mTick, mValues[i]);
} }

2
Engine/source/platform/threads/threadSafeFreeList.h
View file

@ -85,7 +85,7 @@ class ThreadSafeFreeList
{ {
#ifdef TORQUE_DEBUG #ifdef TORQUE_DEBUG
AssertWarn( mNumNodesTotal == mNumNodesFree, AssertWarn( mNumNodesTotal == mNumNodesFree,
"ThreadSafeFreeList::~ThreadSafeFreeList() - still got live instances" ); avar("ThreadSafeFreeList::~ThreadSafeFreeList() - still got live instances:[%i/%i]", mNumNodesTotal,mNumNodesFree) );
#endif #endif
// Destroy remaining nodes. Not synchronized. We assume all // Destroy remaining nodes. Not synchronized. We assume all