Commit 8c8de084 by Sachin Basil John

Added check for number of cores in test task before affinity is checked

parent 3577c136
...@@ -37,91 +37,97 @@ ...@@ -37,91 +37,97 @@
#define TASK_TEST_ID 23 #define TASK_TEST_ID 23
static void testTaskAction( static void testTaskAction(
char const * msg, char const * msg,
std::string * output, std::string * output,
embb::tasks::TaskContext & /*context*/) { embb::tasks::TaskContext & /*context*/) {
*output = msg; *output = msg;
} }
static void testRecursiveTaskAction( static void testRecursiveTaskAction(
int * value, int * value,
embb::tasks::TaskContext & /*context*/) { embb::tasks::TaskContext & /*context*/) {
embb::tasks::Node & node = embb::tasks::Node::GetInstance(); embb::tasks::Node & node = embb::tasks::Node::GetInstance();
*value = *value + 1; *value = *value + 1;
if (*value < 1000) { if (*value < 1000) {
embb::tasks::Task task = node.Spawn( embb::tasks::Task task = node.Spawn(
embb::base::Bind( embb::base::Bind(
testRecursiveTaskAction, value, embb::base::Placeholder::_1)); testRecursiveTaskAction, value, embb::base::Placeholder::_1));
task.Wait(MTAPI_INFINITE); task.Wait(MTAPI_INFINITE);
} }
PT_EXPECT(*value == 1000); PT_EXPECT(*value == 1000);
} }
static void testErrorTaskAction(embb::tasks::TaskContext & context) { static void testErrorTaskAction(embb::tasks::TaskContext & context) {
context.SetStatus(MTAPI_ERR_ACTION_FAILED); context.SetStatus(MTAPI_ERR_ACTION_FAILED);
} }
static void testDoSomethingElse() { static void testDoSomethingElse() {
} }
TaskTest::TaskTest() { TaskTest::TaskTest() {
CreateUnit("tasks_cpp task test").Add(&TaskTest::TestBasic, this); CreateUnit("tasks_cpp task test").Add(&TaskTest::TestBasic, this);
} }
void TaskTest::TestBasic() { void TaskTest::TestBasic() {
embb::tasks::Node::Initialize(THIS_DOMAIN_ID, THIS_NODE_ID); embb::tasks::Node::Initialize(THIS_DOMAIN_ID, THIS_NODE_ID);
embb::tasks::Node & node = embb::tasks::Node::GetInstance(); embb::tasks::Node & node = embb::tasks::Node::GetInstance();
embb::tasks::ExecutionPolicy policy(false); embb::tasks::ExecutionPolicy policy(false);
PT_EXPECT_EQ(policy.GetAffinity(), 0u); PT_EXPECT_EQ(policy.GetAffinity(), 0u);
PT_EXPECT_EQ(policy.GetPriority(), 0u); PT_EXPECT_EQ(policy.GetPriority(), 0u);
policy.AddWorker(0u); policy.AddWorker(0u);
PT_EXPECT_EQ(policy.GetAffinity(), 1u); PT_EXPECT_EQ(policy.GetAffinity(), 1u);
policy.AddWorker(1u);
PT_EXPECT_EQ(policy.GetAffinity(), 3u); if (policy.GetCoreCount() > 1) {
policy.RemoveWorker(0u); policy.AddWorker(1u);
PT_EXPECT_EQ(policy.GetAffinity(), 2u); PT_EXPECT_EQ(policy.GetAffinity(), 3u);
PT_EXPECT_EQ(policy.IsSetWorker(0), false); }
PT_EXPECT_EQ(policy.IsSetWorker(1), true);
policy.RemoveWorker(0u);
std::string test; PT_EXPECT_EQ(policy.IsSetWorker(0), false);
embb::tasks::Task task = node.Spawn(
embb::base::Bind( if (policy.GetCoreCount() > 1) {
testTaskAction, "simple", &test, embb::base::Placeholder::_1)); PT_EXPECT_EQ(policy.GetAffinity(), 2u);
testDoSomethingElse(); PT_EXPECT_EQ(policy.IsSetWorker(1), true);
task.Wait(MTAPI_INFINITE); }
PT_EXPECT(test == "simple"); std::string test;
embb::tasks::Task task = node.Spawn(
std::string test1, test2, test3; embb::base::Bind(
task = node.First( testTaskAction, "simple", &test, embb::base::Placeholder::_1));
embb::base::Bind( testDoSomethingElse();
testTaskAction, "first", &test1, embb::base::Placeholder::_1)). task.Wait(MTAPI_INFINITE);
Then(embb::base::Bind( PT_EXPECT(test == "simple");
testTaskAction, "second", &test2, embb::base::Placeholder::_1)).
Then(embb::base::Bind( std::string test1, test2, test3;
testTaskAction, "third", &test3, embb::base::Placeholder::_1)). task = node.First(
Spawn(); embb::base::Bind(
testDoSomethingElse(); testTaskAction, "first", &test1, embb::base::Placeholder::_1)).
task.Wait(MTAPI_INFINITE); Then(embb::base::Bind(
PT_EXPECT(test1 == "first"); testTaskAction, "second", &test2, embb::base::Placeholder::_1)).
PT_EXPECT(test2 == "second"); Then(embb::base::Bind(
PT_EXPECT(test3 == "third"); testTaskAction, "third", &test3, embb::base::Placeholder::_1)).
Spawn();
int value = 0; testDoSomethingElse();
task = node.Spawn( task.Wait(MTAPI_INFINITE);
embb::base::Bind( PT_EXPECT(test1 == "first");
testRecursiveTaskAction, &value, embb::base::Placeholder::_1)); PT_EXPECT(test2 == "second");
task.Wait(MTAPI_INFINITE); PT_EXPECT(test3 == "third");
PT_EXPECT(value == 1000);
int value = 0;
mtapi_status_t status; task = node.Spawn(
task = node.Spawn(testErrorTaskAction); embb::base::Bind(
testDoSomethingElse(); testRecursiveTaskAction, &value, embb::base::Placeholder::_1));
status = task.Wait(MTAPI_INFINITE); task.Wait(MTAPI_INFINITE);
PT_EXPECT(MTAPI_ERR_ACTION_FAILED == status); PT_EXPECT(value == 1000);
embb::tasks::Node::Finalize(); mtapi_status_t status;
task = node.Spawn(testErrorTaskAction);
PT_EXPECT(embb_get_bytes_allocated() == 0); testDoSomethingElse();
status = task.Wait(MTAPI_INFINITE);
PT_EXPECT(MTAPI_ERR_ACTION_FAILED == status);
embb::tasks::Node::Finalize();
PT_EXPECT(embb_get_bytes_allocated() == 0);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment