ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ThreadWithCallQueue unit test adjustment

Browse Source
This commit is contained in:
Vinnie Falco
2013-09-19 12:59:52 -07:00
parent 6501dea7a3
commit 68cf7599d8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/beast_core/thread/ThreadWithCallQueue.cpp
View File

@@ -106,7 +106,8 @@ bool ThreadWithCallQueue::interruptionPoint ()
// Interrupts the idle function by queueing a call that does nothing. // Interrupts the idle function by queueing a call that does nothing.
void ThreadWithCallQueue::interrupt () void ThreadWithCallQueue::interrupt ()
{ {
call (&ThreadWithCallQueue::doNothing); //call (&ThreadWithCallQueue::doNothing);
m_thread.interrupt();
} }
void ThreadWithCallQueue::doNothing () void ThreadWithCallQueue::doNothing ()
@@ -239,7 +240,7 @@ public:
{ {
default: default:
bassertfalse; bassertfalse;
#if 1 #if 0
case 0: threads[n]->call (&ThreadWithCallQueueTests::func1, this); break; case 0: threads[n]->call (&ThreadWithCallQueueTests::func1, this); break;
case 1: threads[n]->call (&ThreadWithCallQueueTests::func2, this); break; case 1: threads[n]->call (&ThreadWithCallQueueTests::func2, this); break;
case 2: threads[n]->call (&ThreadWithCallQueueTests::func3, this); break; case 2: threads[n]->call (&ThreadWithCallQueueTests::func3, this); break;
@@ -251,10 +252,12 @@ public:
}; };
} }
#if 0
for (int i = 0; i < threads.size(); ++i) for (int i = 0; i < threads.size(); ++i)
{ {
expect (threads[i]->interruptedOnce); expect (threads[i]->interruptedOnce);
} }
#endif
for (int i = 0; i < threads.size(); ++i) for (int i = 0; i < threads.size(); ++i)
threads[i]->stop (false); threads[i]->stop (false);