Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ext/thread/Mutex.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static FiberWaiter cached(ThreadContext context, IRubyObject scheduler) {
}
}

private static final class SchedulerWaiters extends ArrayDeque<FiberWaiter> {}
static final class SchedulerWaiters extends ArrayDeque<FiberWaiter> {}

/** Fibers blocked in {@link #lock} through a fiber scheduler, created by the first one. MRI: mutex waitq */
private volatile SchedulerWaiters schedulerWaiters;
Expand Down
84 changes: 34 additions & 50 deletions core/src/main/java/org/jruby/ext/thread/Queue.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@

package org.jruby.ext.thread;

import java.util.ArrayDeque;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.function.BooleanSupplier;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import java.util.concurrent.locks.Condition;
Expand Down Expand Up @@ -193,64 +191,42 @@ static class Node {
/** Wait queue for waiting puts */
protected final Condition notFull = putLock.newCondition();

protected static final class SchedulerWaiters extends ArrayDeque<Mutex.FiberWaiter> {}

/** Fibers blocked in {@link #pop} through a fiber scheduler, created by the first one. MRI: queue waitq */
private volatile SchedulerWaiters schedulerTakers;
volatile Mutex.SchedulerWaiters schedulerTakers;

private static final AtomicReferenceFieldUpdater<Queue, SchedulerWaiters> SCHEDULER_TAKERS_UPDATER =
AtomicReferenceFieldUpdater.newUpdater(Queue.class, SchedulerWaiters.class, "schedulerTakers");
private static final AtomicReferenceFieldUpdater<Queue, Mutex.SchedulerWaiters> SCHEDULER_TAKERS_UPDATER =
AtomicReferenceFieldUpdater.newUpdater(Queue.class, Mutex.SchedulerWaiters.class, "schedulerTakers");

private SchedulerWaiters schedulerTakers() {
SchedulerWaiters waiters = schedulerTakers;
private Mutex.SchedulerWaiters schedulerTakers() {
Mutex.SchedulerWaiters waiters = schedulerTakers;
if (waiters != null) return waiters;

SCHEDULER_TAKERS_UPDATER.compareAndSet(this, null, new SchedulerWaiters());
SCHEDULER_TAKERS_UPDATER.compareAndSet(this, null, new Mutex.SchedulerWaiters());
return schedulerTakers;
}

/** Fibers blocked in SizedQueue#push through a fiber scheduler, created by the first one. MRI: szqueue pushq */
private volatile SchedulerWaiters schedulerPutters;
volatile Mutex.SchedulerWaiters schedulerPutters;

private static final AtomicReferenceFieldUpdater<Queue, SchedulerWaiters> SCHEDULER_PUTTERS_UPDATER =
AtomicReferenceFieldUpdater.newUpdater(Queue.class, SchedulerWaiters.class, "schedulerPutters");
private static final AtomicReferenceFieldUpdater<Queue, Mutex.SchedulerWaiters> SCHEDULER_PUTTERS_UPDATER =
AtomicReferenceFieldUpdater.newUpdater(Queue.class, Mutex.SchedulerWaiters.class, "schedulerPutters");

protected SchedulerWaiters schedulerPutters() {
SchedulerWaiters waiters = schedulerPutters;
private Mutex.SchedulerWaiters schedulerPutters() {
Mutex.SchedulerWaiters waiters = schedulerPutters;
if (waiters != null) return waiters;

SCHEDULER_PUTTERS_UPDATER.compareAndSet(this, null, new SchedulerWaiters());
SCHEDULER_PUTTERS_UPDATER.compareAndSet(this, null, new Mutex.SchedulerWaiters());
return schedulerPutters;
}

protected void unblockSchedulerTaker() {
unblockOneSchedulerWaiter(schedulerTakers);
}

protected void unblockSchedulerPutter() {
unblockOneSchedulerWaiter(schedulerPutters);
}

protected void unblockAllSchedulerPutters() {
unblockAllSchedulerWaiters(schedulerPutters);
}

protected int schedulerTakersWaiting() {
return schedulerWaiting(schedulerTakers);
}

protected int schedulerPuttersWaiting() {
return schedulerWaiting(schedulerPutters);
}

/**
* Block the current fiber through the scheduler until it is unblocked or the deadline
* (System.nanoTime, 0 for none) passes. The caller checks the queue again afterwards.
* (System.nanoTime, 0 for none) passes, waiting for room if push, else for an item.
* The caller checks the queue again afterwards.
*
* @return false if the deadline has passed
*/
protected boolean schedulerBlock(ThreadContext context, IRubyObject scheduler, SchedulerWaiters waiters,
BooleanSupplier ready, long deadline) {
protected boolean schedulerBlock(ThreadContext context, IRubyObject scheduler, boolean push, long deadline) {
IRubyObject timeout = context.nil;
if (deadline != 0) {
long remaining = deadline - System.nanoTime();
Expand All @@ -259,9 +235,10 @@ protected boolean schedulerBlock(ThreadContext context, IRubyObject scheduler, S
}

Mutex.FiberWaiter waiter = Mutex.FiberWaiter.cached(context, scheduler);
Mutex.SchedulerWaiters waiters = push ? schedulerPutters() : schedulerTakers();
synchronized (waiters) {
// a push or pop may have landed since we last looked, and found no one to wake
if (ready.getAsBoolean()) return true;
if (schedulerReady(push)) return true;

waiters.add(waiter);
}
Expand All @@ -277,8 +254,15 @@ protected boolean schedulerBlock(ThreadContext context, IRubyObject scheduler, S
return true;
}

/** Whether a blocked push would find room, or a blocked pop an item; a closed queue counts as ready for both. */
private boolean schedulerReady(boolean push) {
if (closed) return true;

return push ? count.get() < capacity : count.get() > 0;
}

// MRI: wakeup_one. The woken fiber checks the queue again, and blocks again if someone else got there first.
protected void unblockOneSchedulerWaiter(SchedulerWaiters waiters) {
void unblockOneSchedulerWaiter(Mutex.SchedulerWaiters waiters) {
if (waiters == null) return;

Mutex.FiberWaiter waiter;
Expand All @@ -290,7 +274,7 @@ protected void unblockOneSchedulerWaiter(SchedulerWaiters waiters) {
}

// MRI: wakeup_all, for when the whole queue changes, such as on close
protected void unblockAllSchedulerWaiters(SchedulerWaiters waiters) {
void unblockAllSchedulerWaiters(Mutex.SchedulerWaiters waiters) {
if (waiters == null) return;

Mutex.FiberWaiter[] woken;
Expand All @@ -307,7 +291,7 @@ protected void unblockAllSchedulerWaiters(SchedulerWaiters waiters) {
}
}

protected static int schedulerWaiting(SchedulerWaiters waiters) {
static int schedulerWaiting(Mutex.SchedulerWaiters waiters) {
if (waiters == null) return 0;

synchronized (waiters) {
Expand All @@ -329,7 +313,7 @@ private IRubyObject schedulerPop(ThreadContext context, IRubyObject scheduler, l

if (closed) return context.nil;

if (!schedulerBlock(context, scheduler, schedulerTakers(), () -> count.get() > 0 || closed, deadline)) {
if (!schedulerBlock(context, scheduler, false, deadline)) {
return context.nil;
}
}
Expand Down Expand Up @@ -454,7 +438,7 @@ public IRubyObject clear(ThreadContext context) {
throw createInterruptedError(context, "clear");
}

unblockAllSchedulerPutters();
unblockAllSchedulerWaiters(schedulerPutters);

return this;
}
Expand Down Expand Up @@ -508,7 +492,7 @@ public RubyNumeric num_waiting(ThreadContext context) {
try {
takeLock.lockInterruptibly();
try {
return asFixnum(context, takeLock.getWaitQueueLength(notEmpty) + schedulerTakersWaiting());
return asFixnum(context, takeLock.getWaitQueueLength(notEmpty) + schedulerWaiting(schedulerTakers));
} finally {
takeLock.unlock();
}
Expand Down Expand Up @@ -684,7 +668,7 @@ protected void putInternal(ThreadContext context, IRubyObject e) throws Interrup
if (c == 0)
signalNotEmpty();

unblockSchedulerTaker();
unblockOneSchedulerWaiter(schedulerTakers);
}

@JRubyMethod
Expand Down Expand Up @@ -809,7 +793,7 @@ protected IRubyObject takeInternal(ThreadContext context) throws InterruptedExce
if (notFullSignalNeeded)
signalNotFull();

unblockSchedulerPutter();
unblockOneSchedulerWaiter(schedulerPutters);

return x;
}
Expand All @@ -834,7 +818,7 @@ public IRubyObject pollInternal() throws InterruptedException {
}
if (c == capacity)
signalNotFull();
unblockSchedulerPutter();
unblockOneSchedulerWaiter(schedulerPutters);
return x;
}

Expand Down Expand Up @@ -864,7 +848,7 @@ public IRubyObject pollInternal(long timeout, TimeUnit unit) throws InterruptedE
}
if (c == capacity)
signalNotFull();
unblockSchedulerPutter();
unblockOneSchedulerWaiter(schedulerPutters);
return x;
}

Expand Down
10 changes: 5 additions & 5 deletions core/src/main/java/org/jruby/ext/thread/SizedQueue.java
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public synchronized IRubyObject max_set(ThreadContext context, IRubyObject arg)
fullyUnlock();
}

unblockAllSchedulerPutters();
unblockAllSchedulerWaiters(schedulerPutters);

return arg;
}
Expand All @@ -118,7 +118,7 @@ public RubyNumeric num_waiting(ThreadContext context) {
putLock.lockInterruptibly();
try {
return asFixnum(context, takeLock.getWaitQueueLength(notEmpty) + putLock.getWaitQueueLength(notFull)
+ schedulerTakersWaiting() + schedulerPuttersWaiting());
+ schedulerWaiting(schedulerTakers) + schedulerWaiting(schedulerPutters));
} finally {
putLock.unlock();
}
Expand Down Expand Up @@ -219,7 +219,7 @@ private IRubyObject schedulerPush(ThreadContext context, IRubyObject scheduler,
// A closed queue never makes room for us, so raise here instead of looping forever.
if (closed) raiseClosedError(context);

if (!schedulerBlock(context, scheduler, schedulerPutters(), () -> count.get() < capacity || closed, deadline)) {
if (!schedulerBlock(context, scheduler, true, deadline)) {
return context.nil;
}
}
Expand All @@ -246,7 +246,7 @@ protected boolean offerInternal(ThreadContext context, IRubyObject e) {
putLock.unlock();
}
if (c == 0) signalNotEmpty();
unblockSchedulerTaker();
unblockOneSchedulerWaiter(schedulerTakers);
return true;
}

Expand Down Expand Up @@ -291,7 +291,7 @@ public boolean offerInternal(ThreadContext context, IRubyObject e, long timeout,
putLock.unlock();
}
if (c == 0) signalNotEmpty();
unblockSchedulerTaker();
unblockOneSchedulerWaiter(schedulerTakers);
return true;
}

Expand Down
Loading