diff options
| author | Dante Niewenhuis <d.niewenhuis@hotmail.com> | 2024-09-05 15:17:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-05 15:17:58 +0200 |
| commit | 3f05c61faeb94a2f1c920d87a6ca8bde34d551e0 (patch) | |
| tree | e699b6293c1ef275213999743ae1b64a15b0d8f6 /opendc-trace/opendc-trace-tools/src/main | |
| parent | fa6e850b11bf09947c4afc03f4af18f488436bbd (diff) | |
Sim trace update (#249)
* Started on reimplementing the SimTrace implementation
* updated trace format. Fragments now do not have a deadline, but a duration. The Fragments are executed in order.
Diffstat (limited to 'opendc-trace/opendc-trace-tools/src/main')
| -rw-r--r-- | opendc-trace/opendc-trace-tools/src/main/kotlin/org/opendc/trace/tools/ConvertCommand.kt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/opendc-trace/opendc-trace-tools/src/main/kotlin/org/opendc/trace/tools/ConvertCommand.kt b/opendc-trace/opendc-trace-tools/src/main/kotlin/org/opendc/trace/tools/ConvertCommand.kt index 17ff0c90..aa7b09d5 100644 --- a/opendc-trace/opendc-trace-tools/src/main/kotlin/org/opendc/trace/tools/ConvertCommand.kt +++ b/opendc-trace/opendc-trace-tools/src/main/kotlin/org/opendc/trace/tools/ConvertCommand.kt @@ -43,15 +43,15 @@ import org.opendc.trace.conv.TABLE_RESOURCES import org.opendc.trace.conv.TABLE_RESOURCE_STATES import org.opendc.trace.conv.resourceCpuCapacity import org.opendc.trace.conv.resourceCpuCount +import org.opendc.trace.conv.resourceDuration import org.opendc.trace.conv.resourceID import org.opendc.trace.conv.resourceMemCapacity -import org.opendc.trace.conv.resourceStartTime import org.opendc.trace.conv.resourceStateCpuUsage import org.opendc.trace.conv.resourceStateCpuUsagePct import org.opendc.trace.conv.resourceStateDuration import org.opendc.trace.conv.resourceStateMemUsage import org.opendc.trace.conv.resourceStateTimestamp -import org.opendc.trace.conv.resourceStopTime +import org.opendc.trace.conv.resourceSubmissionTime import java.io.File import java.time.Duration import java.time.Instant @@ -286,8 +286,8 @@ internal class ConvertCommand : CliktCommand(name = "convert", help = "Convert b writer.startRow() writer.setString(resourceID, id) - writer.setInstant(resourceStartTime, startInstant) - writer.setInstant(resourceStopTime, stopInstant) + writer.setInstant(resourceSubmissionTime, startInstant) + writer.setInstant(resourceDuration, stopInstant) writer.setInt(resourceCpuCount, cpuCount) writer.setDouble(resourceCpuCapacity, cpuCapacity) writer.setDouble(resourceMemCapacity, max(memCapacity, memUsage)) @@ -403,8 +403,8 @@ internal class ConvertCommand : CliktCommand(name = "convert", help = "Convert b val reader = checkNotNull(trace.getTable(TABLE_RESOURCES)).newReader() val idCol = reader.resolve(resourceID) - val startTimeCol = reader.resolve(resourceStartTime) - val stopTimeCol = reader.resolve(resourceStopTime) + val startTimeCol = reader.resolve(resourceSubmissionTime) + val stopTimeCol = reader.resolve(resourceDuration) val cpuCountCol = reader.resolve(resourceCpuCount) val memCapacityCol = reader.resolve(resourceMemCapacity) @@ -434,8 +434,8 @@ internal class ConvertCommand : CliktCommand(name = "convert", help = "Convert b writer.startRow() writer.setString(resourceID, id) - writer.setInstant(resourceStartTime, startInstant) - writer.setInstant(resourceStopTime, stopInstant) + writer.setInstant(resourceSubmissionTime, startInstant) + writer.setInstant(resourceDuration, stopInstant) writer.setInt(resourceCpuCount, cpuCount) writer.setDouble(resourceCpuCapacity, cpuCapacity) writer.setDouble(resourceMemCapacity, memCapacity) |