dorkbox/Network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed naming consistancy with regards to MS and NANOS

Browse Source
This commit is contained in:
Robinson 2022-04-04 16:28:53 +02:00
parent 22e7acab46
commit 4e248a969f
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dorkbox/network/Configuration.kt
View File

@ -237,7 +237,7 @@ open class Configuration {
* *
* Too low and it's wasting CPU cycles, too high and there will be some lag when detecting if a connection has been disconnected. * Too low and it's wasting CPU cycles, too high and there will be some lag when detecting if a connection has been disconnected.
*/ */
var connectionCheckIntervalInMS = TimeUnit.MILLISECONDS.toNanos(200) var connectionCheckIntervalNanos = TimeUnit.MILLISECONDS.toNanos(200)
set(value) { set(value) {
require(!contextDefined) { errorMessage } require(!contextDefined) { errorMessage }
field = value field = value
@ -251,7 +251,7 @@ open class Configuration {
* *
* Too low and it's likely to get false-positives, too high and there will be some lag when detecting if a connection has been disconnected. * Too low and it's likely to get false-positives, too high and there will be some lag when detecting if a connection has been disconnected.
*/ */
var connectionExpirationTimoutInMS = TimeUnit.SECONDS.toNanos(2) var connectionExpirationTimoutNanos = TimeUnit.SECONDS.toNanos(2)
set(value) { set(value) {
require(!contextDefined) { errorMessage } require(!contextDefined) { errorMessage }
field = value field = value

23
src/dorkbox/network/connection/Connection.kt
View File

@ -95,11 +95,11 @@ open class Connection(connectionParameters: ConnectionParams<*>) {
internal var postCloseAction: suspend () -> Unit = {} internal var postCloseAction: suspend () -> Unit = {}
// only accessed on a single thread! // only accessed on a single thread!
private var connectionLastCheckTime = 0L private var connectionLastCheckTimeNanos = 0L
private var connectionTimeoutTime = 0L private var connectionTimeoutTimeNanos = 0L
private val connectionCheckIntervalInMS = connectionParameters.endPoint.config.connectionCheckIntervalInMS private val connectionCheckIntervalNanos = connectionParameters.endPoint.config.connectionCheckIntervalNanos
private val connectionExpirationTimoutInMS = connectionParameters.endPoint.config.connectionExpirationTimoutInMS private val connectionExpirationTimoutNanos = connectionParameters.endPoint.config.connectionExpirationTimoutNanos
// while on the CLIENT, if the SERVER's ecc key has changed, the client will abort and show an error. // while on the CLIENT, if the SERVER's ecc key has changed, the client will abort and show an error.
@ -167,7 +167,6 @@ open class Connection(connectionParameters: ConnectionParams<*>) {
// NOTE: subscriptions (ie: reading from buffers, etc) are not thread safe! Because it is ambiguous HOW EXACTLY they are unsafe, // NOTE: subscriptions (ie: reading from buffers, etc) are not thread safe! Because it is ambiguous HOW EXACTLY they are unsafe,
// we exclusively read from the DirectBuffer on a single thread. // we exclusively read from the DirectBuffer on a single thread.
endPoint.processMessage(buffer, offset, length, header, this@Connection) endPoint.processMessage(buffer, offset, length, header, this@Connection)
} }
@ -303,18 +302,18 @@ open class Connection(connectionParameters: ConnectionParams<*>) {
*/ */
fun isClosedViaAeron(): Boolean { fun isClosedViaAeron(): Boolean {
// we ONLY want to actually, legit check, 1 time every XXX ms. // we ONLY want to actually, legit check, 1 time every XXX ms.
val now = System.currentTimeMillis() val now = System.nanoTime()
if (now - connectionLastCheckTime < connectionCheckIntervalInMS) { if (now - connectionLastCheckTimeNanos < connectionCheckIntervalNanos) {
// we haven't waited long enough for another check. always return false (true means we are closed) // we haven't waited long enough for another check. always return false (true means we are closed)
return false return false
} }
connectionLastCheckTime = now connectionLastCheckTimeNanos = now
// if there is a network blip, we want to make sure that it is a network blip for a while, instead of just once or twice. // if there is a network blip, we want to make sure that it is a network blip for a while, instead of just once or twice.
if (subscription.isConnected && publication.isConnected) { if (subscription.isConnected && publication.isConnected) {
// reset connection timeout // reset connection timeout
connectionTimeoutTime = 0L connectionTimeoutTimeNanos = 0L
// we are still connected (true means we are closed) // we are still connected (true means we are closed)
return false return false
@ -324,15 +323,15 @@ open class Connection(connectionParameters: ConnectionParams<*>) {
// aeron is not connected // aeron is not connected
// //
if (connectionTimeoutTime == 0L) { if (connectionTimeoutTimeNanos == 0L) {
connectionTimeoutTime = now connectionTimeoutTimeNanos = now
} }
// make sure that our "isConnected" state lasts LONGER than the expiry timeout! // make sure that our "isConnected" state lasts LONGER than the expiry timeout!
// 1) connections take a little bit of time from polling -> connecting (because of how we poll connections before 'connecting' them). // 1) connections take a little bit of time from polling -> connecting (because of how we poll connections before 'connecting' them).
// 2) network blips happen. Aeron will recover, and we want to make sure that WE don't instantly DC // 2) network blips happen. Aeron will recover, and we want to make sure that WE don't instantly DC
return now - connectionTimeoutTime >= connectionExpirationTimoutInMS return now - connectionTimeoutTimeNanos >= connectionExpirationTimoutNanos
} }
/** /**