From 986585f073287e16cacb1e45b88f834784ff8533 Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Wed, 26 Aug 2020 16:24:17 +0200
Subject: [PATCH] Added a way to get messages in progress for a connection

---
 src/dorkbox/network/connection/Connection.kt | 51 +++++++++++---------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/dorkbox/network/connection/Connection.kt b/src/dorkbox/network/connection/Connection.kt
index 47cc3662..5999973d 100644
--- a/src/dorkbox/network/connection/Connection.kt
+++ b/src/dorkbox/network/connection/Connection.kt
@@ -33,8 +33,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.agrona.DirectBuffer
 import java.util.concurrent.TimeUnit
-import java.util.concurrent.atomic.AtomicLong
-import javax.crypto.SecretKey
 
 /**
  * This connection is established once the registration information is validated, and the various connect/filter checks have passed
@@ -117,7 +115,7 @@ open class Connection(connectionParameters: ConnectionParams<*>) {
     // The IV for AES-GCM must be 12 bytes, since it's 4 (salt) + 8 (external counter) + 4 (GCM counter)
     // The 12 bytes IV is created during connection registration, and during the AES-GCM crypto, we override the last 8 with this
     // counter, which is also transmitted as an optimized int. (which is why it starts at 0, so the transmitted bytes are small)
-    private val aes_gcm_iv = AtomicLong(0)
+    private val aes_gcm_iv = atomic(0)
 
     // RMI support for this connection
     internal val rmiConnectionSupport = endPoint.getRmiConnectionSupport()
@@ -167,24 +165,24 @@ open class Connection(connectionParameters: ConnectionParams<*>) {
         return endPoint
     }
 
-    /**
-     * This is the per-message sequence number.
-     *
-     * The IV for AES-GCM must be 12 bytes, since it's 4 (salt) + 4 (external counter) + 4 (GCM counter)
-     * The 12 bytes IV is created during connection registration, and during the AES-GCM crypto, we override the last 8 with this
-     * counter, which is also transmitted as an optimized int. (which is why it starts at 0, so the transmitted bytes are small)
-     */
-    fun nextGcmSequence(): Long {
-        return aes_gcm_iv.getAndIncrement()
-    }
-
-    /**
-     * @return the AES key. key=32 byte, iv=12 bytes (AES-GCM implementation).
-     */
-    fun cryptoKey(): SecretKey {
-        TODO()
-//        return channelWrapper.cryptoKey()
-    }
+//    /**
+//     * This is the per-message sequence number.
+//     *
+//     * The IV for AES-GCM must be 12 bytes, since it's 4 (salt) + 4 (external counter) + 4 (GCM counter)
+//     * The 12 bytes IV is created during connection registration, and during the AES-GCM crypto, we override the last 8 with this
+//     * counter, which is also transmitted as an optimized int. (which is why it starts at 0, so the transmitted bytes are small)
+//     */
+//    fun nextGcmSequence(): Long {
+//        return aes_gcm_iv.getAndIncrement()
+//    }
+//
+//    /**
+//     * @return the AES key. key=32 byte, iv=12 bytes (AES-GCM implementation).
+//     */
+//    fun cryptoKey(): SecretKey {
+//        TODO()
+////        return channelWrapper.cryptoKey()
+//    }
 
 
 
@@ -193,7 +191,7 @@ open class Connection(connectionParameters: ConnectionParams<*>) {
      * Polls the AERON media driver subscription channel for incoming messages
      */
     internal fun pollSubscriptions(): Int {
-        return subscription.poll(messageHandler, 1024)
+        return subscription.poll(messageHandler, 4)
     }
 
     /**
@@ -267,6 +265,15 @@ open class Connection(connectionParameters: ConnectionParams<*>) {
     }
 
 
+    /**
+     *
+     * @return the number of messages in progress for this connection.
+     *
+     * A message in progress means that we have requested to to send an object over the network, but it hasn't finished sending over the network
+     */
+    fun messagesInProgress(): Int {
+        return messagesInProgress.value
+    }
 
 
     /**