diff options
Diffstat (limited to 'opendc')
5 files changed, 10 insertions, 10 deletions
diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/ExperimentRunner.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/ExperimentRunner.kt index a9ae7c6d..6e6da2c8 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/ExperimentRunner.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/ExperimentRunner.kt @@ -64,7 +64,8 @@ public class ExperimentRunner( private val reporterProvider: ExperimentReporterProvider, private val environmentPath: File, private val tracePath: File, - private val performanceInterferenceModel: PerformanceInterferenceModel? + private val performanceInterferenceModel: PerformanceInterferenceModel?, + private val parallelism: Int = Runtime.getRuntime().availableProcessors() ) : Closeable { /** * The database helper to write the execution plan. @@ -133,7 +134,7 @@ public class ExperimentRunner( performanceInterferenceModel: PerformanceInterferenceModel?, seed: Int ): TraceReader<VmWorkload> { - val raw = rawTraceReaders.getOrPut(name) { Sc20RawParquetTraceReader(File(tracePath, name)) } + val raw = rawTraceReaders.getOrPut(name) { Sc20RawParquetTraceReader(File(tracePath, name)) } return Sc20FilteringParquetTraceReader( raw, performanceInterferenceModel, @@ -174,7 +175,7 @@ public class ExperimentRunner( val plan = createPlan() val total = plan.size val finished = AtomicInteger() - val dispatcher = Executors.newWorkStealingPool(2).asCoroutineDispatcher() + val dispatcher = Executors.newWorkStealingPool(parallelism).asCoroutineDispatcher() runBlocking { val mainDispatcher = coroutineContext[CoroutineDispatcher.Key]!! diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/Portfolios.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/Portfolios.kt index 4f937638..58acd168 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/Portfolios.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/Portfolios.kt @@ -57,8 +57,8 @@ abstract class AbstractSc20Portfolio(name: String) : Portfolio(name) { object HorVerPortfolio : AbstractSc20Portfolio("horizontal_vs_vertical") { override val topologies = listOf( - Topology("base") - // Topology("rep-vol-hor-hom"), + Topology("base"), + Topology("rep-vol-hor-hom") // Topology("rep-vol-hor-het"), // Topology("rep-vol-ver-hom"), // Topology("rep-vol-ver-het"), @@ -71,7 +71,7 @@ object HorVerPortfolio : AbstractSc20Portfolio("horizontal_vs_vertical") { override val workloads = listOf( // Workload("solvinity", 0.1), // Workload("solvinity", 0.25), - Workload("small-parquet", 0.5), + // Workload("small-parquet", 0.5), Workload("small-parquet", 1.0) ) diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/reporter/PostgresExperimentReporter.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/reporter/PostgresExperimentReporter.kt index 532daa48..5de3535d 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/reporter/PostgresExperimentReporter.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/reporter/PostgresExperimentReporter.kt @@ -68,7 +68,7 @@ class ExperimentPostgresReporter(val scenario: Long, val run: Int, val writer: P ) } - logger.info("Host ${server.uid} changed state ${server.state} [${simulationContext.clock.millis()}]") + logger.debug("Host ${server.uid} changed state ${server.state} [${simulationContext.clock.millis()}]") lastServerStates[server] = Pair(server.state, simulationContext.clock.millis()) } diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/reporter/PostgresMetricsWriter.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/reporter/PostgresMetricsWriter.kt index a30dee05..a47258b4 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/reporter/PostgresMetricsWriter.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/reporter/PostgresMetricsWriter.kt @@ -48,8 +48,7 @@ public abstract class PostgresMetricsWriter<T>( /** * The thread for the actual writer. */ - private val writerThread: Thread = thread { run() } - + private val writerThread: Thread = thread(name = "host-metrics-writer") { run() } /** * Write the specified metrics to the database. diff --git a/opendc/opendc-experiments-sc20/src/main/resources/log4j2.xml b/opendc/opendc-experiments-sc20/src/main/resources/log4j2.xml index 77a15e55..f9a5a79e 100644 --- a/opendc/opendc-experiments-sc20/src/main/resources/log4j2.xml +++ b/opendc/opendc-experiments-sc20/src/main/resources/log4j2.xml @@ -33,7 +33,7 @@ <Logger name="com.atlarge.odcsim" level="info" additivity="false"> <AppenderRef ref="Console"/> </Logger> - <Logger name="com.atlarge.opendc" level="info" additivity="false"> + <Logger name="com.atlarge.opendc" level="warn" additivity="false"> <AppenderRef ref="Console"/> </Logger> <Logger name="org.apache.hadoop" level="warn" additivity="false"> |