Skip to content

Commit

Permalink
Removal of ThreadHints (#55)
Browse files Browse the repository at this point in the history
Replaced it by direct call to Thread.onSpinWait.
  • Loading branch information
pveentjer authored Jan 31, 2025
1 parent 456fc19 commit 36fcb3a
Showing 10 changed files with 35 additions and 45 deletions.
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
package uk.co.real_logic.benchmarks.aeron.ipc;

import org.agrona.concurrent.OneToOneConcurrentArrayQueue;
import org.agrona.hints.ThreadHints;
import org.openjdk.jmh.annotations.*;

import java.util.Arrays;
@@ -72,7 +71,7 @@ public synchronized void setup()
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}
else
{
@@ -82,7 +81,7 @@ public synchronized void setup()
final Queue<Integer> responseQueue = responseQueues[value];
while (!responseQueue.offer(value))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}
}
@@ -146,7 +145,7 @@ private Integer sendBurst(final PerThreadState state)
{
while (!sendQueue.offer(value))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}

@@ -159,7 +158,7 @@ private Integer sendBurst(final PerThreadState state)
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}

return value;
Original file line number Diff line number Diff line change
@@ -29,7 +29,6 @@
import org.agrona.concurrent.IdleStrategy;
import org.agrona.concurrent.OneToOneConcurrentArrayQueue;
import org.agrona.concurrent.UnsafeBuffer;
import org.agrona.hints.ThreadHints;
import org.openjdk.jmh.annotations.*;

import java.util.Arrays;
@@ -175,7 +174,7 @@ public void onFragment(final DirectBuffer buffer, final int offset, final int le
final Queue<Integer> responseQueue = responseQueues[value];
while (!responseQueue.offer(SENTINEL))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}
}
@@ -199,7 +198,7 @@ private Integer sendBurst(final PerThreadState state)
buffer.putInt(0, value);
while (publication.offer(buffer, 0, SIZE_OF_INT) < 0)
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}

@@ -212,7 +211,7 @@ private Integer sendBurst(final PerThreadState state)
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}

return value;
Original file line number Diff line number Diff line change
@@ -29,7 +29,6 @@
import org.agrona.concurrent.IdleStrategy;
import org.agrona.concurrent.OneToOneConcurrentArrayQueue;
import org.agrona.concurrent.UnsafeBuffer;
import org.agrona.hints.ThreadHints;
import org.openjdk.jmh.annotations.*;

import java.util.Arrays;
@@ -175,7 +174,7 @@ public void onFragment(final DirectBuffer buffer, final int offset, final int le
final Queue<Integer> responseQueue = responseQueues[value];
while (!responseQueue.offer(SENTINEL))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}
}
@@ -215,7 +214,7 @@ private Integer sendBurst(final PerThreadState state)
buffer.putInt(0, value);
while (publication.offer(buffer, 0, SIZE_OF_INT) < 0)
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}

@@ -228,7 +227,7 @@ private Integer sendBurst(final PerThreadState state)
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}

return value;
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
package uk.co.real_logic.benchmarks.aeron.ipc;

import org.agrona.concurrent.OneToOneConcurrentArrayQueue;
import org.agrona.hints.ThreadHints;
import org.openjdk.jmh.annotations.*;

import java.util.Arrays;
@@ -73,7 +72,7 @@ public synchronized void setup()
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}
else
{
@@ -83,7 +82,7 @@ public synchronized void setup()
final Queue<Integer> responseQueue = responseQueues[value];
while (!responseQueue.offer(value))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}
}
@@ -155,7 +154,7 @@ private Integer sendBurst(final PerThreadState state)
{
while (!sendQueue.offer(value))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}

@@ -168,7 +167,7 @@ private Integer sendBurst(final PerThreadState state)
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}

return value;
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
package uk.co.real_logic.benchmarks.aeron.ipc;

import org.agrona.concurrent.OneToOneConcurrentArrayQueue;
import org.agrona.hints.ThreadHints;
import org.openjdk.jmh.annotations.*;

import java.util.Arrays;
@@ -73,7 +72,7 @@ public synchronized void setup()
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}
else
{
@@ -83,7 +82,7 @@ public synchronized void setup()
final Queue<Integer> responseQueue = responseQueues[value];
while (!responseQueue.offer(value))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}
}
@@ -155,7 +154,7 @@ private Integer sendBurst(final PerThreadState state)
{
while (!sendQueue.offer(value))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}

