--- jsr166/src/jsr166y/Phaser.java 2009/01/05 05:50:47 1.8 +++ jsr166/src/jsr166y/Phaser.java 2009/07/20 22:40:09 1.13 @@ -5,6 +5,7 @@ */ package jsr166y; + import java.util.concurrent.*; import java.util.concurrent.atomic.*; import java.util.concurrent.locks.LockSupport; @@ -13,9 +14,9 @@ import java.lang.reflect.*; /** * A reusable synchronization barrier, similar in functionality to a - * {@link java.util.concurrent.CyclicBarrier} and {@link - * java.util.concurrent.CountDownLatch} but supporting more flexible - * usage. + * {@link java.util.concurrent.CyclicBarrier CyclicBarrier} and + * {@link java.util.concurrent.CountDownLatch CountDownLatch} + * but supporting more flexible usage. * *
Sample usages: @@ -89,18 +93,18 @@ import java.lang.reflect.*; * idiom is for the method setting this up to first register, then * start the actions, then deregister, as in: * - *
- * void runTasks(List<Runnable> list) { - * final Phaser phaser = new Phaser(1); // "1" to register self - * for (Runnable r : list) { - * phaser.register(); - * new Thread() { - * public void run() { - * phaser.arriveAndAwaitAdvance(); // await all creation - * r.run(); - * phaser.arriveAndDeregister(); // signal completion - * } - * }.start(); + ** *{@code + * void runTasks(List+ * }}list) { + * final Phaser phaser = new Phaser(1); // "1" to register self + * for (Runnable r : list) { + * phaser.register(); + * new Thread() { + * public void run() { + * phaser.arriveAndAwaitAdvance(); // await all creation + * r.run(); + * phaser.arriveAndDeregister(); // signal completion + * } + * }.start(); * } * * doSomethingOnBehalfOfWorkers(); @@ -109,59 +113,55 @@ import java.lang.reflect.*; * p = phaser.awaitAdvance(p); // ... and await arrival * otherActions(); // do other things while tasks execute * phaser.awaitAdvance(p); // await final completion - * } - *
One way to cause a set of threads to repeatedly perform actions * for a given number of iterations is to override {@code onAdvance}: * - *
- * void startTasks(List<Runnable> list, final int iterations) { - * final Phaser phaser = new Phaser() { - * public boolean onAdvance(int phase, int registeredParties) { - * return phase >= iterations || registeredParties == 0; + ** *{@code + * void startTasks(List+ * }}list, final int iterations) { + * final Phaser phaser = new Phaser() { + * public boolean onAdvance(int phase, int registeredParties) { + * return phase >= iterations || registeredParties == 0; + * } + * }; + * phaser.register(); + * for (Runnable r : list) { + * phaser.register(); + * new Thread() { + * public void run() { + * do { + * r.run(); + * phaser.arriveAndAwaitAdvance(); + * } while(!phaser.isTerminated(); * } - * }; - * phaser.register(); - * for (Runnable r : list) { - * phaser.register(); - * new Thread() { - * public void run() { - * do { - * r.run(); - * phaser.arriveAndAwaitAdvance(); - * } while(!phaser.isTerminated(); - * } - * }.start(); + * }.start(); * } * phaser.arriveAndDeregister(); // deregister self, don't wait - * } - *
To create a set of tasks using a tree of Phasers, * you could use code of the following form, assuming a * Task class with a constructor accepting a Phaser that * it registers for upon construction: - *
- * void build(Task[] actions, int lo, int hi, Phaser b) { - * int step = (hi - lo) / TASKS_PER_PHASER; - * if (step > 1) { - * int i = lo; - * while (i < hi) { - * int r = Math.min(i + step, hi); - * build(actions, i, r, new Phaser(b)); - * i = r; - * } - * } - * else { - * for (int i = lo; i < hi; ++i) - * actions[i] = new Task(b); - * // assumes new Task(b) performs b.register() - * } - * } - * // .. initially called, for n tasks via - * build(new Task[n], 0, n, new Phaser()); - *+ *
{@code + * void build(Task[] actions, int lo, int hi, Phaser b) { + * int step = (hi - lo) / TASKS_PER_PHASER; + * if (step > 1) { + * int i = lo; + * while (i < hi) { + * int r = Math.min(i + step, hi); + * build(actions, i, r, new Phaser(b)); + * i = r; + * } + * } else { + * for (int i = lo; i < hi; ++i) + * actions[i] = new Task(b); + * // assumes new Task(b) performs b.register() + * } + * } + * // .. initially called, for n tasks via + * build(new Task[n], 0, n, new Phaser());}* * The best value of {@code TASKS_PER_PHASER} depends mainly on * expected barrier synchronization rates. A value as low as four may @@ -199,20 +199,20 @@ public class Phaser { * and encoding simple, and keeping race windows short. * * Note: there are some cheats in arrive() that rely on unarrived - * being lowest 16 bits. + * count being lowest 16 bits. */ private volatile long state; private static final int ushortBits = 16; - private static final int ushortMask = (1 << ushortBits) - 1; - private static final int phaseMask = 0x7fffffff; + private static final int ushortMask = 0xffff; + private static final int phaseMask = 0x7fffffff; private static int unarrivedOf(long s) { return (int)(s & ushortMask); } private static int partiesOf(long s) { - return (int)(s & (ushortMask << 16)) >>> 16; + return ((int)s) >>> 16; } private static int phaseOf(long s) { @@ -224,17 +224,21 @@ public class Phaser { } private static long stateFor(int phase, int parties, int unarrived) { - return (((long)phase) << 32) | ((parties << 16) | unarrived); + return ((((long)phase) << 32) | (((long)parties) << 16) | + (long)unarrived); } private static long trippedStateFor(int phase, int parties) { - return (((long)phase) << 32) | ((parties << 16) | parties); + long lp = (long)parties; + return (((long)phase) << 32) | (lp << 16) | lp; } - private static IllegalStateException badBounds(int parties, int unarrived) { - return new IllegalStateException - ("Attempt to set " + unarrived + - " unarrived of " + parties + " parties"); + /** + * Returns message string for bad bounds exceptions + */ + private static String badBounds(int parties, int unarrived) { + return ("Attempt to set " + unarrived + + " unarrived of " + parties + " parties"); } /** @@ -251,7 +255,7 @@ public class Phaser { // Wait queues /** - * Heads of Treiber stacks waiting for nonFJ threads. To eliminate + * Heads of Treiber stacks for waiting threads. To eliminate * contention while releasing some threads while adding others, we * use two of them, alternating across even and odd phases. */ @@ -295,7 +299,8 @@ public class Phaser { /** * Creates a new Phaser without any initially registered parties, - * initial phase number 0, and no parent. + * initial phase number 0, and no parent. Any thread using this + * Phaser will need to first register for it. */ public Phaser() { this(null); @@ -393,7 +398,7 @@ public class Phaser { if (phase < 0) break; if (parties > ushortMask || unarrived > ushortMask) - throw badBounds(parties, unarrived); + throw new IllegalStateException(badBounds(parties, unarrived)); if (phase == phaseOf(root.state) && casState(s, stateFor(phase, parties, unarrived))) break; @@ -415,6 +420,8 @@ public class Phaser { for (;;) { long s = state; phase = phaseOf(s); + if (phase < 0) + break; int parties = partiesOf(s); int unarrived = unarrivedOf(s) - 1; if (unarrived > 0) { // Not the last arrival @@ -440,12 +447,10 @@ public class Phaser { } } } - else if (phase < 0) // Don't throw exception if terminated - break; else if (phase != phaseOf(root.state)) // or if unreconciled reconcileState(); else - throw badBounds(parties, unarrived); + throw new IllegalStateException(badBounds(parties, unarrived)); } return phase; } @@ -469,6 +474,8 @@ public class Phaser { for (;;) { long s = state; phase = phaseOf(s); + if (phase < 0) + break; int parties = partiesOf(s) - 1; int unarrived = unarrivedOf(s) - 1; if (parties >= 0) { @@ -494,14 +501,12 @@ public class Phaser { } continue; } - if (phase < 0) - break; if (par != null && phase != phaseOf(root.state)) { reconcileState(); continue; } } - throw badBounds(parties, unarrived); + throw new IllegalStateException(badBounds(parties, unarrived)); } return phase; } @@ -533,7 +538,7 @@ public class Phaser { int p = phaseOf(s); if (p != phase) return p; - if (unarrivedOf(s) == 0) + if (unarrivedOf(s) == 0 && parent != null) parent.awaitAdvance(phase); // Fall here even if parent waited, to reconcile and help release return untimedWait(phase); @@ -548,14 +553,15 @@ public class Phaser { * @return the phase on exit from this method * @throws InterruptedException if thread interrupted while waiting */ - public int awaitAdvanceInterruptibly(int phase) throws InterruptedException { + public int awaitAdvanceInterruptibly(int phase) + throws InterruptedException { if (phase < 0) return phase; long s = getReconciledState(); int p = phaseOf(s); if (p != phase) return p; - if (unarrivedOf(s) != 0) + if (unarrivedOf(s) == 0 && parent != null) parent.awaitAdvanceInterruptibly(phase); return interruptibleWait(phase); } @@ -577,7 +583,7 @@ public class Phaser { int p = phaseOf(s); if (p != phase) return p; - if (unarrivedOf(s) == 0) + if (unarrivedOf(s) == 0 && parent != null) parent.awaitAdvanceInterruptibly(phase, timeout, unit); return timedWait(phase, unit.toNanos(timeout)); } @@ -617,9 +623,9 @@ public class Phaser { } /** - * Returns true if the current phase number equals the given phase. + * Returns {@code true} if the current phase number equals the given phase. * @param phase the phase - * @return true if the current phase number equals the given phase. + * @return {@code true} if the current phase number equals the given phase */ public final boolean hasPhase(int phase) { return phaseOf(getReconciledState()) == phase; @@ -653,7 +659,7 @@ public class Phaser { /** * Returns the parent of this phaser, or null if none. - * @return the parent of this phaser, or null if none. + * @return the parent of this phaser, or null if none */ public Phaser getParent() { return parent; @@ -662,15 +668,15 @@ public class Phaser { /** * Returns the root ancestor of this phaser, which is the same as * this phaser if it has no parent. - * @return the root ancestor of this phaser. + * @return the root ancestor of this phaser */ public Phaser getRoot() { return root; } /** - * Returns true if this barrier has been terminated. - * @return true if this barrier has been terminated + * Returns {@code true} if this barrier has been terminated. + * @return {@code true} if this barrier has been terminated */ public boolean isTerminated() { return getPhase() < 0; @@ -702,9 +708,8 @@ public class Phaser { * method. * * @param phase the phase number on entering the barrier - * @param registeredParties the current number of registered - * parties. - * @return true if this barrier should terminate + * @param registeredParties the current number of registered parties + * @return {@code true} if this barrier should terminate */ protected boolean onAdvance(int phase, int registeredParties) { return registeredParties <= 0; @@ -713,51 +718,67 @@ public class Phaser { /** * Returns a string identifying this phaser, as well as its * state. The state, in brackets, includes the String {@code - * "phase ="} followed by the phase number, {@code "parties ="} + * "phase = "} followed by the phase number, {@code "parties = "} * followed by the number of registered parties, and {@code - * "arrived ="} followed by the number of arrived parties + * "arrived = "} followed by the number of arrived parties. * * @return a string identifying this barrier, as well as its state */ public String toString() { long s = getReconciledState(); - return super.toString() + "[phase = " + phaseOf(s) + " parties = " + partiesOf(s) + " arrived = " + arrivedOf(s) + "]"; + return super.toString() + + "[phase = " + phaseOf(s) + + " parties = " + partiesOf(s) + + " arrived = " + arrivedOf(s) + "]"; } // methods for waiting - /** The number of CPUs, for spin control */ - static final int NCPUS = Runtime.getRuntime().availableProcessors(); - /** - * The number of times to spin before blocking in timed waits. - * The value is empirically derived. + * Wait nodes for Treiber stack representing wait queue */ - static final int maxTimedSpins = (NCPUS < 2)? 0 : 32; - - /** - * The number of times to spin before blocking in untimed waits. - * This is greater than timed value because untimed waits spin - * faster since they don't need to check times on each spin. - */ - static final int maxUntimedSpins = maxTimedSpins * 32; - - /** - * The number of nanoseconds for which it is faster to spin - * rather than to use timed park. A rough estimate suffices. - */ - static final long spinForTimeoutThreshold = 1000L; - - /** - * Wait nodes for Treiber stack representing wait queue for non-FJ - * tasks. - */ - static final class QNode { - QNode next; + static final class QNode implements ForkJoinPool.ManagedBlocker { + final Phaser phaser; + final int phase; + final long startTime; + final long nanos; + final boolean timed; + final boolean interruptible; + volatile boolean wasInterrupted = false; volatile Thread thread; // nulled to cancel wait - QNode() { + QNode next; + QNode(Phaser phaser, int phase, boolean interruptible, + boolean timed, long startTime, long nanos) { + this.phaser = phaser; + this.phase = phase; + this.timed = timed; + this.interruptible = interruptible; + this.startTime = startTime; + this.nanos = nanos; thread = Thread.currentThread(); } + public boolean isReleasable() { + return (thread == null || + phaser.getPhase() != phase || + (interruptible && wasInterrupted) || + (timed && (nanos - (System.nanoTime() - startTime)) <= 0)); + } + public boolean block() { + if (Thread.interrupted()) { + wasInterrupted = true; + if (interruptible) + return true; + } + if (!timed) + LockSupport.park(this); + else { + long waitTime = nanos - (System.nanoTime() - startTime); + if (waitTime <= 0) + return true; + LockSupport.parkNanos(this, waitTime); + } + return isReleasable(); + } void signal() { Thread t = thread; if (t != null) { @@ -765,6 +786,16 @@ public class Phaser { LockSupport.unpark(t); } } + boolean doWait() { + if (thread != null) { + try { + ForkJoinPool.managedBlock(this, false); + } catch (InterruptedException ie) { + } + } + return wasInterrupted; + } + } /** @@ -780,132 +811,141 @@ public class Phaser { } /** + * Tries to enqueue given node in the appropriate wait queue + * @return true if successful + */ + private boolean tryEnqueue(QNode node) { + AtomicReference