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

Fixed merge conflicts

This commit is contained in:
Robinson 2023-07-01 13:20:14 +02:00
parent 7d331f8a1d
commit 598e06e9d3
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dorkbox/network/aeron/AeronDriver.kt
View File

@ -491,7 +491,7 @@ class AeronDriver private constructor(config: Configuration, val logger: KLogger
*
* The publication returned is threadsafe.
*/
fun addPublication(publicationUri: ChannelUriStringBuilder, streamId: Int, logInfo: String): Publication {
suspend fun addPublication(publicationUri: ChannelUriStringBuilder, streamId: Int, logInfo: String): Publication {
return internal.addPublication(logger, publicationUri, streamId, logInfo)
}
@ -515,7 +515,7 @@ class AeronDriver private constructor(config: Configuration, val logger: KLogger
* {@link Aeron.Context#availableImageHandler(AvailableImageHandler)} and
* {@link Aeron.Context#unavailableImageHandler(UnavailableImageHandler)} from the {@link Aeron.Context}.
*/
fun addSubscription(subscriptionUri: ChannelUriStringBuilder, streamId: Int, logInfo: String): Subscription {
suspend fun addSubscription(subscriptionUri: ChannelUriStringBuilder, streamId: Int, logInfo: String): Subscription {
return internal.addSubscription(logger, subscriptionUri, streamId, logInfo)
}

7
src/dorkbox/network/aeron/AeronDriverInternal.kt
View File

@ -27,6 +27,7 @@ import dorkbox.network.exceptions.AeronDriverException
import dorkbox.network.exceptions.ClientRetryException
import io.aeron.*
import io.aeron.driver.MediaDriver
import io.aeron.status.ChannelEndpointStatus
import kotlinx.atomicfu.atomic
import kotlinx.coroutines.delay
import kotlinx.coroutines.sync.Mutex
@ -318,7 +319,7 @@ internal class AeronDriverInternal(endPoint: EndPoint<*>?, private val config: C
}
registeredPublications++
registeredPublications.getAndIncrement()
if (logger.isTraceEnabled) {
registeredPublicationsTrace.add(publication.registrationId())
}
@ -397,7 +398,7 @@ internal class AeronDriverInternal(endPoint: EndPoint<*>?, private val config: C
logger.debug { "Aeron Driver [$driverId]: Delayed creation of publication [$logInfo] :: sessionId=${publicationUri.sessionId()}, streamId=${streamId}" }
}
registeredPublications++
registeredPublications.getAndIncrement()
if (logger.isTraceEnabled) {
registeredPublicationsTrace.add(publication.registrationId())
}
@ -479,7 +480,7 @@ internal class AeronDriverInternal(endPoint: EndPoint<*>?, private val config: C
logger.debug { "Aeron Driver [$driverId]: Delayed creation of subscription [$logInfo] :: sessionId=${subscriptionUri.sessionId()}, streamId=${streamId}" }
}
registeredSubscriptions++
registeredSubscriptions.getAndIncrement()
if (logger.isTraceEnabled) {
registeredSubscriptionsTrace.add(subscription.registrationId())
}