Modifications to scheduler & abstract schedule class. ready to test

UCSD-E4E · Jul 31, 2024 · 7ddb266 · 7ddb266
1 parent 13ca202
commit 7ddb266
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 163 deletions.
diff --git a/src/a_scheduler.cpp b/src/a_scheduler.cpp
@@ -1,10 +1,11 @@
 #include "a_scheduler.hpp"
 
 
-Scheduler:: Scheduler(DeploymentSchedule_t schedule[], int length): AbstractScheduler(schedule){
+Scheduler:: Scheduler(DeploymentSchedule_t schedule[]){
     tasks=schedule;
-    numTasks=length;
-   for(int i=0; i<numTasks; i++){
+
+    int i=0;
+   for(; tasks[i].measure; i++){
         if(i=0){
         tasks[i].startDelay=0;
         }else {
@@ -14,6 +15,7 @@ Scheduler:: Scheduler(DeploymentSchedule_t schedule[], int length): AbstractSche
         }
 
     }
+    int numTasks=i-1;
 
 }
 

diff --git a/src/a_scheduler.hpp b/src/a_scheduler.hpp
@@ -8,7 +8,7 @@ class Scheduler : public AbstractScheduler{
    DeploymentSchedule_t * tasks;
    int numTasks;
    public:
-    Scheduler(DeploymentSchedule_t schedule[], int length);
+    Scheduler(DeploymentSchedule_t schedule[]);
     int getNextTask(const DeploymentSchedule_t* p_next_task,
                     std::uint32_t* p_next_runtime,
                     std::uint32_t current_time);

diff --git a/src/abstractScheduler.hpp b/src/abstractScheduler.hpp
@@ -10,7 +10,7 @@
 
 class AbstractScheduler {
     public:
-    AbstractScheduler(DeploymentSchedule_t schedule[]);
+
     /**
      * Creates and initializes the schedule
      */
@@ -33,7 +33,5 @@ class AbstractScheduler {
                     std::uint32_t* p_next_runtime,
                     std::uint32_t current_time) = 0;
 };
-inline AbstractScheduler::AbstractScheduler(DeploymentSchedule_t *schedule){
 
-}
 #endif // __ABSTRACT_SCHEDULER_HPP__
diff --git a/src/scheduler.hpp b/src/scheduler.hpp