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

Comparing jsr166/src/jsr166e/ForkJoinPool.java (file contents):
Revision 1.58 by dl, Wed Jun 19 14:55:40 2013 UTC vs.
Revision 1.59 by jsr166, Wed Jun 19 16:22:44 2013 UTC

# Line 878 | Line 878 | public class ForkJoinPool extends Abstra
878                  }
879              }
880          }
881 <      
881 >
882          /**
883           * If present, removes from queue and executes the given task,
884           * or any other cancelled task. Returns (true) on any CAS
# Line 1386 | Line 1386 | public class ForkJoinPool extends Abstra
1386          if (wt != null && (w = wt.workQueue) != null) {
1387              int ps; long sc;
1388              w.qlock = -1;                // ensure set
1389 <            do {} while(!U.compareAndSwapLong(this, STEALCOUNT, sc = stealCount,
1390 <                                              sc + w.nsteals));
1389 >            do {} while (!U.compareAndSwapLong(this, STEALCOUNT,
1390 >                                               sc = stealCount,
1391 >                                               sc + w.nsteals));
1392              if (((ps = plock) & PL_LOCK) != 0 ||
1393                  !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
1394                  ps = acquirePlock();
# Line 1733 | Line 1734 | public class ForkJoinPool extends Abstra
1734              else if ((ns = w.nsteals) != 0) { // collect steals and retry
1735                  long sc;
1736                  w.nsteals = 0;
1737 <                do {} while(!U.compareAndSwapLong(this, STEALCOUNT,
1738 <                                                  sc = stealCount, sc + ns));
1737 >                do {} while (!U.compareAndSwapLong(this, STEALCOUNT,
1738 >                                                   sc = stealCount, sc + ns));
1739              }
1740              else {
1741                  long pc = ((d > 0 || ec != (e | INT_SIGN)) ? 0L :

Diff Legend

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