Changeset 6e09a41e for libcfa/src/concurrency/kernel.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.cfa (modified) (5 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -255 +255 @@
                 /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) < ((uintptr_t)__get_stack(thrd_dst->curr_cor)->base ) || thrd_dst->curr_cor == proc_cor, "ERROR : Destination $thread %p has been corrupted.\n StackPointer too small.\n", thrd_dst ); // add escape condition if we are setting up the processor
                 /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) > ((uintptr_t)__get_stack(thrd_dst->curr_cor)->limit) || thrd_dst->curr_cor == proc_cor, "ERROR : Destination $thread %p has been corrupted.\n StackPointer too large.\n", thrd_dst ); // add escape condition if we are setting up the processor
-                /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_dst->canary );
+                /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_dst->canary );
 
 
@@ -263 +263 @@
                 // when __cfactx_switch returns we are back in the processor coroutine
 
-                /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_dst->canary );
+                /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_dst->canary );
                 /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) > ((uintptr_t)__get_stack(thrd_dst->curr_cor)->limit), "ERROR : Destination $thread %p has been corrupted.\n StackPointer too large.\n", thrd_dst );
                 /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) < ((uintptr_t)__get_stack(thrd_dst->curr_cor)->base ), "ERROR : Destination $thread %p has been corrupted.\n StackPointer too small.\n", thrd_dst );
@@ -335 +335 @@
                 #endif
                 /* paranoid */ verify( proc_cor->context.SP );
-                /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_src->canary );
+                /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_src->canary );
                 __cfactx_switch( &thrd_src->context, &proc_cor->context );
-                /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_src->canary );
+                /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_src->canary );
                 #if defined( __i386 ) || defined( __x86_64 )
                         __x87_load;
@@ -370 +370 @@
         /* paranoid */ #endif
         /* paranoid */ verifyf( thrd->link.next == 0p, "Expected null got %p", thrd->link.next );
-        /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd->canary );
+        /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd->canary );
 
 
@@ -742 +742 @@
 
         void print_stats_now( cluster & this, int flags ) {
-                __print_stats( this.stats, this.print_stats, true, this.name, (void*)&this );
+                __print_stats( this.stats, this.print_stats, "Cluster", this.name, (void*)&this );
+        }
+
+        extern int __print_alarm_stats;
+        void print_alarm_stats() {
+                __print_alarm_stats = -1;
         }
 #endif