ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/ForkJoinPool.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/ForkJoinPool.java (file contents):
Revision 1.172 by dl, Mon Apr 8 15:26:54 2013 UTC vs.
Revision 1.173 by jsr166, Tue Apr 16 05:53:51 2013 UTC

# Line 1522 | Line 1522 | public class ForkJoinPool extends Abstra
1522       * @param q if non-null, the queue holding tasks to be processed
1523       */
1524      final void signalWork(WorkQueue q) {
1525 <        long c; int e, u, i, n; WorkQueue[] ws; WorkQueue w;  Thread p;
1525 >        long c; int e, u, i, n; WorkQueue[] ws; WorkQueue w; Thread p;
1526          if ((u = (int)((c = ctl) >>> 32)) < 0) {
1527              if ((e = (int)c) > 0) {
1528                  if ((ws = workQueues) != null && ws.length > (i = e & SMASK) &&
# Line 1786 | Line 1786 | public class ForkJoinPool extends Abstra
1786                          }
1787                      }
1788                      for (;;) { // help stealer or descend to its stealer
1789 <                        ForkJoinTask[] a;  int b;
1789 >                        ForkJoinTask[] a; int b;
1790                          if (subtask.status < 0)     // surround probes with
1791                              continue restart;       //   consistency checks
1792                          if ((b = v.base) - v.top < 0 && (a = v.array) != null) {
# Line 2230 | Line 2230 | public class ForkJoinPool extends Abstra
2230       */
2231      static boolean tryExternalUnpush(ForkJoinTask<?> t) {
2232          ForkJoinPool p; WorkQueue[] ws; WorkQueue q;
2233 <        ForkJoinTask<?>[] a;  int m, s, z;
2233 >        ForkJoinTask<?>[] a; int m, s, z;
2234          if (t != null &&
2235              (z = ThreadLocalRandom.getProbe()) != 0 &&
2236              (p = common) != null &&
# Line 2325 | Line 2325 | public class ForkJoinPool extends Abstra
2325      static void externalHelpJoin(ForkJoinTask<?> t) {
2326          // Some hard-to-avoid overlap with tryExternalUnpush
2327          ForkJoinPool p; WorkQueue[] ws; WorkQueue q, w;
2328 <        ForkJoinTask<?>[] a;  int m, s, n, z;
2328 >        ForkJoinTask<?>[] a; int m, s, n, z;
2329          if (t != null &&
2330              (z = ThreadLocalRandom.getProbe()) != 0 &&
2331              (p = common) != null &&

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines