Changeset 1b033b8

Timestamp:

Nov 13, 2020, 11:32:15 AM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ac12f1f

Parents:

0989e79

Message:

Alarm loop now has it's own stats block

Location:

libcfa/src/concurrency

Files:

• kernel.cfa (modified) (1 diff)
• kernel/startup.cfa (modified) (2 diffs)
• preemption.cfa (modified) (4 diffs)
• stats.cfa (modified) (2 diffs)
• stats.hfa (modified) (2 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -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

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
@@ -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 );

libcfa/src/concurrency/preemption.cfa

@@ -393 +393 @@
 // reserved for future use
 static void timeout( $thread * this ) {
-        #if !defined( __CFA_NO_STATISTICS__ )
-                kernelTLS().this_stats = this->curr_cluster->stats;
-        #endif
         unpark( this );
 }
@@ -610 +607 @@
 }
 
+#if !defined(__CFA_NO_STATISTICS__)
+        int __print_alarm_stats = 0;
+#endif
+
 // Main of the alarm thread
 // Waits on SIGALRM and send SIGUSR1 to whom ever needs it
@@ -617 +618 @@
         id.id = doregister(&id);
         __cfaabi_tls.this_proc_id = &id;
+
+        #if !defined(__CFA_NO_STATISTICS__)
+                struct __stats_t local_stats;
+                __cfaabi_tls.this_stats = &local_stats;
+                __init_stats( &local_stats );
+        #endif
 
         // Block sigalrms to control when they arrive
@@ -676 +683 @@
         __cfaabi_dbg_print_safe( "Kernel : Preemption thread stopping\n" );
         unregister(&id);
+
+        #if !defined(__CFA_NO_STATISTICS__)
+                if( 0 != __print_alarm_stats ) {
+                        __print_stats( &local_stats, __print_alarm_stats, "Alarm", "Thread", 0p );
+                }
+        #endif
         return 0p;
 }

libcfa/src/concurrency/stats.cfa

@@ -79 +79 @@
         }
 
-        void __print_stats( struct __stats_t * stats, int flags, bool cluster, const char * name, void * id ) with( *stats ) {
+        void __print_stats( struct __stats_t * stats, int flags, const char * type, const char * name, void * id ) with( *stats ) {
 
                 if( flags & CFA_STATS_READY_Q ) {
@@ -109 +109 @@
                                 "-- wake on exit          : %'15" PRIu64 "\n"
                                 "\n"
-                                , cluster ? "Cluster" : "Processor",  name, id
+                                , type, name, id
                                 , ready.pick.pop.success
                                 , ready.pick.push.success

libcfa/src/concurrency/stats.hfa

@@ -7 +7 @@
         static inline void __init_stats( struct __stats_t * ) {}
         static inline void __tally_stats( struct __stats_t *, struct __stats_t * ) {}
-        static inline void __print_stats( struct __stats_t *, int, bool, const char *, void * ) {}
+        static inline void __print_stats( struct __stats_t *, int, const char *, const char *, void * ) {}
 #else
         enum {
@@ -106 +106 @@
         void __init_stats ( struct __stats_t * );
         void __tally_stats( struct __stats_t *, struct __stats_t * );
-        void __print_stats( struct __stats_t *, int, bool, const char *, void * );
+        void __print_stats( struct __stats_t *, int, const char *, const char *, void * );
 #endif