From 181194aee520ccd12c506019800760fc81989550 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sun, 1 Nov 2020 14:43:12 +0100 Subject: Properly parse provisioned memory from Bitbrains trace This change fixes an issue where we interpret the provisioned memory in the Bitbrains trace as MB as opposed to the correct KB. --- .../experiments/sc20/trace/Sc20TraceConverter.kt | 4 ++-- traces/bitbrains-small/meta.parquet | Bin 2148 -> 2163 bytes traces/bitbrains-small/trace.parquet | Bin 1672463 -> 1672605 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/Sc20TraceConverter.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/Sc20TraceConverter.kt index bb2a75ee..9a9598e7 100644 --- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/Sc20TraceConverter.kt +++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/Sc20TraceConverter.kt @@ -383,8 +383,8 @@ public class BitbrainsConversion : TraceConversion("Bitbrains") { val timestamp = (values[timestampCol].trim().toLong() - 5 * 60) * 1000L cores = values[coreCol].trim().toInt() - requiredMemory = - max(requiredMemory, values[provisionedMemoryCol].trim().toDouble().toLong()) + val provisionedMemory = values[provisionedMemoryCol].trim().toDouble() // KB + requiredMemory = max(requiredMemory, (provisionedMemory / 1000).toLong()) maxCores = max(maxCores, cores) minTime = min(minTime, timestamp) val cpuUsage = values[cpuUsageCol].trim().toDouble() // MHz diff --git a/traces/bitbrains-small/meta.parquet b/traces/bitbrains-small/meta.parquet index ce7a812c..54a5ecf4 100644 Binary files a/traces/bitbrains-small/meta.parquet and b/traces/bitbrains-small/meta.parquet differ diff --git a/traces/bitbrains-small/trace.parquet b/traces/bitbrains-small/trace.parquet index 1d7ce882..65c2c5ec 100644 Binary files a/traces/bitbrains-small/trace.parquet and b/traces/bitbrains-small/trace.parquet differ -- cgit v1.2.3