Separate timeshift into an interface and add it to memorizing (#329)

* Separate timeshift into an interface and add it to memorizing

* Run spotless apply

* Remove random from memorizing sched test

* Record time on task termination

* spotless apply

2 files changed, 2 insertions, 2 deletions

diff --git a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java
index fb9dc6e6..6d973b3f 100644
--- a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java
+++ b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java
@@ -436,6 +436,7 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver {
             taskQueue.add(request);
         }
         tasksPending++;
+
         requestSchedulingCycle();
         return request;
     }
@@ -484,7 +485,6 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver {
                 iterator = taskQueue.iterator()) {
             final SchedulingResult result = scheduler.select(iterator);
             if (result.getResultType() == SchedulingResultType.EMPTY) {
-
                 break;
             }
             final HostView hv = result.getHost();
diff --git a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceTask.java b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceTask.java
index 6d097efb..66b69bde 100644
--- a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceTask.java
+++ b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ServiceTask.java
@@ -251,7 +251,7 @@ public class ServiceTask {
             this.numPauses++;
         }
 
-        if ((newState == TaskState.COMPLETED) || newState == TaskState.FAILED) {
+        if ((newState == TaskState.COMPLETED) || (newState == TaskState.FAILED) || (newState == TaskState.TERMINATED)) {
             this.finishedAt = this.service.getClock().instant();
         }