Skip to content

Commit 2d331dc

Browse files
authored
Aeron upgrade to 1.49.0 and agrona to 2.3.0 (#556)
1 parent eef1874 commit 2d331dc

File tree

10 files changed

+40
-32
lines changed

10 files changed

+40
-32
lines changed

artio-codecs/src/main/java/uk/co/real_logic/artio/ilink/ILinkMessageConsumer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ public interface ILinkMessageConsumer extends FixPMessageConsumer
4141
*/
4242
void onBusinessMessage(FixPMessageDecoder iLinkMessage, DirectBuffer buffer, int offset, ArtioLogHeader header);
4343

44-
default void onMessage(FixPMessageDecoder fixPMessage, DirectBuffer buffer, int offset, ArtioLogHeader header)
44+
default void onMessage(
45+
final FixPMessageDecoder fixPMessage,
46+
final DirectBuffer buffer,
47+
final int offset,
48+
final ArtioLogHeader header)
4549
{
4650
onBusinessMessage(fixPMessage, buffer, offset, header);
4751
}

artio-codecs/src/main/java/uk/co/real_logic/artio/util/AsciiBuffer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ DecimalFloat getFloat(
7676
DecimalFloatOverflowHandler decimalFloatOverflowHandler);
7777

7878
default DecimalFloat getFloat(
79-
DecimalFloat number,
80-
int offset,
81-
int length)
79+
final DecimalFloat number,
80+
final int offset,
81+
final int length)
8282
{
8383
return getFloat(number, offset, length, -1, null);
8484
}

artio-core/src/main/java/uk/co/real_logic/artio/engine/EngineScheduler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static void fail()
6565
throw new IllegalStateException("Cannot re-use scheduler for multiple launch attempts");
6666
}
6767

