Changeset b067d9b for libcfa/src/concurrency/preemption.cfa

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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/preemption.cfa (moved) (moved from src/libcfa/concurrency/preemption.c ) (8 diffs)

libcfa/src/concurrency/preemption.cfa

@@ -14 +14 @@
 //
 
-#include "preemption.h"
+#define __cforall_thread__
+
+#include "preemption.hfa"
 #include <assert.h>
 
@@ -24 +26 @@
 }
 
-#include "bits/signal.h"
+#include "bits/signal.hfa"
 
 #if !defined(__CFA_DEFAULT_PREEMPTION__)
@@ -39 +41 @@
 
 // FwdDeclarations : Signal handlers
-void sigHandler_ctxSwitch( __CFA_SIGPARMS__ );
-void sigHandler_segv     ( __CFA_SIGPARMS__ );
-void sigHandler_ill      ( __CFA_SIGPARMS__ );
-void sigHandler_fpe      ( __CFA_SIGPARMS__ );
-void sigHandler_abort    ( __CFA_SIGPARMS__ );
+static void sigHandler_ctxSwitch( __CFA_SIGPARMS__ );
+static void sigHandler_segv     ( __CFA_SIGPARMS__ );
+static void sigHandler_ill      ( __CFA_SIGPARMS__ );
+static void sigHandler_fpe      ( __CFA_SIGPARMS__ );
+static void sigHandler_abort    ( __CFA_SIGPARMS__ );
 
 // FwdDeclarations : alarm thread main
-void * alarm_loop( __attribute__((unused)) void * args );
+static void * alarm_loop( __attribute__((unused)) void * args );
 
 // Machine specific register name
@@ -63 +65 @@
 static pthread_t alarm_thread;                        // pthread handle to alarm thread
 
-void ?{}(event_kernel_t & this) with( this ) {
+static void ?{}(event_kernel_t & this) with( this ) {
         alarms{};
         lock{};
@@ -85 +87 @@
 
 // Tick one frame of the Discrete Event Simulation for alarms
-void tick_preemption() {
+static void tick_preemption() {
         alarm_node_t * node = NULL;                     // Used in the while loop but cannot be declared in the while condition
         alarm_list_t * alarms = &event_kernel->alarms;  // Local copy for ease of reading
@@ -263 +265 @@
 }
 
-// kill wrapper : signal a processor
-void terminate(processor * this) {
-        disable_interrupts();
-        __atomic_store_n(&this->do_terminate, true, __ATOMIC_SEQ_CST);
-        wake( this );
-        sigval_t value = { PREEMPT_TERMINATE };
-        enable_interrupts( __cfaabi_dbg_ctx );
-        pthread_sigqueue( this->kernel_thread, SIGUSR1, value );
-}
-
 // reserved for future use
 static void timeout( thread_desc * this ) {
@@ -360 +352 @@
 // Context switch signal handler
 // Receives SIGUSR1 signal and causes the current thread to yield
-void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ) {
+static void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ) {
         __cfaabi_dbg_debug_do( last_interrupt = (void *)(cxt->uc_mcontext.CFA_REG_IP); )
 
@@ -403 +395 @@
 // Main of the alarm thread
 // Waits on SIGALRM and send SIGUSR1 to whom ever needs it
-void * alarm_loop( __attribute__((unused)) void * args ) {
+static void * alarm_loop( __attribute__((unused)) void * args ) {
         // Block sigalrms to control when they arrive
         sigset_t mask;