ViewVC Help

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

root/jsr166/jsr166/src/extra166y/PAS.java

Comparing jsr166/src/extra166y/PAS.java (file contents):
Revision 1.10 by jsr166, Thu Sep 16 03:57:13 2010 UTC vs.
Revision 1.12 by jsr166, Fri Oct 22 05:18:30 2010 UTC

#	Line 1491 | Line 1491 | class PAS {
1491		if ((filtered && !pap.isSelected(k)) ||
1492		(x = src[k]) == null)
1493		continue;
1494	<	int hc = byIdentity? System.identityHashCode(x): x.hashCode();
1494	>	int hc = byIdentity ? System.identityHashCode(x) : x.hashCode();
1495		int hash = hash(hc);
1496		long entry = (((long)hash) << 32) + (k + 1);
1497		int idx = hash & mask;
#	Line 1657 | Line 1657 | class PAS {
1657		this.gran = gran;
1658		}
1659
1660	<	public void compute()  {
1660	>	public void compute() {
1661		int l = origin;
1662		int g = gran;
1663		if (n > g) {
#	Line 1693 | Line 1693 | class PAS {
1693		this.a = a; this.w = w; this.origin = origin; this.n = n;
1694		this.gran = gran;
1695		}
1696	<	public void compute()  {
1696	>	public void compute() {
1697		int l = origin;
1698		int g = gran;
1699		if (n > g) {
#	Line 1730 | Line 1730 | class PAS {
1730		this.a = a; this.w = w; this.origin = origin; this.n = n;
1731		this.gran = gran;
1732		}
1733	<	public void compute()  {
1733	>	public void compute() {
1734		int l = origin;
1735		int g = gran;
1736		if (n > g) {
#	Line 1766 | Line 1766 | class PAS {
1766		this.a = a; this.w = w; this.origin = origin; this.n = n;
1767		this.gran = gran;
1768		}
1769	<	public void compute()  {
1769	>	public void compute() {
1770		int l = origin;
1771		int g = gran;
1772		if (n > g) {
#	Line 1804 | Line 1804 | class PAS {
1804		this.gran = gran;
1805		}
1806
1807	<	public void compute()  {
1807	>	public void compute() {
1808		int l = origin;
1809		int g = gran;
1810		if (n > g) {
#	Line 1840 | Line 1840 | class PAS {
1840		this.a = a; this.w = w; this.origin = origin; this.n = n;
1841		this.gran = gran;
1842		}
1843	<	public void compute()  {
1843	>	public void compute() {
1844		int l = origin;
1845		int g = gran;
1846		if (n > g) {
#	Line 2341 | Line 2341 | class PAS {
2341		while (cmp.compare(pivot, a[right]) < 0)
2342		--right;
2343		int c;
2344	<	while (left < right && (c = cmp.compare(pivot, a[left])) >= 0){
2344	>	while (left < right &&
2345	>	(c = cmp.compare(pivot, a[left])) >= 0) {
2346		if (c != 0)
2347		sameLefts = false;
2348		++left;
#	Line 2459 | Line 2460 | class PAS {
2460		while (cmp.compare(pivot, a[right]) < 0)
2461		--right;
2462		int c;
2463	<	while (left < right && (c = cmp.compare(pivot, a[left])) >= 0){
2463	>	while (left < right &&
2464	>	(c = cmp.compare(pivot, a[left])) >= 0) {
2465		if (c != 0)
2466		sameLefts = false;
2467		++left;
#	Line 2518 | Line 2520 | class PAS {
2520		while (cmp.compare(pivot, a[right]) < 0)
2521		--right;
2522		int c;
2523	<	while (left < right && (c = cmp.compare(pivot, a[left])) >= 0){
2523	>	while (left < right &&
2524	>	(c = cmp.compare(pivot, a[left])) >= 0) {
2525		if (c != 0)
2526		sameLefts = false;
2527		++left;
#	Line 2670 | Line 2673 | class PAS {
2673		op.pushUp(par, par.left, par.right);
2674		int refork =
2675		((pb & CUMULATE) == 0 &&
2676	<	par.lo == op.origin)? CUMULATE : 0;
2676	>	par.lo == op.origin) ? CUMULATE : 0;
2677		int nextPhase = pb|cb|refork;
2678		if (pb == nextPhase ||
2679		phaseUpdater.compareAndSet(par, pb, nextPhase)) {

Diff Legend

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