diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-05-19 23:20:18 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-05-20 01:36:03 +0200 |
| commit | f24c53dd13c40f46ca03b040bda5fc992d6fa9e3 (patch) | |
| tree | 51891520685f24a9c9b444f6b885b1b519c7a819 /opendc/opendc-compute/src/main | |
| parent | ee9f39c98d2d00586ac33767bb3205774981a58f (diff) | |
test: Add test to verify slice batching behavior
Diffstat (limited to 'opendc/opendc-compute/src/main')
2 files changed, 2 insertions, 3 deletions
diff --git a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/execution/ServerContext.kt b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/execution/ServerContext.kt index 027ba410..5a9e74a3 100644 --- a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/execution/ServerContext.kt +++ b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/execution/ServerContext.kt @@ -84,7 +84,7 @@ public interface ServerContext { batch: List<Slice>, triggerMode: TriggerMode = TriggerMode.FIRST, merge: (Slice, Slice) -> Slice = { _, r -> r } - ) = select<Unit> { onRun(batch, triggerMode, merge).invoke {} } + ) = select<Unit> { onRun(batch, triggerMode, merge).invoke {} } /** * Ask the processor cores to run the specified [slice] and select when the trigger condition is met as specified diff --git a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/SimpleVirtDriver.kt b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/SimpleVirtDriver.kt index b815a7ab..6c47ade7 100644 --- a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/SimpleVirtDriver.kt +++ b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/SimpleVirtDriver.kt @@ -482,7 +482,7 @@ class SimpleVirtDriver( */ fun consume(burst: Long): Boolean { this.burst = max(0, this.burst - burst) - return this.burst == 0L + return allocatedLimit > 0.0 && this.burst == 0L } /** @@ -511,7 +511,6 @@ class SimpleVirtDriver( "vCPU(vm=${vm.ctx.server.uid},id=$id,burst=$burst,limit=$limit,allocatedLimit=$allocatedLimit)" } - /** * The execution context in which a VM runs. * |