All ArrayChannel.size accesses should be under the channel lock

Earlycrusher · Oct 2, 2019 · cfc08ee · cfc08ee
1 parent c5a42da
commit cfc08ee
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/kotlinx-coroutines-core/common/src/channels/ArrayChannel.kt b/kotlinx-coroutines-core/common/src/channels/ArrayChannel.kt
@@ -36,16 +36,12 @@ internal open class ArrayChannel<E>(
  */
  private var buffer: Array<Any?> = arrayOfNulls<Any?>(min(capacity, 8))
  private var head: Int = 0
-
- private val _size = atomic(0)
- private var size: Int // Invariant: size <= capacity
- get() = _size.value
- set(value) { _size.value = value }
+ private var size = 0 // Invariant: size <= capacity
 
  protected final override val isBufferAlwaysEmpty: Boolean get() = false
  protected final override val isBufferEmpty: Boolean get() = lock.withLock { size == 0 }
  protected final override val isBufferAlwaysFull: Boolean get() = false
- protected final override val isBufferFull: Boolean get() = size == capacity
+ protected final override val isBufferFull: Boolean get() = lock.withLock { size == capacity }
 
  // result is `OFFER_SUCCESS | OFFER_FAILED | Closed`
  protected override fun offerInternal(element: E): Any {