From ff94e63d5f80df317505c7ae0c6a5465f9a0c1f5 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 13 Oct 2021 11:57:16 +0200
Subject: feat(trace): Add column for CPU capacity in OpenDC format

This change adds a new column to resource table of the OpenDC trace format for
the CPU capacity provisioned for a virtual machine, so that this
capacity can be assigned to the virtual machine during simulation.
---
 .../kotlin/org/opendc/trace/opendc/OdcVmResourceTableReader.kt    | 8 +++++++-
 .../kotlin/org/opendc/trace/opendc/OdcVmResourceTableWriter.kt    | 1 +
 .../src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt   | 4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)

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

diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceTableReader.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceTableReader.kt
index d93929aa..ffbdc440 100644
--- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceTableReader.kt
+++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceTableReader.kt
@@ -69,6 +69,7 @@ internal class OdcVmResourceTableReader(private val reader: LocalParquetReader<G
             COL_START_TIME -> Instant.ofEpochMilli(record[AVRO_COL_START_TIME] as Long)
             COL_STOP_TIME -> Instant.ofEpochMilli(record[AVRO_COL_STOP_TIME] as Long)
             COL_CPU_COUNT -> getInt(index)
+            COL_CPU_CAPACITY -> getDouble(index)
             COL_MEM_CAPACITY -> getDouble(index)
             else -> throw IllegalArgumentException("Invalid column")
         }
@@ -95,6 +96,7 @@ internal class OdcVmResourceTableReader(private val reader: LocalParquetReader<G
         val record = checkNotNull(record) { "Reader in invalid state" }
 
         return when (index) {
+            COL_CPU_CAPACITY -> if (AVRO_COL_CPU_CAPACITY >= 0) (record[AVRO_COL_CPU_CAPACITY] as Number).toDouble() else 0.0
             COL_MEM_CAPACITY -> (record[AVRO_COL_MEM_CAPACITY] as Number).toDouble()
             else -> throw IllegalArgumentException("Invalid column")
         }
@@ -115,6 +117,7 @@ internal class OdcVmResourceTableReader(private val reader: LocalParquetReader<G
             AVRO_COL_START_TIME = (schema.getField("start_time") ?: schema.getField("submissionTime")).pos()
             AVRO_COL_STOP_TIME = (schema.getField("stop_time") ?: schema.getField("endTime")).pos()
             AVRO_COL_CPU_COUNT = (schema.getField("cpu_count") ?: schema.getField("maxCores")).pos()
+            AVRO_COL_CPU_CAPACITY = schema.getField("cpu_capacity")?.pos() ?: -1
             AVRO_COL_MEM_CAPACITY = (schema.getField("mem_capacity") ?: schema.getField("requiredMemory")).pos()
         } catch (e: NullPointerException) {
             // This happens when the field we are trying to access does not exist
@@ -126,19 +129,22 @@ internal class OdcVmResourceTableReader(private val reader: LocalParquetReader<G
     private var AVRO_COL_START_TIME = -1
     private var AVRO_COL_STOP_TIME = -1
     private var AVRO_COL_CPU_COUNT = -1
+    private var AVRO_COL_CPU_CAPACITY = -1
     private var AVRO_COL_MEM_CAPACITY = -1
 
     private val COL_ID = 0
     private val COL_START_TIME = 1
     private val COL_STOP_TIME = 2
     private val COL_CPU_COUNT = 3
-    private val COL_MEM_CAPACITY = 4
+    private val COL_CPU_CAPACITY = 4
+    private val COL_MEM_CAPACITY = 5
 
     private val columns = mapOf(
         RESOURCE_ID to COL_ID,
         RESOURCE_START_TIME to COL_START_TIME,
         RESOURCE_STOP_TIME to COL_STOP_TIME,
         RESOURCE_CPU_COUNT to COL_CPU_COUNT,
+        RESOURCE_CPU_CAPACITY to COL_CPU_CAPACITY,
         RESOURCE_MEM_CAPACITY to COL_MEM_CAPACITY,
     )
 }
diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceTableWriter.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceTableWriter.kt
index 9cc6ca7d..4b66a86f 100644
--- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceTableWriter.kt
+++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceTableWriter.kt
@@ -64,6 +64,7 @@ internal class OdcVmResourceTableWriter(
             RESOURCE_START_TIME -> (schema.getField("start_time") ?: schema.getField("submissionTime")).pos()
             RESOURCE_STOP_TIME -> (schema.getField("stop_time") ?: schema.getField("endTime")).pos()
             RESOURCE_CPU_COUNT -> (schema.getField("cpu_count") ?: schema.getField("maxCores")).pos()
+            RESOURCE_CPU_CAPACITY -> schema.getField("cpu_capacity").pos()
             RESOURCE_MEM_CAPACITY -> (schema.getField("mem_capacity") ?: schema.getField("requiredMemory")).pos()
             else -> -1
         }
diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt
index 9b32f8fd..886f3d54 100644
--- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt
+++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt
@@ -48,7 +48,7 @@ public class OdcVmTraceFormat : TraceFormat {
 
     override fun create(path: Path) {
         // Construct directory containing the trace files
-        Files.createDirectory(path)
+        Files.createDirectories(path)
 
         val tables = getTables(path)
 
@@ -68,6 +68,7 @@ public class OdcVmTraceFormat : TraceFormat {
                     RESOURCE_START_TIME,
                     RESOURCE_STOP_TIME,
                     RESOURCE_CPU_COUNT,
+                    RESOURCE_CPU_CAPACITY,
                     RESOURCE_MEM_CAPACITY,
                 )
             )
@@ -138,6 +139,7 @@ public class OdcVmTraceFormat : TraceFormat {
             .name("start_time").type(TIMESTAMP_SCHEMA).noDefault()
             .name("stop_time").type(TIMESTAMP_SCHEMA).noDefault()
             .requiredInt("cpu_count")
+            .requiredDouble("cpu_capacity")
             .requiredLong("mem_capacity")
             .endRecord()
 
-- 
cgit v1.2.3