@@ -168,7 +167,7 @@ private Integer sendBurst(final PerThreadState state)
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}

return value;
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@
import com.lmax.disruptor.dsl.Disruptor;
import com.lmax.disruptor.dsl.ProducerType;
import org.agrona.concurrent.OneToOneConcurrentArrayQueue;
import org.agrona.hints.ThreadHints;
import org.openjdk.jmh.annotations.*;

import java.util.Arrays;
@@ -131,7 +130,7 @@ public void onEvent(final Message event, final long sequence, final boolean endO
final Queue<Integer> responseQueue = responseQueues[value];
while (!responseQueue.offer(SENTINEL))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}

@@ -206,7 +205,7 @@ private Integer sendBurst(final PerThreadState state)
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}

return value;
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
package uk.co.real_logic.benchmarks.aeron.ipc;

import org.agrona.concurrent.OneToOneConcurrentArrayQueue;
import org.agrona.hints.ThreadHints;
import org.openjdk.jmh.annotations.*;

import java.util.Arrays;
@@ -73,7 +72,7 @@ public synchronized void setup()
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}
else
{
@@ -83,7 +82,7 @@ public synchronized void setup()
final Queue<Integer> responseQueue = responseQueues[value];
while (!responseQueue.offer(value))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}
}
@@ -155,7 +154,7 @@ private Integer sendBurst(final PerThreadState state)
{
while (!sendQueue.offer(value))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}

@@ -168,7 +167,7 @@ private Integer sendBurst(final PerThreadState state)
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}

return value;
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@

import org.agrona.concurrent.ManyToOneConcurrentArrayQueue;
import org.agrona.concurrent.OneToOneConcurrentArrayQueue;
import org.agrona.hints.ThreadHints;
import org.openjdk.jmh.annotations.*;

import java.util.Arrays;
@@ -72,7 +71,7 @@ public synchronized void setup()
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}
else
{
@@ -82,7 +81,7 @@ public synchronized void setup()
final Queue<Integer> responseQueue = responseQueues[value];
while (!responseQueue.offer(value))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}
}
@@ -154,7 +153,7 @@ private Integer sendBurst(final PerThreadState state)
{
while (!sendQueue.offer(value))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}

@@ -167,7 +166,7 @@ private Integer sendBurst(final PerThreadState state)
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}

return value;
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@

import org.agrona.concurrent.ManyToOneConcurrentLinkedQueue;
import org.agrona.concurrent.OneToOneConcurrentArrayQueue;
import org.agrona.hints.ThreadHints;
import org.openjdk.jmh.annotations.*;

import java.util.Arrays;
@@ -73,7 +72,7 @@ public synchronized void setup()
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}
else
{
@@ -83,7 +82,7 @@ public synchronized void setup()
final Queue<Integer> responseQueue = responseQueues[value];
while (!responseQueue.offer(value))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}
}
@@ -155,7 +154,7 @@ private Integer sendBurst(final PerThreadState state)
{
while (!sendQueue.offer(value))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}

@@ -168,7 +167,7 @@ private Integer sendBurst(final PerThreadState state)
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}

return value;
Original file line number Diff line number Diff line change
@@ -23,7 +23,6 @@
import org.agrona.concurrent.ringbuffer.ManyToOneRingBuffer;
import org.agrona.concurrent.ringbuffer.RingBuffer;
import org.agrona.concurrent.ringbuffer.RingBufferDescriptor;
import org.agrona.hints.ThreadHints;
import org.openjdk.jmh.annotations.*;

import java.nio.ByteBuffer;
@@ -141,7 +140,7 @@ public void onMessage(final int msgTypeId, final MutableDirectBuffer buffer, fin
final Queue<Integer> responseQueue = responseQueues[value];
while (!responseQueue.offer(SENTINEL))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}
}
@@ -181,7 +180,7 @@ private Integer sendBurst(final PerThreadState state)
tempBuffer.putInt(0, value);
while (!ringBuffer.write(1, tempBuffer, 0, BitUtil.SIZE_OF_INT))
{
ThreadHints.onSpinWait();
Thread.onSpinWait();
}
}

@@ -194,7 +193,7 @@ private Integer sendBurst(final PerThreadState state)
break;
}

ThreadHints.onSpinWait();
Thread.onSpinWait();
}

return value;

0 comments on commit 36fcb3a

Please sign in to comment.