mirror of
https://github.com/pocoproject/poco.git
synced 2025-10-27 19:10:20 +01:00
style and interface fixes for thread affinity
This commit is contained in:
@@ -246,7 +246,7 @@ TaskManagerTest::~TaskManagerTest()
|
||||
|
||||
void TaskManagerTest::testFinish()
|
||||
{
|
||||
TaskManager tm(ThreadPool::UNIFORM_DISTRIBUTION);
|
||||
TaskManager tm(ThreadPool::TAP_UNIFORM_DISTRIBUTION);
|
||||
TaskObserver to;
|
||||
tm.addObserver(Observer<TaskObserver, TaskStartedNotification>(to, &TaskObserver::taskStarted));
|
||||
tm.addObserver(Observer<TaskObserver, TaskCancelledNotification>(to, &TaskObserver::taskCancelled));
|
||||
@@ -281,7 +281,7 @@ void TaskManagerTest::testFinish()
|
||||
|
||||
void TaskManagerTest::testCancel()
|
||||
{
|
||||
TaskManager tm(ThreadPool::UNIFORM_DISTRIBUTION);
|
||||
TaskManager tm(ThreadPool::TAP_UNIFORM_DISTRIBUTION);
|
||||
TaskObserver to;
|
||||
tm.addObserver(Observer<TaskObserver, TaskStartedNotification>(to, &TaskObserver::taskStarted));
|
||||
tm.addObserver(Observer<TaskObserver, TaskCancelledNotification>(to, &TaskObserver::taskCancelled));
|
||||
@@ -315,7 +315,7 @@ void TaskManagerTest::testCancel()
|
||||
|
||||
void TaskManagerTest::testError()
|
||||
{
|
||||
TaskManager tm(ThreadPool::UNIFORM_DISTRIBUTION);
|
||||
TaskManager tm(ThreadPool::TAP_UNIFORM_DISTRIBUTION);
|
||||
TaskObserver to;
|
||||
tm.addObserver(Observer<TaskObserver, TaskStartedNotification>(to, &TaskObserver::taskStarted));
|
||||
tm.addObserver(Observer<TaskObserver, TaskCancelledNotification>(to, &TaskObserver::taskCancelled));
|
||||
@@ -348,7 +348,7 @@ void TaskManagerTest::testError()
|
||||
|
||||
void TaskManagerTest::testCustom()
|
||||
{
|
||||
TaskManager tm(ThreadPool::UNIFORM_DISTRIBUTION);
|
||||
TaskManager tm(ThreadPool::TAP_UNIFORM_DISTRIBUTION);
|
||||
|
||||
CustomTaskObserver<int> ti(0);
|
||||
tm.addObserver(
|
||||
@@ -431,7 +431,7 @@ void TaskManagerTest::testCustom()
|
||||
|
||||
void TaskManagerTest::testMultiTasks()
|
||||
{
|
||||
TaskManager tm(ThreadPool::UNIFORM_DISTRIBUTION);
|
||||
TaskManager tm(ThreadPool::TAP_UNIFORM_DISTRIBUTION);
|
||||
tm.start(new SimpleTask);
|
||||
tm.start(new SimpleTask);
|
||||
tm.start(new SimpleTask);
|
||||
@@ -447,7 +447,7 @@ void TaskManagerTest::testMultiTasks()
|
||||
|
||||
void TaskManagerTest::testCustomThreadPool()
|
||||
{
|
||||
ThreadPool tp(2, 5, 120, POCO_THREAD_STACK_SIZE, ThreadPool::UNIFORM_DISTRIBUTION);
|
||||
ThreadPool tp(2, 5, 120, POCO_THREAD_STACK_SIZE, ThreadPool::TAP_UNIFORM_DISTRIBUTION);
|
||||
TaskManager tm(tp);
|
||||
|
||||
// fill up the thread pool
|
||||
|
||||
@@ -38,9 +38,11 @@ ThreadPoolTest::~ThreadPoolTest()
|
||||
void ThreadPoolTest::startThreadPoolTest(int affinityPolicy)
|
||||
{
|
||||
int cpu = -1;
|
||||
if (affinityPolicy == static_cast<int>(ThreadPool::CUSTOM)) {
|
||||
if (affinityPolicy == static_cast<int>(ThreadPool::TAP_CUSTOM))
|
||||
{
|
||||
cpu = 0;
|
||||
}
|
||||
|
||||
ThreadPool pool(2, 3, 3, POCO_THREAD_STACK_SIZE, static_cast<ThreadPool::ThreadAffinityPolicy>(affinityPolicy));
|
||||
pool.setStackSize(1);
|
||||
|
||||
@@ -134,21 +136,25 @@ void ThreadPoolTest::startThreadPoolTest(int affinityPolicy)
|
||||
assert (pool.available() == 4);
|
||||
}
|
||||
|
||||
|
||||
void ThreadPoolTest::testThreadPool()
|
||||
{
|
||||
startThreadPoolTest(Poco::ThreadPool::OS_DEFAULT);
|
||||
startThreadPoolTest(Poco::ThreadPool::TAP_DEFAULT);
|
||||
}
|
||||
|
||||
|
||||
void ThreadPoolTest::testThreadPoolUniformDistribution()
|
||||
{
|
||||
startThreadPoolTest(Poco::ThreadPool::UNIFORM_DISTRIBUTION);
|
||||
startThreadPoolTest(Poco::ThreadPool::TAP_UNIFORM_DISTRIBUTION);
|
||||
}
|
||||
|
||||
|
||||
void ThreadPoolTest::testThreadPoolCustomDistribution()
|
||||
{
|
||||
startThreadPoolTest(Poco::ThreadPool::CUSTOM);
|
||||
startThreadPoolTest(Poco::ThreadPool::TAP_CUSTOM);
|
||||
}
|
||||
|
||||
|
||||
void ThreadPoolTest::setUp()
|
||||
{
|
||||
_event.reset();
|
||||
|
||||
Reference in New Issue
Block a user