Changeset c9ec301

Timestamp:

Apr 5, 2021, 3:12:16 PM (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:

5cb51502

Parents:

8e85344

Message:

Fix debug printing with alarms

Location:

libcfa/src/concurrency

Files:

• alarm.cfa (modified) (2 diffs)
• preemption.cfa (modified) (6 diffs)

libcfa/src/concurrency/alarm.cfa

@@ -15 +15 @@
 
 #define __cforall_thread__
+// #define __CFA_DEBUG_PRINT_PREEMPTION__
 
 #include <errno.h>
@@ -107 +108 @@
                 bool first = ! & alarms`first;
 
+                __cfadbg_print_safe( preemption, " KERNEL: alarm inserting %p (%lu).\n", this, this->alarm.tn );
                 insert( &alarms, this );
                 if( first ) {

libcfa/src/concurrency/preemption.cfa

@@ -117 +117 @@
         //Loop throught every thing expired
         while( node = get_expired( alarms, currtime ) ) {
-                // __cfaabi_dbg_print_buffer_decl( " KERNEL: preemption tick.\n" );
+                __cfadbg_print_buffer_decl( preemption, " KERNEL: preemption tick %lu\n", currtime.tn);
                 Duration period = node->period;
                 if( period == 0) {
@@ -123 +123 @@
                 }
 
+                __cfadbg_print_buffer_local( preemption, " KERNEL: alarm ticking node %p.\n", node );
+
+
                 // Check if this is a kernel
                 if( node->type == Kernel ) {
@@ -128 +131 @@
                 }
                 else if( node->type == User ) {
+                        __cfadbg_print_buffer_local( preemption, " KERNEL: alarm unparking %p.\n", node->thrd );
                         timeout( node->thrd );
                 }
@@ -136 +140 @@
                 // Check if this is a periodic alarm
                 if( period > 0 ) {
-                        // __cfaabi_dbg_print_buffer_local( " KERNEL: alarm period is %lu.\n", period.tv );
+                        __cfadbg_print_buffer_local( preemption, " KERNEL: alarm period is %lu.\n", period`ns );
                         node->alarm = currtime + period;    // Alarm is periodic, add currtime to it (used cached current time)
                         insert( alarms, node );             // Reinsert the node for the next time it triggers
@@ -712 +716 @@
 static void * alarm_loop( __attribute__((unused)) void * args ) {
         __processor_id_t id;
-        id.full_proc = false;
         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
@@ -781 +779 @@
         unregister(&id);
 
-        #if !defined(__CFA_NO_STATISTICS__)
-                if( 0 != __print_alarm_stats ) {
-                        __print_stats( &local_stats, __print_alarm_stats, "Alarm", "Thread", 0p );
-                }
-        #endif
+        // #if !defined(__CFA_NO_STATISTICS__)
+        //      if( 0 != __print_alarm_stats ) {
+        //              __print_stats( &local_stats, __print_alarm_stats, "Alarm", "Thread", 0p );
+        //      }
+        // #endif
         return 0p;
 }