Changeset 6e09a41e for libcfa/src/concurrency/kernel/startup.cfa

Timestamp:

Nov 13, 2020, 6:41:17 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7232fe2

Parents:

26ceca1 (diff), 1e208ea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/concurrency/kernel/startup.cfa (modified) (3 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -360 +360 @@
                 __tally_stats(proc->cltr->stats, &local_stats);
                 if( 0 != proc->print_stats ) {
-                        __print_stats( &local_stats, proc->print_stats, true, proc->name, (void*)proc );
+                        __print_stats( &local_stats, proc->print_stats, "Processor ", proc->name, (void*)proc );
                 }
         #endif
@@ -456 +456 @@
         link.prev = 0p;
         #if defined( __CFA_WITH_VERIFY__ )
-                canary = 0x0D15EA5E0D15EA5E;
+                canary = 0x0D15EA5E0D15EA5Ep;
         #endif
 
@@ -622 +622 @@
         #if !defined(__CFA_NO_STATISTICS__)
                 if( 0 != this.print_stats ) {
-                        __print_stats( this.stats, this.print_stats, true, this.name, (void*)&this );
+                        __print_stats( this.stats, this.print_stats, "Cluster", this.name, (void*)&this );
                 }
                 free( this.stats );