edits to a_scheduler

UCSD-E4E · Aug 5, 2024 · 98aca1f · 98aca1f
1 parent 506022c
commit 98aca1f
Showing 1 changed file with 7 additions and 23 deletions.
diff --git a/src/antara_scheduler.cpp b/src/antara_scheduler.cpp
@@ -37,11 +37,11 @@ int Scheduler::getNextTask(DeploymentSchedule_t **p_next_task, std::uint32_t *p_
 {
     int i = numTasks - 1;
 
-    while (i >= 0)
+    for(; i>=0; i--)
     {
         bool canSet = true;
         int runTime = tasks[i].nextRunTime;
-        int delay = current_time - tasks[i].nextRunTime;
+        int delay = current_time - runTime;
         if (delay > 0)
         {
             runTime = current_time;
@@ -52,15 +52,13 @@ int Scheduler::getNextTask(DeploymentSchedule_t **p_next_task, std::uint32_t *p_
         }
         if (delay == tasks[i].maxDelay)
         {
-            *p_next_task = &(tasks[i]);
-            tasks[i].nextRunTime = runTime + tasks[i].ensembleInterval;
-            return runTime;
+            //send warning
         }
         int completion = runTime + tasks[i].maxDuration;
         int j = 0;
         while (j < i && canSet)
         {
-            if (tasks[j].nextRunTime < completion)
+            if (tasks[j].nextRunTime< completion)
             {
                 canSet = false;
             }
@@ -69,27 +67,13 @@ int Scheduler::getNextTask(DeploymentSchedule_t **p_next_task, std::uint32_t *p_
         if (canSet)
         {
             *p_next_task = &(tasks[i]);
-            tasks[i].nextRunTime += delay + tasks[i].ensembleInterval;
+            tasks[i].nextRunTime = runTime + tasks[i].ensembleInterval;
             return runTime;
         }
 
-        i--;
-    }
-
-    *p_next_task = &(tasks[0]);
-    tasks[0].measurementCount++;
-    int runTime = tasks[0].nextRunTime;
-    int delay = current_time - (tasks[0].nextRunTime);
-    if (delay > 0)
-    {
-        runTime = current_time;
-    }
-    else
-    {
-        delay = 0;
+
     }
-    tasks[0].nextRunTime += delay + tasks[0].ensembleInterval;
 
-    return runTime;
+   return -1;
 }
 #endif