diff options
| author | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-02-24 20:30:28 +0100 |
|---|---|---|
| committer | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-02-24 20:30:28 +0100 |
| commit | 6f1162730d548baa12c9d594a94c4523d7e51889 (patch) | |
| tree | 230fc63cd84d7eac75860ec868e47a91a83d5995 /opendc/opendc-experiments-sc18/src | |
| parent | 8d05ee524981bacfe4af4fe0097c935309115481 (diff) | |
| parent | 3dedd93628b7fb73613850ea1b4e870b70b45f27 (diff) | |
Merge branch 'feat/2.x-workflow-extensions' into 'feat/2.x'
Incorporate extensions to workflow scheduler
See merge request opendc/opendc-simulator!27
Diffstat (limited to 'opendc/opendc-experiments-sc18/src')
| -rw-r--r-- | opendc/opendc-experiments-sc18/src/main/kotlin/com/atlarge/opendc/experiments/sc18/TestExperiment.kt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/opendc/opendc-experiments-sc18/src/main/kotlin/com/atlarge/opendc/experiments/sc18/TestExperiment.kt b/opendc/opendc-experiments-sc18/src/main/kotlin/com/atlarge/opendc/experiments/sc18/TestExperiment.kt index 3dc8be51..96796c07 100644 --- a/opendc/opendc-experiments-sc18/src/main/kotlin/com/atlarge/opendc/experiments/sc18/TestExperiment.kt +++ b/opendc/opendc-experiments-sc18/src/main/kotlin/com/atlarge/opendc/experiments/sc18/TestExperiment.kt @@ -31,12 +31,12 @@ import com.atlarge.opendc.format.trace.gwf.GwfTraceReader import com.atlarge.opendc.workflows.monitor.WorkflowMonitor import com.atlarge.opendc.workflows.service.StageWorkflowService import com.atlarge.opendc.workflows.service.WorkflowSchedulerMode -import com.atlarge.opendc.workflows.service.stage.job.FifoJobSortingPolicy import com.atlarge.opendc.workflows.service.stage.job.NullJobAdmissionPolicy +import com.atlarge.opendc.workflows.service.stage.job.SubmissionTimeJobOrderPolicy import com.atlarge.opendc.workflows.service.stage.resource.FirstFitResourceSelectionPolicy -import com.atlarge.opendc.workflows.service.stage.resource.FunctionalResourceDynamicFilterPolicy -import com.atlarge.opendc.workflows.service.stage.task.FifoTaskSortingPolicy -import com.atlarge.opendc.workflows.service.stage.task.FunctionalTaskEligibilityPolicy +import com.atlarge.opendc.workflows.service.stage.resource.FunctionalResourceFilterPolicy +import com.atlarge.opendc.workflows.service.stage.task.NullTaskEligibilityPolicy +import com.atlarge.opendc.workflows.service.stage.task.SubmissionTimeTaskOrderPolicy import com.atlarge.opendc.workflows.workload.Job import com.atlarge.opendc.workflows.workload.Task import kotlinx.coroutines.channels.Channel @@ -92,11 +92,11 @@ fun main(args: Array<String>) { environment.platforms[0].zones[0].services[ProvisioningService.Key], mode = WorkflowSchedulerMode.Batch(100), jobAdmissionPolicy = NullJobAdmissionPolicy, - jobSortingPolicy = FifoJobSortingPolicy(), - taskEligibilityPolicy = FunctionalTaskEligibilityPolicy(), - taskSortingPolicy = FifoTaskSortingPolicy(), - resourceDynamicFilterPolicy = FunctionalResourceDynamicFilterPolicy(), - resourceSelectionPolicy = FirstFitResourceSelectionPolicy() + jobOrderPolicy = SubmissionTimeJobOrderPolicy(), + taskEligibilityPolicy = NullTaskEligibilityPolicy, + taskOrderPolicy = SubmissionTimeTaskOrderPolicy(), + resourceFilterPolicy = FunctionalResourceFilterPolicy, + resourceSelectionPolicy = FirstFitResourceSelectionPolicy ) val reader = GwfTraceReader(File(args[0])) |