ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/concurrent/ForkJoinPool.java

Comparing jsr166/src/main/java/util/concurrent/ForkJoinPool.java (file contents):
Revision 1.241 by dl, Mon Apr 20 10:49:01 2015 UTC vs.
Revision 1.242 by dl, Wed Apr 22 16:28:47 2015 UTC

#	Line 1145 | Line 1145 | public class ForkJoinPool extends Abstra
1145		if (top == s && array == a &&
1146		casAt(a, i, t, null)) {
1147		U.putOrderedInt(this, QTOP, s - 1);
1148	<	qlock = 0; // until next line diagnosed
1149	<	//                                        U.putOrderedInt(this, QLOCK, 0);
1148	>	U.putOrderedInt(this, QLOCK, 0);
1149		return t;
1150		}
1151		U.compareAndSwapInt(this, QLOCK, 1, 0);
#	Line 2413 | Line 2412 | public class ForkJoinPool extends Abstra
2412		if ((n = s - b) < am) {
2413		setAt(a, j, task);
2414		U.putOrderedInt(q, QTOP, s + 1);
2415	<	q.qlock = 0; // fix until next line diagnosed
2417	<	// U.putOrderedInt(q, QLOCK, 0);
2415	>	U.putIntVolatile(q, QLOCK, 0);
2416		if (n <= 1)
2417		signalWork(ws, q);
2418		return;
#	Line 2470 | Line 2468 | public class ForkJoinPool extends Abstra
2468		int i = (al - 1) & (s - 1);
2469		if (w.top == s && w.array == a && casAt(a, i, task, null)) {
2470		U.putOrderedInt(w, QTOP, s - 1);
2471	<	w.qlock = 0; // fix until next line diagnosed
2474	<	//                    U.putOrderedInt(w, QLOCK, 0);
2471	>	U.putOrderedInt(w, QLOCK, 0);
2472		return true;
2473		}
2474		U.compareAndSwapInt(w, QLOCK, 1, 0);

Diff Legend

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