Changeset fe4840a

Timestamp:

Dec 14, 2017, 9:36:19 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

06088f9a

Parents:

1edf37f

Message:

fix bugs in quickSort, still not working because thunk problem

File:

• src/tests/concurrent/examples/quickSort.c (modified) (5 diffs)

src/tests/concurrent/examples/quickSort.c

@@ -9 +9 @@
 // Created On       : Wed Dec  6 12:15:52 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 13 18:20:18 2017
-// Update Count     : 138
+// Last Modified On : Thu Dec 14 11:20:40 2017
+// Update Count     : 142
 // 
 
@@ -19 +19 @@
 #include <string.h>                                                                             // strcmp
 
-forall( otype T | { T ?<?( T, T ); } )
+forall( otype T | { int ?<?( T, T ); } )
 thread Quicksort {
         T * values;                                                                                     // communication variables
@@ -25 +25 @@
 };
 
-forall( otype T | { T ?<?( T, T ); } )
+forall( otype T | { int ?<?( T, T ); } )
 void ?{}( Quicksort(T) & qs, T values[], int size, int depth ) {
         qs.values = values;  qs.low = 0;  qs.high = size;  qs.depth = depth;
 } // Quicksort
 
-forall( otype T | { T ?<?( T, T ); } )
+forall( otype T | { int ?<?( T, T ); } )
 void main( Quicksort(T) & qs ) {
         // nested routines: information hiding
@@ -140 +140 @@
                         unsortedfile | size;                                            // read number of elements in the list
                   if ( eof( unsortedfile ) ) break;
-                        ELEMTYPE * values = anew( size );                       // values to be sorted, too large to put on stack
+//                      ELEMTYPE * values = anew( size );                       // values to be sorted, too large to put on stack
+                        ELEMTYPE * values = alloc( size );                      // values to be sorted, too large to put on stack
+//                      ELEMTYPE * values = (ELEMTYPE *)malloc( sizeof(ELEMTYPE) * size );
                         for ( int counter = 0; counter < size; counter += 1 ) { // read unsorted numbers
                                 unsortedfile | values[counter];
@@ -165 +167 @@
                 processor processors[ (1 << depth) - 1 ] __attribute__(( unused )); // create 2^depth-1 kernel threads
 
-                ELEMTYPE * values = anew( size );                               // values to be sorted, too large to put on stack
+//              ELEMTYPE * values = anew( size );                               // values to be sorted, too large to put on stack
+                ELEMTYPE * values = alloc( size );                              // values to be sorted, too large to put on stack
                 for ( int counter = 0; counter < size; counter += 1 ) { // generate unsorted numbers
                         values[counter] = size - counter;                       // descending values