Changeset 5416b44 for tests/nested_function.cfa

Timestamp:

May 27, 2022, 11:22:23 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

0a004b7

Parents:

c3b9d639

Message:

make expected output for nested functions deterministic

File:

• tests/nested_function.cfa (modified) (2 diffs)

tests/nested_function.cfa

@@ -1 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// nested_function.cfa -- Test nested functions run on user-thread stacks.
-//
-// Author           : Peter A. Buhr
-// Created On       : Mon May 23 22:21:30 2022
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 23 23:11:25 2022
-// Update Count     : 4
-// 
-
 #include <thread.hfa>
 #include <fstream.hfa>
 #include <stdlib.hfa>
 
-thread T {};
+enum { VALUES = 10_000 };
+int values[VALUES], total = 0;
 
-enum { VALUES = 10_000 };
-int values[VALUES];
+thread T { int id; };
 
 void main( T & ) {
+        int sum = 0;
         void f() {
                 int i = 0;
@@ -36 +22 @@
                         else h();
                         i += 1;
-                        sout | "j" | j | bsearchl( j, values, VALUES ); // has internal nested compare routine
+                        sum += bsearchl( j, values, VALUES );           // has internal nested compare routine
                 } // h
                 h();
-                sout | "i" | i | bsearchl( i, values, VALUES ); // has internal nested compare routine
         } // f
         f();
+        __atomic_fetch_add( &total, sum, __ATOMIC_SEQ_CST );
 }
 int main() {
         set_seed( 1003 );
         for ( i; VALUES ) values[i] = i;
-        T t[5];
+        {
+                T t[5];
+        }
+        sout | "total" | total;
 }