refactor task intance to contain a task struct inside

vovatrykoz · Nov 13, 2024 · 9e6ce43 · 9e6ce43
1 parent 2682a7d
commit 9e6ce43
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/include/Task.h b/include/Task.h
@@ -9,10 +9,11 @@ struct Task {
 };
 
 struct TaskInstance {
+    Task baseTask;
     int activationTime;
-    int wcet;
 
-    TaskInstance(int activationTime, int wcet) : activationTime(activationTime), wcet(wcet) {}
+    TaskInstance(const Task& baseTask, int activationTime)
+        : baseTask(baseTask), activationTime(activationTime) {}
 };
 
 #endif
diff --git a/source/MathFramework.cpp b/source/MathFramework.cpp
@@ -12,7 +12,7 @@ bool att(const TaskInstance& writerTaskInstance,
 bool crit(const TaskInstance& writerTaskInstance,
           const TaskInstance& readerTaskInstance) {
     int writerTaskTerminationTime =
-        writerTaskInstance.activationTime + writerTaskInstance.wcet;
+        writerTaskInstance.activationTime + writerTaskInstance.baseTask.wcet;
 
     if (readerTaskInstance.activationTime < writerTaskTerminationTime) {
         return true;

diff --git a/tests/MathFrameworkTests.cpp b/tests/MathFrameworkTests.cpp
@@ -2,41 +2,53 @@
 #include <gtest/gtest.h>
 
 TEST(MathFramework, CanDetectTimeTravel) {
-    const TaskInstance writerTask(10, 5);
-    const TaskInstance readerTask(5, 5);
+    Task writerTask(10, 5);
+    Task readerTask(5, 5);
+
+    TaskInstance writerTaskInstance(writerTask, 10);
+    TaskInstance readerTaskInstance(readerTask, 5);
 
     bool expected = true;
-    bool actual = att(writerTask, readerTask);
+    bool actual = att(writerTaskInstance, readerTaskInstance);
 
     EXPECT_EQ(expected, actual);
 }
 
 TEST(MathFramework, CanDetectWhenThereIsNoTimeTravel) {
-    const TaskInstance writerTask(5, 5);
-    const TaskInstance readerTask(10, 5);
+    Task writerTask(10, 5);
+    Task readerTask(5, 5);
+
+    TaskInstance writerTaskInstance(writerTask, 5);
+    TaskInstance readerTaskInstance(readerTask, 10);
 
     bool expected = false;
-    bool actual = att(writerTask, readerTask);
+    bool actual = att(writerTaskInstance, readerTaskInstance);
 
     EXPECT_EQ(expected, actual);
 }
 
 TEST(MathFramework, CritFunctionCanDetectExecutionOverlap) {
-    const TaskInstance writerTask(10, 5);
-    const TaskInstance readerTask(12, 5);
+    Task writerTask(10, 5);
+    Task readerTask(5, 5);
+
+    TaskInstance writerTaskInstance(writerTask, 10);
+    TaskInstance readerTaskInstance(readerTask, 12);
 
     bool expected = true;
-    bool actual = crit(writerTask, readerTask);
+    bool actual = crit(writerTaskInstance, readerTaskInstance);
 
     EXPECT_EQ(expected, actual);
 }
 
 TEST(MathFramework, CritFunctionCanDetectWhenThereIsNoExecutionOverlap) {
-    const TaskInstance writerTask(10, 5);
-    const TaskInstance readerTask(16, 5);
+    Task writerTask(10, 5);
+    Task readerTask(5, 5);
+
+    TaskInstance writerTaskInstance(writerTask, 10);
+    TaskInstance readerTaskInstance(readerTask, 16);
 
     bool expected = false;
-    bool actual = crit(writerTask, readerTask);
+    bool actual = crit(writerTaskInstance, readerTaskInstance);
 
     EXPECT_EQ(expected, actual);
 }