From 474044649a67cfcc857615b6a0f8387a2954abbd Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 16 Sep 2021 12:34:53 +0200
Subject: feat(trace): Update OpenDC VM trace format

This change optimizes the OpenDC VM trace format by removing
unnecessary columns as well as optimizing the writer settings.

The new implementation still supports reading the old trace format in
case users run OpenDC with older workload traces.
---
 .../main/kotlin/org/opendc/trace/azure/AzureResourceStateTable.kt   | 2 +-
 .../src/main/kotlin/org/opendc/trace/azure/AzureResourceTable.kt    | 2 +-
 .../main/kotlin/org/opendc/trace/azure/AzureResourceTableReader.kt  | 6 +++---
 .../src/test/kotlin/org/opendc/trace/azure/AzureTraceFormatTest.kt  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'opendc-trace/opendc-trace-azure/src')

diff --git a/opendc-trace/opendc-trace-azure/src/main/kotlin/org/opendc/trace/azure/AzureResourceStateTable.kt b/opendc-trace/opendc-trace-azure/src/main/kotlin/org/opendc/trace/azure/AzureResourceStateTable.kt
index 189ab52a..84c9b347 100644
--- a/opendc-trace/opendc-trace-azure/src/main/kotlin/org/opendc/trace/azure/AzureResourceStateTable.kt
+++ b/opendc-trace/opendc-trace-azure/src/main/kotlin/org/opendc/trace/azure/AzureResourceStateTable.kt
@@ -68,9 +68,9 @@ internal class AzureResourceStateTable(private val factory: CsvFactory, path: Pa
 
                     delegate.close()
                     delegate = nextDelegate()
+                    this.delegate = delegate
                 }
 
-                this.delegate = delegate
                 return delegate != null
             }
 
diff --git a/opendc-trace/opendc-trace-azure/src/main/kotlin/org/opendc/trace/azure/AzureResourceTable.kt b/opendc-trace/opendc-trace-azure/src/main/kotlin/org/opendc/trace/azure/AzureResourceTable.kt
index d9f6f156..96ee3158 100644
--- a/opendc-trace/opendc-trace-azure/src/main/kotlin/org/opendc/trace/azure/AzureResourceTable.kt
+++ b/opendc-trace/opendc-trace-azure/src/main/kotlin/org/opendc/trace/azure/AzureResourceTable.kt
@@ -38,7 +38,7 @@ internal class AzureResourceTable(private val factory: CsvFactory, private val p
         RESOURCE_ID,
         RESOURCE_START_TIME,
         RESOURCE_STOP_TIME,
-        RESOURCE_NCPUS,
+        RESOURCE_CPU_COUNT,
         RESOURCE_MEM_CAPACITY
     )
 
diff --git a/opendc-trace/opendc-trace-azure/src/main/kotlin/org/opendc/trace/azure/AzureResourceTableReader.kt b/opendc-trace/opendc-trace-azure/src/main/kotlin/org/opendc/trace/azure/AzureResourceTableReader.kt
index d3970b07..5ea97483 100644
--- a/opendc-trace/opendc-trace-azure/src/main/kotlin/org/opendc/trace/azure/AzureResourceTableReader.kt
+++ b/opendc-trace/opendc-trace-azure/src/main/kotlin/org/opendc/trace/azure/AzureResourceTableReader.kt
@@ -67,7 +67,7 @@ internal class AzureResourceTableReader(private val parser: CsvParser) : TableRe
             RESOURCE_ID -> true
             RESOURCE_START_TIME -> true
             RESOURCE_STOP_TIME -> true
-            RESOURCE_NCPUS -> true
+            RESOURCE_CPU_COUNT -> true
             RESOURCE_MEM_CAPACITY -> true
             else -> false
         }
@@ -78,7 +78,7 @@ internal class AzureResourceTableReader(private val parser: CsvParser) : TableRe
             RESOURCE_ID -> id
             RESOURCE_START_TIME -> startTime
             RESOURCE_STOP_TIME -> stopTime
-            RESOURCE_NCPUS -> getInt(RESOURCE_NCPUS)
+            RESOURCE_CPU_COUNT -> getInt(RESOURCE_CPU_COUNT)
             RESOURCE_MEM_CAPACITY -> getDouble(RESOURCE_MEM_CAPACITY)
             else -> throw IllegalArgumentException("Invalid column")
         }
@@ -93,7 +93,7 @@ internal class AzureResourceTableReader(private val parser: CsvParser) : TableRe
 
     override fun getInt(column: TableColumn<Int>): Int {
         return when (column) {
-            RESOURCE_NCPUS -> cpuCores
+            RESOURCE_CPU_COUNT -> cpuCores
             else -> throw IllegalArgumentException("Invalid column")
         }
     }
diff --git a/opendc-trace/opendc-trace-azure/src/test/kotlin/org/opendc/trace/azure/AzureTraceFormatTest.kt b/opendc-trace/opendc-trace-azure/src/test/kotlin/org/opendc/trace/azure/AzureTraceFormatTest.kt
index 20375547..e5735f0d 100644
--- a/opendc-trace/opendc-trace-azure/src/test/kotlin/org/opendc/trace/azure/AzureTraceFormatTest.kt
+++ b/opendc-trace/opendc-trace-azure/src/test/kotlin/org/opendc/trace/azure/AzureTraceFormatTest.kt
@@ -87,7 +87,7 @@ class AzureTraceFormatTest {
         assertAll(
             { assertTrue(reader.nextRow()) },
             { assertEquals("x/XsOfHO4ocsV99i4NluqKDuxctW2MMVmwqOPAlg4wp8mqbBOe3wxBlQo0+Qx+uf", reader.get(RESOURCE_ID)) },
-            { assertEquals(1, reader.getInt(RESOURCE_NCPUS)) },
+            { assertEquals(1, reader.getInt(RESOURCE_CPU_COUNT)) },
             { assertEquals(1750000.0, reader.getDouble(RESOURCE_MEM_CAPACITY)) },
         )
 
-- 
cgit v1.2.3