Updated AllocationPolicy input (#324)

2 files changed, 9 insertions, 9 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 0538a951..657e7f1e 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
@@ -413,7 +413,7 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver {
         long now = clock.millis();
         SchedulingRequest request = new SchedulingRequest(task, now);
 
-        task.launchedAt = Instant.ofEpochMilli(now);
+        task.scheduledAt = Instant.ofEpochMilli(now);
         taskQueue.add(request);
         tasksPending++;
         requestSchedulingCycle();
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 4d5611a8..9fb9b5f0 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
@@ -56,12 +56,12 @@ public class ServiceTask {
     private ServiceFlavor flavor;
     public Workload workload;
 
-    private Map<String, ?> meta; // TODO: remove this
+    private final Map<String, ?> meta; // TODO: remove this
 
     private final List<TaskWatcher> watchers = new ArrayList<>();
     private TaskState state = TaskState.CREATED;
-    Instant launchedAt = null;
-    Instant createdAt;
+    Instant scheduledAt = null;
+    Instant submittedAt;
     Instant finishedAt;
     SimHost host = null;
     private SchedulingRequest request = null;
@@ -88,7 +88,7 @@ public class ServiceTask {
         this.workload = workload;
         this.meta = meta;
 
-        this.createdAt = this.service.getClock().instant();
+        this.submittedAt = this.service.getClock().instant();
     }
 
     @NotNull
@@ -136,13 +136,13 @@ public class ServiceTask {
     }
 
     @Nullable
-    public Instant getLaunchedAt() {
-        return launchedAt;
+    public Instant getScheduledAt() {
+        return scheduledAt;
     }
 
     @Nullable
-    public Instant getCreatedAt() {
-        return createdAt;
+    public Instant getSubmittedAt() {
+        return submittedAt;
     }
 
     @Nullable