Renamed input files and internally server is changed to task (#246)

* Updated SimTrace to use a single ArrayDeque instead of three separate lists for deadline, cpuUsage, and coreCount

* Renamed input files to tasks.parquet and fragments.parquet. Renamed server to task. OpenDC nows exports tasks.parquet instead of server.parquet

2 files changed, 5 insertions, 5 deletions

diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt
index 7eb6e21f..18af0d1a 100644
--- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt
+++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt
@@ -297,8 +297,8 @@ public class OpenDCRunner(
                             "Success=${serviceMetrics.attemptsSuccess} " +
                             "Failure=${serviceMetrics.attemptsFailure} " +
                             "Error=${serviceMetrics.attemptsError} " +
-                            "Pending=${serviceMetrics.serversPending} " +
-                            "Active=${serviceMetrics.serversActive}"
+                            "Pending=${serviceMetrics.tasksPending} " +
+                            "Active=${serviceMetrics.tasksActive}"
                     }
                 }
             }
diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt
index 4576a463..96b42ac8 100644
--- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt
+++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt
@@ -104,9 +104,9 @@ internal class WebComputeMonitor : ComputeMonitor {
             hostAggregateMetrics.totalPowerDraw,
             hostAggregateMetrics.totalFailureSlices.roundToLong(),
             hostAggregateMetrics.totalFailureVmSlices.roundToLong(),
-            serviceData.serversTotal,
-            serviceData.serversPending,
-            serviceData.serversTotal - serviceData.serversPending - serviceData.serversActive,
+            serviceData.tasksTotal,
+            serviceData.tasksPending,
+            serviceData.tasksTotal - serviceData.tasksPending - serviceData.tasksActive,
             serviceData.attemptsError + serviceData.attemptsFailure,
         )
     }