Changeset 5da9d6a for src/libcfa/concurrency/preemption.c

Timestamp:

Dec 1, 2017, 11:58:32 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

3ca540f, 86ad276

Parents:

d16d159 (diff), 3d560060 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/libcfa/concurrency/preemption.c (modified) (16 diffs)

src/libcfa/concurrency/preemption.c

@@ -14 +14 @@
 //
 
-#include "libhdr.h"
 #include "preemption.h"
 
@@ -148 +147 @@
 //=============================================================================================
 
-LIB_DEBUG_DO( static thread_local void * last_interrupt = 0; )
+__cfaabi_dbg_debug_do( static thread_local void * last_interrupt = 0; )
 
 extern "C" {
@@ -159 +158 @@
         // Enable interrupts by decrementing the counter
         // If counter reaches 0, execute any pending CtxSwitch
-        void enable_interrupts( DEBUG_CTX_PARAM ) {
+        void enable_interrupts( __cfaabi_dbg_ctx_param ) {
                 processor * proc   = this_processor;      // Cache the processor now since interrupts can start happening after the atomic add
                 thread_desc * thrd = this_thread;         // Cache the thread now since interrupts can start happening after the atomic add
@@ -173 +172 @@
 
                 // For debugging purposes : keep track of the last person to enable the interrupts
-                LIB_DEBUG_DO( proc->last_enable = caller; )
+                __cfaabi_dbg_debug_do( proc->last_enable = caller; )
         }
 
@@ -233 +232 @@
 // Called from kernel_startup
 void kernel_start_preemption() {
-        LIB_DEBUG_PRINT_SAFE("Kernel : Starting preemption\n");
+        __cfaabi_dbg_print_safe("Kernel : Starting preemption\n");
 
         // Start with preemption disabled until ready
@@ -255 +254 @@
 // Called from kernel_shutdown
 void kernel_stop_preemption() {
-        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption stopping\n");
+        __cfaabi_dbg_print_safe("Kernel : Preemption stopping\n");
 
         // Block all signals since we are already shutting down
@@ -271 +270 @@
         // Preemption is now fully stopped
 
-        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption stopped\n");
+        __cfaabi_dbg_print_safe("Kernel : Preemption stopped\n");
 }
 
@@ -297 +296 @@
 // Receives SIGUSR1 signal and causes the current thread to yield
 void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ) {
-        LIB_DEBUG_DO( last_interrupt = (void *)(cxt->uc_mcontext.gregs[CFA_REG_IP]); )
+        __cfaabi_dbg_debug_do( last_interrupt = (void *)(cxt->uc_mcontext.gregs[CFA_REG_IP]); )
 
         // Check if it is safe to preempt here
@@ -346 +345 @@
                 assertf(sig == SIGALRM, "Kernel Internal Error, sigwait: Unexpected signal %d (%d : %d)\n", sig, info.si_code, info.si_value.sival_int);
 
-                // LIB_DEBUG_PRINT_SAFE("Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int );
+                // __cfaabi_dbg_print_safe("Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int );
                 // Switch on the code (a.k.a. the sender) to
                 switch( info.si_code )
@@ -354 +353 @@
                 case SI_TIMER:
                 case SI_KERNEL:
-                        // LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread tick\n");
-                        lock( event_kernel->lock DEBUG_CTX2 );
+                        // __cfaabi_dbg_print_safe("Kernel : Preemption thread tick\n");
+                        lock( event_kernel->lock __cfaabi_dbg_ctx2 );
                         tick_preemption();
                         unlock( event_kernel->lock );
@@ -368 +367 @@
 
 EXIT:
-        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread stopping\n");
+        __cfaabi_dbg_print_safe("Kernel : Preemption thread stopping\n");
         return NULL;
 }
@@ -380 +379 @@
 
         if ( sigaction( sig, &act, NULL ) == -1 ) {
-                LIB_DEBUG_PRINT_BUFFER_DECL(
+                __cfaabi_dbg_print_buffer_decl(
                         " __kernel_sigaction( sig:%d, handler:%p, flags:%d ), problem installing signal handler, error(%d) %s.\n",
                         sig, handler, flags, errno, strerror( errno )
@@ -397 +396 @@
 
         if ( sigaction( sig, &act, NULL ) == -1 ) {
-                LIB_DEBUG_PRINT_BUFFER_DECL(
+                __cfaabi_dbg_print_buffer_decl(
                         " __kernel_sigdefault( sig:%d ), problem reseting signal handler, error(%d) %s.\n",
                         sig, errno, strerror( errno )
@@ -409 +408 @@
 //=============================================================================================
 
-LIB_DEBUG_DO(
+__cfaabi_dbg_debug_do(
         static void __kernel_backtrace( int start ) {
                 // skip first N stack frames
@@ -476 +475 @@
 
 // void sigHandler_segv( __CFA_SIGPARMS__ ) {
-//      LIB_DEBUG_DO(
+//      __cfaabi_dbg_debug_do(
 //              #ifdef __USE_STREAM__
 //              serr    | "*CFA runtime error* program cfa-cpp terminated with"
@@ -493 +492 @@
 // void sigHandler_abort( __CFA_SIGPARMS__ ) {
 //      // skip first 6 stack frames
-//      LIB_DEBUG_DO( __kernel_backtrace( 6 ); )
+//      __cfaabi_dbg_debug_do( __kernel_backtrace( 6 ); )
 
 //      // reset default signal handler