diff options
| author | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-03-13 17:58:55 +0100 |
|---|---|---|
| committer | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-03-13 17:58:55 +0100 |
| commit | ccde4082af2d32da0332b6b87741a73d9b01f587 (patch) | |
| tree | 3aca479525d1c1557c56d873941399556d3088fe /opendc/opendc-format/src/main | |
| parent | daa82a52928adfa79394ffe89ec3758d9f2257ee (diff) | |
| parent | 04bf648ce13f36a39e7ca6b41f4fbab281bb9392 (diff) | |
Merge branch 'refactor/units' into '2.x'
Change burst to mega FLOPs
See merge request opendc/opendc-simulator!42
Diffstat (limited to 'opendc/opendc-format/src/main')
2 files changed, 3 insertions, 3 deletions
diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt index 498f147f..3c974e44 100644 --- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt +++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt @@ -98,9 +98,9 @@ class Sc20TraceReader( val timestamp = (values[timestampCol].trim().toLong() - 5 * 60) * 1000L cores = values[coreCol].trim().toInt() val cpuUsage = values[cpuUsageCol].trim().toDouble() // MHz - requiredMemory = (values[provisionedMemoryCol].trim().toDouble() / 1000).toLong() + requiredMemory = values[provisionedMemoryCol].trim().toLong() - val flops: Long = (cpuUsage * 1_000_000L * 5 * 60 * cores).toLong() + val flops: Long = (cpuUsage * 5 * 60 * cores).toLong() if (flopsHistory.isEmpty()) { flopsHistory.add(FlopsHistoryFragment(timestamp, flops, traceInterval, cpuUsage)) diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt index b4964b26..d001687c 100644 --- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt +++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt @@ -98,7 +98,7 @@ class VmTraceReader( val cpuUsage = values[cpuUsageCol].trim().toDouble() // MHz requiredMemory = (values[provisionedMemoryCol].trim().toDouble() / 1000).toLong() - val flops: Long = (cpuUsage * 1_000_000L * 5 * 60 * cores).toLong() + val flops: Long = (cpuUsage * 5 * 60 * cores).toLong() if (flopsHistory.isEmpty()) { flopsHistory.add(FlopsHistoryFragment(timestamp, flops, traceInterval, cpuUsage)) |