diff options
| author | Georgios Andreadis <info@gandreadis.com> | 2020-05-20 21:37:34 +0200 |
|---|---|---|
| committer | Georgios Andreadis <info@gandreadis.com> | 2020-05-20 21:37:34 +0200 |
| commit | f6f685196d6579d9866d2a04c2c01a63e8c169d7 (patch) | |
| tree | a8c83723dae5223b2c5443f64587fcbc38c492b7 /opendc | |
| parent | d6fba71ad1052ddbb1619e520a17f5f1d3e0c3ed (diff) | |
Report host cores
Diffstat (limited to 'opendc')
3 files changed, 10 insertions, 4 deletions
diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt index 7f71eb3e..be60e5b7 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt @@ -131,7 +131,8 @@ class ParquetExperimentMonitor(val run: Run) : ExperimentMonitor { interferedBurst, cpuUsage, cpuDemand, - lastPowerConsumption[hostServer] ?: 200.0 + lastPowerConsumption[hostServer] ?: 200.0, + hostServer.flavor.cpuCount ) currentHostEvent[hostServer] = event @@ -148,7 +149,8 @@ class ParquetExperimentMonitor(val run: Run) : ExperimentMonitor { interferedBurst, cpuUsage, cpuDemand, - lastPowerConsumption[hostServer] ?: 200.0 + lastPowerConsumption[hostServer] ?: 200.0, + hostServer.flavor.cpuCount ) currentHostEvent[hostServer] = event @@ -167,7 +169,8 @@ class ParquetExperimentMonitor(val run: Run) : ExperimentMonitor { interferedBurst, cpuUsage, cpuDemand, - lastPowerConsumption[hostServer] ?: 200.0 + lastPowerConsumption[hostServer] ?: 200.0, + hostServer.flavor.cpuCount ) currentHostEvent[hostServer] = event diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/telemetry/HostEvent.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/telemetry/HostEvent.kt index 8e91bca2..b9030172 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/telemetry/HostEvent.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/telemetry/HostEvent.kt @@ -40,5 +40,6 @@ data class HostEvent( val interferedBurst: Long, val cpuUsage: Double, val cpuDemand: Double, - val powerDraw: Double + val powerDraw: Double, + val cores: Int ) : Event("host-metrics") diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/telemetry/parquet/ParquetHostEventWriter.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/telemetry/parquet/ParquetHostEventWriter.kt index 523897b0..3bc09435 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/telemetry/parquet/ParquetHostEventWriter.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/telemetry/parquet/ParquetHostEventWriter.kt @@ -55,6 +55,7 @@ public class ParquetHostEventWriter(path: File, bufferSize: Int) : record.put("cpu_usage", event.cpuUsage) record.put("cpu_demand", event.cpuDemand) record.put("power_draw", event.powerDraw * (1.0 / 12)) + record.put("cores", event.cores) } val schema: Schema = SchemaBuilder @@ -76,6 +77,7 @@ public class ParquetHostEventWriter(path: File, bufferSize: Int) : .name("cpu_usage").type().doubleType().noDefault() .name("cpu_demand").type().doubleType().noDefault() .name("power_draw").type().doubleType().noDefault() + .name("cores").type().intType().noDefault() .endRecord() } } |