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

Comparing jsr166/src/test/loops/ScalarLongSort.java (file contents):
Revision 1.1 by dl, Tue Mar 16 11:42:46 2010 UTC vs.
Revision 1.3 by jsr166, Wed Sep 1 07:47:27 2010 UTC

# Line 15 | Line 15 | class ScalarLongSort {
15      static int THRESHOLD;
16      static final boolean warmup = true;
17  
18 <    public static void main (String[] args) throws Exception {
18 >    public static void main(String[] args) throws Exception {
19          int n = 1 << 22;
20          int sreps = 2;
21          int reps = 20;
# Line 66 | Line 66 | class ScalarLongSort {
66      }
67  
68      static final class Sorter extends RecursiveAction {
69 <        final long[] a;
69 >        final long[] a;
70          final long[] w;
71 <        final int origin;
71 >        final int origin;
72          final int n;
73          Sorter(long[] a, long[] w, int origin, int n) {
74              this.a = a; this.w = w; this.origin = origin; this.n = n;
# Line 96 | Line 96 | class ScalarLongSort {
96              }
97          }
98      }
99 <    
99 >
100      static final class SubSorter extends RecursiveAction {
101          final Sorter left;
102          final Sorter right;
# Line 130 | Line 130 | class ScalarLongSort {
130           * and finding index of right closest to split point.
131           * Uses left-spine decomposition to generate all
132           * merge tasks before bottomming out at base case.
133 <         *
133 >         *
134           */
135          public void compute() {
136              Merger rights = null;
# Line 172 | Line 172 | class ScalarLongSort {
172                  w[k++] = a[l++];
173              while (r < rFence)
174                  w[k++] = a[r++];
175 <            
175 >
176              while (rights != null) {
177                  rights.join();
178                  rights = rights.next;
# Line 181 | Line 181 | class ScalarLongSort {
181  
182      }
183  
184 <    static void checkSorted (long[] a)  {
184 >    static void checkSorted(long[] a)  {
185          int n = a.length;
186          for (int i = 0; i < n - 1; i++) {
187              if (a[i] > a[i+1]) {
188 <                throw new Error("Unsorted at " + i + ": " +
188 >                throw new Error("Unsorted at " + i + ": " +
189                                  a[i] + " / " + a[i+1]);
190              }
191          }

Diff Legend

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