merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

1 files changed, 3 insertions, 4 deletions

diff --git a/opendc-utils/src/main/kotlin/org/opendc/utils/TimerScheduler.kt b/opendc-utils/src/main/kotlin/org/opendc/utils/TimerScheduler.kt
index aa2f3367..d7da7f99 100644
--- a/opendc-utils/src/main/kotlin/org/opendc/utils/TimerScheduler.kt
+++ b/opendc-utils/src/main/kotlin/org/opendc/utils/TimerScheduler.kt
@@ -24,7 +24,6 @@ package org.opendc.utils
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.sendBlocking
 import kotlinx.coroutines.selects.select
 import java.time.Clock
 import java.util.*
@@ -145,9 +144,9 @@ public class TimerScheduler<T>(context: CoroutineContext, private val clock: Clo
             queue.poll()
 
             if (queue.isNotEmpty()) {
-                channel.sendBlocking(peek.timestamp)
+                channel.trySend(peek.timestamp)
             } else {
-                channel.sendBlocking(null)
+                channel.trySend(null)
             }
         }
     }
@@ -212,7 +211,7 @@ public class TimerScheduler<T>(context: CoroutineContext, private val clock: Clo
                 // Check if we need to push the interruption forward
                 // Note that we check by timer reference
                 if (queue.peek() === timer) {
-                    channel.offer(timer.timestamp)
+                    channel.trySend(timer.timestamp)
                 }
 
                 timer