68-
static void awaitRunnerStart(AgentRunner runner)
68+
static void awaitRunnerStart(final AgentRunner runner)
6969
{
7070
if (runner != null)
7171
{

artio-core/src/main/java/uk/co/real_logic/artio/session/ResendRequestController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void onResend(
5353
* @param remainingReplaysInFlight the number of remaining replays in flight for this Session after the completion of this
5454
* replay.
5555
*/
56-
default void onResendComplete(Session session, final int remainingReplaysInFlight)
56+
default void onResendComplete(final Session session, final int remainingReplaysInFlight)
5757
{
5858
// default and empty for backwards compatibility reasons.
5959
}

artio-core/src/main/java/uk/co/real_logic/artio/session/SessionCustomisationStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static SessionCustomisationStrategy none()
5555
* @param header the header about to be sent
5656
* @param sessionId the surrogate id for the Session that is being customised
5757
*/
58-
default void configureHeader(SessionHeaderEncoder header, long sessionId)
58+
default void configureHeader(final SessionHeaderEncoder header, final long sessionId)
5959
{
6060
}
6161
}

artio-core/src/main/java/uk/co/real_logic/artio/timing/HistogramLogReader.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.agrona.LangUtil;
2222
import org.agrona.collections.Int2ObjectHashMap;
2323
import org.agrona.concurrent.BackoffIdleStrategy;
24-
import org.agrona.concurrent.SigInt;
24+
import org.agrona.concurrent.ShutdownSignalBarrier;
2525
import uk.co.real_logic.artio.engine.ByteBufferUtil;
2626

2727
import java.io.File;
@@ -59,9 +59,9 @@ public static void main(final String[] args) throws IOException
5959
MINUTES.toNanos(1));
6060

6161
final AtomicBoolean running = new AtomicBoolean(true);
62-
SigInt.register(() -> running.set(false));
6362

64-
try (HistogramLogReader logReader = new HistogramLogReader(file))
63+
try (ShutdownSignalBarrier barrier = new ShutdownSignalBarrier(() -> running.set(false));
64+
HistogramLogReader logReader = new HistogramLogReader(file))
6565
{
6666
do
6767
{

artio-core/src/main/java/uk/co/real_logic/artio/validation/AuthenticationStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static AuthenticationStrategy of(final MessageValidationStrategy delegate)
5050
* message and is safe to use within your own code without copying.
5151
* @param authProxy the proxy to notify when you're ready to authenticate.
5252
*/
53-
default void authenticateAsync(AbstractLogonDecoder logon, AuthenticationProxy authProxy)
53+
default void authenticateAsync(final AbstractLogonDecoder logon, final AuthenticationProxy authProxy)
5454
{
5555
if (authenticate(logon))
5656
{

artio-samples/src/main/java/uk/co/real_logic/artio/SampleUtil.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import io.aeron.driver.MediaDriver;
1919
import org.agrona.concurrent.Agent;
2020
import org.agrona.concurrent.AgentRunner;
21-
import org.agrona.concurrent.SigInt;
21+
import org.agrona.concurrent.ShutdownSignalBarrier;
2222
import org.agrona.concurrent.status.AtomicCounter;
2323
import uk.co.real_logic.artio.library.FixLibrary;
2424
import uk.co.real_logic.artio.library.LibraryConfiguration;
@@ -52,13 +52,14 @@ public static void runAgentUntilSignal(
5252
final Thread thread = AgentRunner.startOnThread(runner);
5353

5454
final AtomicBoolean running = new AtomicBoolean(true);
55-
SigInt.register(() -> running.set(false));
56-
57-
while (running.get())
55+
try (ShutdownSignalBarrier barrier = new ShutdownSignalBarrier(() -> running.set(false)))
5856
{
59-
Thread.sleep(100);
60-
}
57+
while (running.get())
58+
{
59+
Thread.sleep(100);
60+
}
6161

62-
thread.join();
62+
thread.join();
63+
}
6364
}
6465
}

artio-samples/src/main/java/uk/co/real_logic/artio/server/SampleServer.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.aeron.driver.MediaDriver.Context;
2222
import org.agrona.IoUtil;
2323
import org.agrona.concurrent.IdleStrategy;
24-
import org.agrona.concurrent.SigInt;
24+
import org.agrona.concurrent.ShutdownSignalBarrier;
2525
import uk.co.real_logic.artio.CommonConfiguration;
2626
import uk.co.real_logic.artio.SampleUtil;
2727
import uk.co.real_logic.artio.engine.EngineConfiguration;
@@ -96,17 +96,20 @@ public static void main(final String[] args)
9696
try (FixLibrary library = SampleUtil.blockingConnect(libraryConfiguration))
9797
{
9898
final AtomicBoolean running = new AtomicBoolean(true);
99-
SigInt.register(() -> running.set(false));
100-
101-
while (running.get())
99+
try (ShutdownSignalBarrier barrier = new ShutdownSignalBarrier(() -> running.set(false)))
102100
{
103-
idleStrategy.idle(library.poll(1));
104101

105-
if (session != null && session.state() == DISCONNECTED)
102+
while (running.get())
106103
{
107-
break;
104+
idleStrategy.idle(library.poll(1));
105+
106+
if (session != null && session.state() == DISCONNECTED)
107+
{
108+
break;
109+
}
108110
}
109111
}
112+
110113
}
111114
}
112115

gradle/libs.versions.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
2-
aeron = "1.48.5"
3-
agrona = "2.2.4"
4-
byteBuddy = "1.17.6"
5-
checkstyle = "10.26.0"
2+
aeron = "1.49.0"
3+
agrona = "2.3.0"
4+
byteBuddy = "1.17.7"
5+
checkstyle = "11.1.0"
66
commons-codec = "1.15"
77
commons-lang3 = "3.8.1"
88
hamcrest = "3.0"
@@ -12,11 +12,11 @@ jmh = "1.37"
1212
json = "20250517"
1313
junit = "5.13.2"
1414
junit4 = "4.13.2"
15-
mockito = "5.18.0"
15+
mockito = "5.20.0"
1616
plexus = "3.3.0"
17-
sbe = "1.35.6"
17+
sbe = "1.36.0"
1818
shadow = "8.3.7"
19-
versions = "0.52.0"
19+
versions = "0.53.0"
2020

2121
[libraries]
2222
agrona = { group = "org.agrona", name = "agrona", version.ref = "agrona" }

0 commit comments

Comments
 (0)