Changeset d56ca354 for src/libcfa/concurrency/preemption.c

Timestamp:

Feb 12, 2018, 11:57:55 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

fd062a66

Parents:

c40e7c5 (diff), cfe2f0a (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:

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

src/libcfa/concurrency/preemption.c

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  6 15:00:36 2018
-// Update Count     : 10
+// Last Modified On : Fri Feb  9 16:38:13 2018
+// Update Count     : 14
 //
 
 #include "preemption.h"
 
-#define ftype `ftype`
 extern "C" {
 #include <errno.h>
@@ -23 +22 @@
 #include <unistd.h>
 }
-#undef ftype
 
 #include "bits/signal.h"
@@ -50 +48 @@
 
 // Machine specific register name
-#if   defined(__x86_64__)
+#if   defined( __i386 )
+#define CFA_REG_IP gregs[REG_EIP]
+#elif defined( __x86_64 )
 #define CFA_REG_IP gregs[REG_RIP]
-#elif defined(__i386__)
-#define CFA_REG_IP gregs[REG_EIP]
-#elif defined(__ARM_ARCH__)
+#elif defined( __ARM_ARCH )
 #define CFA_REG_IP arm_pc
+#else
+#error unknown hardware architecture
 #endif
 
@@ -197 +197 @@
 
         if ( pthread_sigmask( SIG_UNBLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+            abort( "internal error, pthread_sigmask" );
         }
 }
@@ -208 +208 @@
 
         if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+            abort( "internal error, pthread_sigmask" );
         }
 }
@@ -247 +247 @@
 // Called from kernel_startup
 void kernel_start_preemption() {
-        __cfaabi_dbg_print_safe("Kernel : Starting preemption\n");
+        __cfaabi_dbg_print_safe( "Kernel : Starting preemption\n" );
 
         // Start with preemption disabled until ready
@@ -268 +268 @@
 // Called from kernel_shutdown
 void kernel_stop_preemption() {
-        __cfaabi_dbg_print_safe("Kernel : Preemption stopping\n");
+        __cfaabi_dbg_print_safe( "Kernel : Preemption stopping\n" );
 
         // Block all signals since we are already shutting down
@@ -284 +284 @@
         // Preemption is now fully stopped
 
-        __cfaabi_dbg_print_safe("Kernel : Preemption stopped\n");
+        __cfaabi_dbg_print_safe( "Kernel : Preemption stopped\n" );
 }
 
@@ -322 +322 @@
                 case PREEMPT_TERMINATE: verify(this_processor->do_terminate);
                 default:
-                        abortf( "internal error, signal value is %d", sfp->si_value.sival_int );
+                        abort( "internal error, signal value is %d", sfp->si_value.sival_int );
         }
 
@@ -328 +328 @@
         if( !preemption_ready() ) { return; }
 
-        __cfaabi_dbg_print_buffer_decl(" KERNEL: preempting core %p (%p).\n", this_processor, this_thread);
+        __cfaabi_dbg_print_buffer_decl( " KERNEL: preempting core %p (%p).\n", this_processor, this_thread);
 
         preemption_in_progress = true;                      // Sync flag : prevent recursive calls to the signal handler
@@ -348 +348 @@
 
         if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+            abort( "internal error, pthread_sigmask" );
         }
 
@@ -365 +365 @@
                                         continue;
                         case EINVAL :
-                                        abortf("Timeout was invalid.");
+                                        abort( "Timeout was invalid." );
                                 default:
-                                        abortf("Unhandled error %d", err);
+                                        abort( "Unhandled error %d", err);
                         }
                 }
@@ -374 +374 @@
                 assertf(sig == SIGALRM, "Kernel Internal Error, sigwait: Unexpected signal %d (%d : %d)\n", sig, 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 );
+                // __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 )
@@ -382 +382 @@
                 case SI_TIMER:
                 case SI_KERNEL:
-                        // __cfaabi_dbg_print_safe("Kernel : Preemption thread tick\n");
+                        // __cfaabi_dbg_print_safe( "Kernel : Preemption thread tick\n" );
                         lock( event_kernel->lock __cfaabi_dbg_ctx2 );
                         tick_preemption();
@@ -396 +396 @@
 
 EXIT:
-        __cfaabi_dbg_print_safe("Kernel : Preemption thread stopping\n");
+        __cfaabi_dbg_print_safe( "Kernel : Preemption thread stopping\n" );
         return NULL;
 }