summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2020-11-01 14:43:12 +0100
committerFabian Mastenbroek <mail.fabianm@gmail.com>2020-11-01 14:46:26 +0100
commit181194aee520ccd12c506019800760fc81989550 (patch)
tree187652e0c39eb6932fc0d32eeff3185834248cf3
parent7493be615fd1ef0a629b32318416d3f0d2b868fb (diff)
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.
-rw-r--r--simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/Sc20TraceConverter.kt4
-rw-r--r--traces/bitbrains-small/meta.parquetbin2148 -> 2163 bytes
-rw-r--r--traces/bitbrains-small/trace.parquetbin1672463 -> 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
--- a/traces/bitbrains-small/meta.parquet
+++ b/traces/bitbrains-small/meta.parquet
Binary files differ
diff --git a/traces/bitbrains-small/trace.parquet b/traces/bitbrains-small/trace.parquet
index 1d7ce882..65c2c5ec 100644
--- a/traces/bitbrains-small/trace.parquet
+++ b/traces/bitbrains-small/trace.parquet
Binary files differ