summaryrefslogtreecommitdiff
path: root/opendc-compute/opendc-compute-workload/src
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2021-09-20 11:48:18 +0200
committerFabian Mastenbroek <mail.fabianm@gmail.com>2021-09-20 11:48:18 +0200
commit55a4c8208cc44ac626f7b8c61a19d5ec725ec936 (patch)
treef023a3f714eaf2c5707ad9203558dabe535396e6 /opendc-compute/opendc-compute-workload/src
parent453c25c4b453fa0af26bebbd8863abfb79218119 (diff)
refactor(trace): Unify columns of different tables
This change unifies columns of different tables used by trace formats. This concretely means that instead of having columns specific per table (e.g., RESOURCE_ID and RESOURCE_STATE_ID), with this changes these columns are shared between the tables with a single definition (RESOURCE_ID).
Diffstat (limited to 'opendc-compute/opendc-compute-workload/src')
-rw-r--r--opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt
index c92b212f..8a2585ce 100644
--- a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt
+++ b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt
@@ -62,10 +62,10 @@ public class ComputeWorkloadLoader(private val baseDir: File) {
return try {
while (reader.nextRow()) {
- val id = reader.get(RESOURCE_STATE_ID)
+ val id = reader.get(RESOURCE_ID)
val time = reader.get(RESOURCE_STATE_TIMESTAMP)
val duration = reader.get(RESOURCE_STATE_DURATION)
- val cores = reader.getInt(RESOURCE_STATE_CPU_COUNT)
+ val cores = reader.getInt(RESOURCE_CPU_COUNT)
val cpuUsage = reader.getDouble(RESOURCE_STATE_CPU_USAGE)
val fragment = SimTraceWorkload.Fragment(