Reduce calls to nanoTime in Timeout.awaitSignal() (#1390)

squarejesse · web-flow · commit 154375bc787b · 2023-12-13T22:45:31.000-05:00
The function returns a non-positive value if the call timed
out, so there's no need to measure that independently.
diff --git a/okio/src/jvmMain/kotlin/okio/Timeout.kt b/okio/src/jvmMain/kotlin/okio/Timeout.kt
@@ -161,27 +161,21 @@ actual open class Timeout {
       }
 
       // Compute how long we'll wait.
-      val start = System.nanoTime()
       val waitNanos = if (hasDeadline && timeoutNanos != 0L) {
-        val deadlineNanos = deadlineNanoTime() - start
+        val deadlineNanos = deadlineNanoTime() - System.nanoTime()
         minOf(timeoutNanos, deadlineNanos)
       } else if (hasDeadline) {
-        deadlineNanoTime() - start
+        deadlineNanoTime() - System.nanoTime()
       } else {
         timeoutNanos
       }
 
-      // Attempt to wait that long. This will break out early if the monitor is notified.
-      var elapsedNanos = 0L
-      if (waitNanos > 0L) {
-        condition.await(waitNanos, TimeUnit.NANOSECONDS)
-        elapsedNanos = System.nanoTime() - start
-      }
+      if (waitNanos <= 0) throw InterruptedIOException("timeout")
 
-      // Throw if the timeout elapsed before the monitor was notified.
-      if (elapsedNanos >= waitNanos) {
-        throw InterruptedIOException("timeout")
-      }
+      // Attempt to wait that long. This will return early if the monitor is notified.
+      val nanosRemaining = condition.awaitNanos(waitNanos)
+
+      if (nanosRemaining <= 0) throw InterruptedIOException("timeout")
     } catch (e: InterruptedException) {
       Thread.currentThread().interrupt() // Retain interrupted status.
       throw InterruptedIOException("interrupted")
