summaryrefslogtreecommitdiff
path: root/opendc-simulator/opendc-simulator-core/src
diff options
context:
space:
mode:
Diffstat (limited to 'opendc-simulator/opendc-simulator-core/src')
-rw-r--r--opendc-simulator/opendc-simulator-core/src/main/java/org/opendc/simulator/SimulationScheduler.java5
-rw-r--r--opendc-simulator/opendc-simulator-core/src/main/java/org/opendc/simulator/TaskQueue.java10
-rw-r--r--opendc-simulator/opendc-simulator-core/src/test/kotlin/org/opendc/simulator/TaskQueueTest.kt16
3 files changed, 17 insertions, 14 deletions
diff --git a/opendc-simulator/opendc-simulator-core/src/main/java/org/opendc/simulator/SimulationScheduler.java b/opendc-simulator/opendc-simulator-core/src/main/java/org/opendc/simulator/SimulationScheduler.java
index a70c1cda..305bdf5e 100644
--- a/opendc-simulator/opendc-simulator-core/src/main/java/org/opendc/simulator/SimulationScheduler.java
+++ b/opendc-simulator/opendc-simulator-core/src/main/java/org/opendc/simulator/SimulationScheduler.java
@@ -67,7 +67,7 @@ public final class SimulationScheduler implements Executor {
* @param initialTimeMs The initial virtual time of the scheduler in milliseconds since epoch.
*/
public SimulationScheduler(long initialTimeMs) {
- this.currentTime = initialTimeMs;
+ this.currentTime = initialTimeMs;
}
/**
@@ -104,7 +104,8 @@ public final class SimulationScheduler implements Executor {
*/
public int schedule(long delayMs, Runnable task) {
if (delayMs < 0) {
- throw new IllegalArgumentException("Attempted scheduling an event earlier in time (delay " + delayMs + " ms)");
+ throw new IllegalArgumentException(
+ "Attempted scheduling an event earlier in time (delay " + delayMs + " ms)");
}
long target = currentTime + delayMs;
diff --git a/opendc-simulator/opendc-simulator-core/src/main/java/org/opendc/simulator/TaskQueue.java b/opendc-simulator/opendc-simulator-core/src/main/java/org/opendc/simulator/TaskQueue.java
index 7d867b5d..f677e74e 100644
--- a/opendc-simulator/opendc-simulator-core/src/main/java/org/opendc/simulator/TaskQueue.java
+++ b/opendc-simulator/opendc-simulator-core/src/main/java/org/opendc/simulator/TaskQueue.java
@@ -193,7 +193,8 @@ final class TaskQueue {
/**
* Sift up an entry in the heap.
*/
- private static void siftUp(long[] deadlines, int[] ids, Runnable[] tasks, int k, long deadline, int id, Runnable task) {
+ private static void siftUp(
+ long[] deadlines, int[] ids, Runnable[] tasks, int k, long deadline, int id, Runnable task) {
while (k > 0) {
int parent = (k - 1) >>> 1;
long parentDeadline = deadlines[parent];
@@ -218,11 +219,12 @@ final class TaskQueue {
/**
* Sift down an entry in the heap.
*/
- private static void siftDown(long[] deadlines, int[] ids, Runnable[] tasks, int k, int n, long deadline, int id, Runnable task) {
- int half = n >>> 1; // loop while a non-leaf
+ private static void siftDown(
+ long[] deadlines, int[] ids, Runnable[] tasks, int k, int n, long deadline, int id, Runnable task) {
+ int half = n >>> 1; // loop while a non-leaf
while (k < half) {
- int child = (k << 1) + 1; // assume left child is least
+ int child = (k << 1) + 1; // assume left child is least
long childDeadline = deadlines[child];
int childId = ids[child];
diff --git a/opendc-simulator/opendc-simulator-core/src/test/kotlin/org/opendc/simulator/TaskQueueTest.kt b/opendc-simulator/opendc-simulator-core/src/test/kotlin/org/opendc/simulator/TaskQueueTest.kt
index f1559ce3..56dd83aa 100644
--- a/opendc-simulator/opendc-simulator-core/src/test/kotlin/org/opendc/simulator/TaskQueueTest.kt
+++ b/opendc-simulator/opendc-simulator-core/src/test/kotlin/org/opendc/simulator/TaskQueueTest.kt
@@ -47,7 +47,7 @@ class TaskQueueTest {
fun testPollEmpty() {
assertAll(
{ assertEquals(Long.MAX_VALUE, queue.peekDeadline()) },
- { assertNull(queue.poll()) },
+ { assertNull(queue.poll()) }
)
}
@@ -63,7 +63,7 @@ class TaskQueueTest {
assertAll(
{ assertEquals(100, queue.peekDeadline()) },
{ assertEquals(entry, queue.poll()) },
- { assertNull(queue.poll()) },
+ { assertNull(queue.poll()) }
)
}
@@ -86,7 +86,7 @@ class TaskQueueTest {
{ assertEquals(entryB, queue.poll()) },
{ assertEquals(entryC, queue.poll()) },
{ assertEquals(entryA, queue.poll()) },
- { assertNull(queue.poll()) },
+ { assertNull(queue.poll()) }
)
}
@@ -109,7 +109,7 @@ class TaskQueueTest {
{ assertEquals(entryA, queue.poll()) },
{ assertEquals(entryB, queue.poll()) },
{ assertEquals(entryC, queue.poll()) },
- { assertNull(queue.poll()) },
+ { assertNull(queue.poll()) }
)
}
@@ -136,7 +136,7 @@ class TaskQueueTest {
{ assertEquals(entryD, queue.poll()) },
{ assertEquals(entryC, queue.poll()) },
{ assertEquals(entryA, queue.poll()) },
- { assertNull(queue.poll()) },
+ { assertNull(queue.poll()) }
)
}
@@ -160,7 +160,7 @@ class TaskQueueTest {
{ assertEquals(20, queue.peekDeadline()) },
{ assertEquals(entryB, queue.poll()) },
{ assertEquals(entryC, queue.poll()) },
- { assertNull(queue.poll()) },
+ { assertNull(queue.poll()) }
)
}
@@ -184,7 +184,7 @@ class TaskQueueTest {
{ assertEquals(58, queue.peekDeadline()) },
{ assertEquals(entryC, queue.poll()) },
{ assertEquals(entryA, queue.poll()) },
- { assertNull(queue.poll()) },
+ { assertNull(queue.poll()) }
)
}
@@ -208,7 +208,7 @@ class TaskQueueTest {
{ assertEquals(20, queue.peekDeadline()) },
{ assertEquals(entryB, queue.poll()) },
{ assertEquals(entryA, queue.poll()) },
- { assertNull(queue.poll()) },
+ { assertNull(queue.poll()) }
)
}