From 72a712176217884a469357ddb9b9613a333e675e Mon Sep 17 00:00:00 2001 From: Robinson Date: Mon, 25 Sep 2023 13:55:45 +0200 Subject: [PATCH] More clear logging --- .../network/rmi/RemoteObjectStorage.kt | 8 ++++-- src/dorkbox/network/rmi/ResponseManager.kt | 28 +++++++------------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/dorkbox/network/rmi/RemoteObjectStorage.kt b/src/dorkbox/network/rmi/RemoteObjectStorage.kt index 5c5efd2b..52693a97 100644 --- a/src/dorkbox/network/rmi/RemoteObjectStorage.kt +++ b/src/dorkbox/network/rmi/RemoteObjectStorage.kt @@ -171,7 +171,11 @@ class RemoteObjectStorage(val logger: Logger) { returnId(objectId) if (logger.isTraceEnabled) { - logger.trace("Object removed") + if (rmiObject is RemoteObject<*>) { + logger.trace("Object removed") + } else { + logger.trace("Object removed") + } } return rmiObject } @@ -212,7 +216,7 @@ class RemoteObjectStorage(val logger: Logger) { /** - * @return all the saved RMI implementation objects along with their RMI ID. This is so we can restore these later on + * @return all the saved objects along with their RMI ID. This is so we can restore these later on */ fun getAll(): List> { return objectMap.entries.map { it -> Pair(it.key, it.value) }.toList() diff --git a/src/dorkbox/network/rmi/ResponseManager.kt b/src/dorkbox/network/rmi/ResponseManager.kt index d173d703..1cab7810 100644 --- a/src/dorkbox/network/rmi/ResponseManager.kt +++ b/src/dorkbox/network/rmi/ResponseManager.kt @@ -15,12 +15,10 @@ */ package dorkbox.network.rmi -import dorkbox.network.connection.Connection import dorkbox.objectPool.ObjectPool import dorkbox.objectPool.Pool import kotlinx.atomicfu.atomic import org.slf4j.Logger -import org.slf4j.LoggerFactory import java.util.concurrent.locks.* import kotlin.concurrent.write @@ -41,7 +39,6 @@ import kotlin.concurrent.write internal class ResponseManager(maxValuesInCache: Int = 65534, minimumValue: Int = 2) { companion object { val TIMEOUT_EXCEPTION = Exception().apply { stackTrace = arrayOf() } - private val logger: Logger = LoggerFactory.getLogger(ResponseManager::class.java.simpleName) } private val rmiWaitersInUse = atomic(0) @@ -77,7 +74,7 @@ internal class ResponseManager(maxValuesInCache: Int = 65534, minimumValue: Int */ fun notifyWaiter(id: Int, result: Any?, logger: Logger) { if (logger.isTraceEnabled) { - logger.trace("[RM] notify: $id") + logger.trace("[RM] notify: [$id]") } val previous = pendingLock.write { @@ -89,7 +86,7 @@ internal class ResponseManager(maxValuesInCache: Int = 65534, minimumValue: Int // if NULL, since either we don't exist (because we were async), or it was cancelled if (previous is ResponseWaiter) { if (logger.isTraceEnabled) { - logger.trace("[RM] valid-notify: $id") + logger.trace("[RM] valid-notify: [$id]") } // this means we were NOT timed out! (we cannot be timed out here) @@ -104,7 +101,7 @@ internal class ResponseManager(maxValuesInCache: Int = 65534, minimumValue: Int */ fun removeWaiterCallback(id: Int, logger: Logger): T? { if (logger.isTraceEnabled) { - logger.trace("[RM] get-callback: $id") + logger.trace("[RM] get-callback: [$id]") } val previous = pendingLock.write { @@ -137,7 +134,7 @@ internal class ResponseManager(maxValuesInCache: Int = 65534, minimumValue: Int val waiter = waiterCache.take() rmiWaitersInUse.getAndIncrement() if (logger.isTraceEnabled) { - logger.trace("[RM] prep in-use: ${rmiWaitersInUse.value}") + logger.trace("[RM] prep in-use: [${waiter.id}] ${rmiWaitersInUse.value}") } // this will initialize the result @@ -159,7 +156,7 @@ internal class ResponseManager(maxValuesInCache: Int = 65534, minimumValue: Int val waiter = waiterCache.take() rmiWaitersInUse.getAndIncrement() if (logger.isTraceEnabled) { - logger.trace("[RM] prep in-use: ${rmiWaitersInUse.value}") + logger.trace("[RM] prep in-use: [${waiter.id}] ${rmiWaitersInUse.value}") } // this will initialize the result @@ -185,16 +182,11 @@ internal class ResponseManager(maxValuesInCache: Int = 65534, minimumValue: Int * * @return the result (can be null) or timeout exception */ - fun getReply( - responseWaiter: ResponseWaiter, - timeoutMillis: Long, - logger: Logger, - connection: Connection - ): Any? { + fun getReply(responseWaiter: ResponseWaiter, timeoutMillis: Long, logger: Logger): Any? { val id = RmiUtils.unpackUnsignedRight(responseWaiter.id) if (logger.isTraceEnabled) { - logger.trace("[RM] get: $id") + logger.trace("[RM] get: [$id]") } // deletes the entry in the map @@ -211,7 +203,7 @@ internal class ResponseManager(maxValuesInCache: Int = 65534, minimumValue: Int if (resultOrWaiter is ResponseWaiter) { if (logger.isTraceEnabled) { - logger.trace("[RM] timeout cancel ($timeoutMillis): $id") + logger.trace("[RM] timeout cancel: [$id] ($timeoutMillis)") } return if (connection.isClosed() || connection.isClosed()) { @@ -228,7 +220,7 @@ internal class ResponseManager(maxValuesInCache: Int = 65534, minimumValue: Int val id = RmiUtils.unpackUnsignedRight(responseWaiter.id) if (logger.isTraceEnabled) { - logger.trace("[RM] abort: $id") + logger.trace("[RM] abort: [$id]") } // deletes the entry in the map @@ -242,7 +234,7 @@ internal class ResponseManager(maxValuesInCache: Int = 65534, minimumValue: Int rmiWaitersInUse.getAndDecrement() } - fun close() { + fun close(logger: Logger) { // technically, this isn't closing it, so much as it's cleaning it out if (logger.isDebugEnabled) { logger.debug("Closing the response manager for RMI")