diff --git a/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/ClientThroughput.java b/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/ClientThroughput.java index 1b017b1d..8dcfcbd8 100644 --- a/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/ClientThroughput.java +++ b/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/ClientThroughput.java @@ -33,7 +33,7 @@ public class ClientThroughput { new ChannelUriStringBuilder() .controlEndpoint(Configurations.MDC_ADDRESS + ':' + CONTROL_PORT) .controlMode(CommonContext.MDC_CONTROL_MODE_DYNAMIC) - .sessionId(SESSION_ID ^ Integer.MAX_VALUE) + .sessionId(~SESSION_ID) .reliable(Boolean.TRUE) .media("udp") .build(); diff --git a/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/MdcPing.java b/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/MdcPing.java index 99820c9b..a0b3d3fc 100644 --- a/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/MdcPing.java +++ b/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/MdcPing.java @@ -50,7 +50,7 @@ public class MdcPing { new ChannelUriStringBuilder() .controlEndpoint(Configurations.MDC_ADDRESS + ':' + CONTROL_PORT) .controlMode(CommonContext.MDC_CONTROL_MODE_DYNAMIC) - .sessionId(SESSION_ID ^ Integer.MAX_VALUE) + .sessionId(~SESSION_ID) .reliable(Boolean.TRUE) .media("udp") .build(); diff --git a/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/MdcPingAsync.java b/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/MdcPingAsync.java index 406ef82d..8236d68f 100644 --- a/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/MdcPingAsync.java +++ b/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/MdcPingAsync.java @@ -50,7 +50,7 @@ public class MdcPingAsync { new ChannelUriStringBuilder() .controlEndpoint(Configurations.MDC_ADDRESS + ':' + CONTROL_PORT) .controlMode(CommonContext.MDC_CONTROL_MODE_DYNAMIC) - .sessionId(SESSION_ID ^ Integer.MAX_VALUE) + .sessionId(~SESSION_ID) .reliable(Boolean.TRUE) .media("udp") .build(); diff --git a/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/MdcPong.java b/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/MdcPong.java index d1bdc3fa..a80510e0 100644 --- a/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/MdcPong.java +++ b/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/MdcPong.java @@ -30,7 +30,7 @@ public class MdcPong { private static final String OUTBOUND_CHANNEL = new ChannelUriStringBuilder() .controlEndpoint(Configurations.MDC_ADDRESS + ':' + CONTROL_PORT) - .sessionId(SESSION_ID ^ Integer.MAX_VALUE) + .sessionId(~SESSION_ID) .media("udp") .reliable(Boolean.TRUE) .build(); diff --git a/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/ServerThroughput.java b/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/ServerThroughput.java index 3c255d55..baaef6c3 100644 --- a/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/ServerThroughput.java +++ b/reactor-aeron-benchmarks/src/main/java/reactor/aeron/pure/ServerThroughput.java @@ -23,7 +23,7 @@ public class ServerThroughput { private static final String OUTBOUND_CHANNEL = new ChannelUriStringBuilder() .controlEndpoint(Configurations.MDC_ADDRESS + ':' + CONTROL_PORT) - .sessionId(SESSION_ID ^ Integer.MAX_VALUE) + .sessionId(~SESSION_ID) .media("udp") .reliable(Boolean.TRUE) .build(); diff --git a/reactor-aeron/src/main/java/reactor/aeron/AeronClientConnector.java b/reactor-aeron/src/main/java/reactor/aeron/AeronClientConnector.java index 9903d719..b1f40668 100644 --- a/reactor-aeron/src/main/java/reactor/aeron/AeronClientConnector.java +++ b/reactor-aeron/src/main/java/reactor/aeron/AeronClientConnector.java @@ -53,7 +53,7 @@ Mono start() { String inboundChannel = options .inboundUri() - .uri(b -> b.sessionId(sessionId ^ Integer.MAX_VALUE)) + .uri(b -> b.sessionId(~sessionId)) .asString(); logger.debug( "{}: creating client connection: {}", diff --git a/reactor-aeron/src/main/java/reactor/aeron/AeronResources.java b/reactor-aeron/src/main/java/reactor/aeron/AeronResources.java index a1eb4c2c..2b55655a 100644 --- a/reactor-aeron/src/main/java/reactor/aeron/AeronResources.java +++ b/reactor-aeron/src/main/java/reactor/aeron/AeronResources.java @@ -46,10 +46,7 @@ public final class AeronResources implements OnDisposable { .warnIfDirectoryExists(true) .dirDeleteOnStart(true) // low latency settings - .termBufferSparseFile(false) - // explicit range of reserved session ids - .publicationReservedSessionIdLow(0) - .publicationReservedSessionIdHigh(Integer.MAX_VALUE); + .termBufferSparseFile(false); private Supplier workerIdleStrategySupplier = defaultBackoffIdleStrategySupplier; diff --git a/reactor-aeron/src/main/java/reactor/aeron/AeronServerHandler.java b/reactor-aeron/src/main/java/reactor/aeron/AeronServerHandler.java index 08e5a460..a3e064c1 100644 --- a/reactor-aeron/src/main/java/reactor/aeron/AeronServerHandler.java +++ b/reactor-aeron/src/main/java/reactor/aeron/AeronServerHandler.java @@ -94,7 +94,7 @@ private void onImageAvailable(Image image) { // Pub(control-endpoint{address:serverControlPort}, xor(sessionId))->MDC(xor(sessionId)) int sessionId = image.sessionId(); String outboundChannel = - options.outboundUri().uri(b -> b.sessionId(sessionId ^ Integer.MAX_VALUE)).asString(); + options.outboundUri().uri(b -> b.sessionId(~sessionId)).asString(); logger.debug( "{}: creating server connection: {}", Integer.toHexString(sessionId), outboundChannel); diff --git a/reactor-aeron/src/main/java/reactor/aeron/SecureRandomSessionIdGenerator.java b/reactor-aeron/src/main/java/reactor/aeron/SecureRandomSessionIdGenerator.java index fb4315c6..d1ec9c81 100644 --- a/reactor-aeron/src/main/java/reactor/aeron/SecureRandomSessionIdGenerator.java +++ b/reactor-aeron/src/main/java/reactor/aeron/SecureRandomSessionIdGenerator.java @@ -17,6 +17,6 @@ public final class SecureRandomSessionIdGenerator implements Supplier { @Override public Integer get() { - return random.nextInt(Integer.MAX_VALUE); + return random.nextInt(); } }