archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8215249: Miscellaneous changes imported from jsr166 CVS 2019-02

Browse source 
Reviewed-by: martin, chegar, dholmes
This commit is contained in:
Doug Lea 2019-02-15 11:18:01 -08:00
parent bb6d423ab8
commit ff97b60fde
4 changed files with 155 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java
View file

@ -98,12 +98,11 @@ import java.util.concurrent.locks.ReentrantLock;
* }
* }}</pre>
*
* Here, each worker thread processes a row of the matrix then waits at the
* barrier until all rows have been processed. When all rows are processed
* the supplied {@link Runnable} barrier action is executed and merges the
* rows. If the merger
* determines that a solution has been found then {@code done()} will return
* {@code true} and each worker will terminate.
* Here, each worker thread processes a row of the matrix, then waits at the
* barrier until all rows have been processed. When all rows are processed the
* supplied {@link Runnable} barrier action is executed and merges the rows.
* If the merger determines that a solution has been found then {@code done()}
* will return {@code true} and each worker will terminate.
*
* <p>If the barrier action does not rely on the parties being suspended when
* it is executed, then any of the threads in the party could execute that
@ -132,6 +131,7 @@ import java.util.concurrent.locks.ReentrantLock;
* corresponding {@code await()} in other threads.
*
* @see CountDownLatch
* @see Phaser
*
* @author Doug Lea
* @since 1.5
@ -214,18 +214,17 @@ public class CyclicBarrier {
int index = --count;
if (index == 0) { // tripped
boolean ranAction = false;
try {
final Runnable command = barrierCommand;
if (command != null)
Runnable command = barrierCommand;
if (command != null) {
try {
command.run();
ranAction = true;
nextGeneration();
return 0;
} finally {
if (!ranAction)
} catch (Throwable ex) {
breakBarrier();
throw ex;
}
}
nextGeneration();
return 0;
}
// loop until tripped, broken, interrupted, or timed out