From 93775374288892812e5397be914e6d32aaa23a09 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Tue, 10 Mar 2020 15:59:49 +0100 Subject: Merge hypervisor monitor calls --- .../virt/driver/hypervisor/HypervisorVirtDriver.kt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'opendc/opendc-compute/src') diff --git a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt index 05e1ab90..f63a5484 100644 --- a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt +++ b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt @@ -190,15 +190,13 @@ class HypervisorVirtDriver( } } - for (i in burst.indices) { - monitor.onSliceFinish( - end, - burst[i], - remainder[i], - vms.size, - hostContext.server - ) - } + monitor.onSliceFinish( + end, + burst.sum(), + remainder.sum(), + vms.size, + hostContext.server + ) } this.call = call call.invokeOnCompletion { this.call = null } -- cgit v1.2.3 From 3c205b26aff8158492cc116b2f7948b7113e7288 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Wed, 11 Mar 2020 13:52:35 +0100 Subject: Fix remainder/burst granted issue --- .../opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'opendc/opendc-compute/src') diff --git a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt index f63a5484..43d17d8e 100644 --- a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt +++ b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt @@ -193,7 +193,7 @@ class HypervisorVirtDriver( monitor.onSliceFinish( end, burst.sum(), - remainder.sum(), + burst.sum() - remainder.sum(), vms.size, hostContext.server ) -- cgit v1.2.3 From e24748a93b698efe47c440676e28d0997398433f Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Wed, 11 Mar 2020 14:01:37 +0100 Subject: Cache burst sum --- .../opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'opendc/opendc-compute/src') diff --git a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt index 43d17d8e..f50d694a 100644 --- a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt +++ b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/virt/driver/hypervisor/HypervisorVirtDriver.kt @@ -190,10 +190,11 @@ class HypervisorVirtDriver( } } + val totalBurst = burst.sum() monitor.onSliceFinish( end, - burst.sum(), - burst.sum() - remainder.sum(), + totalBurst, + totalBurst - remainder.sum(), vms.size, hostContext.server ) -- cgit v1.2.3