ViewVC Help

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

root/jsr166/jsr166/src/test/loops/FJPhaserJacobi.java

Comparing jsr166/src/test/loops/FJPhaserJacobi.java (file contents):
Revision 1.4 by dl, Fri Oct 30 14:15:04 2009 UTC vs.
Revision 1.12 by jsr166, Mon Aug 10 03:13:33 2015 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7	–	// Barrier version of Jacobi iteration
8	–
7		import java.util.concurrent.*;
10	–	//import jsr166y.*;
8
9	+	/** Barrier version of Jacobi iteration */
10		public class FJPhaserJacobi {
11
12		static int dimGran;
#	Line 26 | Line 24 | public class FJPhaserJacobi {
24		}
25
26		catch (Exception e) {
27	<	System.out.println("Usage: java FJPhaserJacobi <matrix size> <max steps>");
27	>	System.out.println("Usage: java ThreadPhaserJacobi <matrix size> <max steps>");
28		return;
29		}
30
31		ForkJoinPool fjp = new ForkJoinPool();
32	+	//        int granularity = (n * n / fjp.getParallelism()) / 2;
33		int granularity = n * n / fjp.getParallelism();
34		dimGran = (int)(Math.sqrt(granularity));
35
#	Line 63 | Line 62 | public class FJPhaserJacobi {
62
63		System.out.println("Compute Time: " + secs);
64		System.out.println(fjp);
66	–
65		}
68	–
66		}
67
68		static class Segment extends CyclicAction {
#	Line 143 | Line 140 | public class FJPhaserJacobi {
140		public void compute() {
141		int rows = hiRow - loRow + 1;
142		int cols = hiCol - loCol + 1;
143	<	int rblocks = (int)(Math.round((float)rows / dimGran));
144	<	int cblocks = (int)(Math.round((float)cols / dimGran));
143	>	int rblocks = Math.round((float)rows / dimGran);
144	>	int cblocks = Math.round((float)cols / dimGran);
145
146		int n = rblocks * cblocks;
147

Diff Legend

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