Changeset bd21af5

Timestamp:

Jul 23, 2018, 11:08:45 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

c4f68dc

Parents:

460bd3a (diff), c29c342 (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 plg2:software/cfa/cfa-cc

Location:

src

Files:

• libcfa/concurrency/kernel.c (modified) (12 diffs)
• libcfa/concurrency/kernel_private.h (modified) (1 diff)
• libcfa/concurrency/preemption.c (modified) (5 diffs)
• libcfa/concurrency/preemption.h (modified) (1 diff)
• tests/.expect/attributes.x86.txt (modified) (2 diffs)

src/libcfa/concurrency/kernel.c

@@ -37 +37 @@
 
 //Start and stop routine for the kernel, declared first to make sure they run first
-void kernel_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_KERNEL ) ));
-void kernel_shutdown(void) __attribute__(( destructor ( STARTUP_PRIORITY_KERNEL ) ));
+static void kernel_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_KERNEL ) ));
+static void kernel_shutdown(void) __attribute__(( destructor ( STARTUP_PRIORITY_KERNEL ) ));
 
 //-----------------------------------------------------------------------------
@@ -133 +133 @@
 
 // Construct the processor context of non-main processors
-void ?{}(processorCtx_t & this, processor * proc, current_stack_info_t * info) {
+static void ?{}(processorCtx_t & this, processor * proc, current_stack_info_t * info) {
         (this.__cor){ info };
         this.proc = proc;
 }
 
+static void start(processor * this);
 void ?{}(processor & this, const char * name, cluster & cltr) with( this ) {
         this.name = name;
@@ -186 +187 @@
 // Kernel Scheduling logic
 //=============================================================================================
+static void runThread(processor * this, thread_desc * dst);
+static void finishRunning(processor * this);
+static void halt(processor * this);
+
 //Main of the processor contexts
 void main(processorCtx_t & runner) {
@@ -239 +244 @@
 // runThread runs a thread by context switching
 // from the processor coroutine to the target thread
-void runThread(processor * this, thread_desc * dst) {
+static void runThread(processor * this, thread_desc * dst) {
         assert(dst->curr_cor);
         coroutine_desc * proc_cor = get_coroutine(this->runner);
@@ -256 +261 @@
 
 // KERNEL_ONLY
-void returnToKernel() {
+static void returnToKernel() {
         coroutine_desc * proc_cor = get_coroutine(kernelTLS.this_processor->runner);
         coroutine_desc * thrd_cor = kernelTLS.this_thread->curr_cor = kernelTLS.this_coroutine;
@@ -265 +270 @@
 // Once a thread has finished running, some of
 // its final actions must be executed from the kernel
-void finishRunning(processor * this) with( this->finish ) {
+static void finishRunning(processor * this) with( this->finish ) {
         verify( ! kernelTLS.preemption_state.enabled );
         choose( action_code ) {
@@ -299 +304 @@
 // This is the entry point for processors (kernel threads)
 // It effectively constructs a coroutine by stealing the pthread stack
-void * CtxInvokeProcessor(void * arg) {
+static void * CtxInvokeProcessor(void * arg) {
         processor * proc = (processor *) arg;
         kernelTLS.this_processor = proc;
@@ -336 +341 @@
 }
 
-void start(processor * this) {
+static void start(processor * this) {
         __cfaabi_dbg_print_safe("Kernel : Starting core %p\n", this);
 
@@ -542 +547 @@
 //-----------------------------------------------------------------------------
 // Kernel boot procedures
-void kernel_startup(void) {
+static void kernel_startup(void) {
         verify( ! kernelTLS.preemption_state.enabled );
         __cfaabi_dbg_print_safe("Kernel : Starting\n");
@@ -618 +623 @@
 }
 
-void kernel_shutdown(void) {
+static void kernel_shutdown(void) {
         __cfaabi_dbg_print_safe("\n--------------------------------------------------\nKernel : Shutting down\n");
 
@@ -655 +660 @@
 // Kernel Quiescing
 //=============================================================================================
-
-void halt(processor * this) with( *this ) {
+static void halt(processor * this) with( *this ) {
         // verify( ! __atomic_load_n(&do_terminate, __ATOMIC_SEQ_CST) );
 
@@ -683 +687 @@
 // Unexpected Terminating logic
 //=============================================================================================
-
-
 static __spinlock_t kernel_abort_lock;
 static bool kernel_abort_called = false;

src/libcfa/concurrency/kernel_private.h

@@ -54 +54 @@
 // Processor
 void main(processorCtx_t *);
-void start(processor * this);
-void runThread(processor * this, thread_desc * dst);
-void finishRunning(processor * this);
-void halt(processor * this);
 
 static inline void wake_fast(processor * this) {

src/libcfa/concurrency/preemption.c

@@ -39 +39 @@
 
 // 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 +63 @@
 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 +85 @@
 
 // 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
@@ -350 +350 @@
 // 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); )
 
@@ -393 +393 @@
 // 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;

src/libcfa/concurrency/preemption.h

@@ -22 +22 @@
 void kernel_stop_preemption();
 void update_preemption( processor * this, Duration duration );
-void tick_preemption();
 
 struct preemption_scope {

src/tests/.expect/attributes.x86.txt

@@ -367 +367 @@
 signed int __apd7__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object23)(__attribute__ ((unused)) signed int __anonymous_object24), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object25)(__attribute__ ((unused)) signed int __anonymous_object26));
 struct Vad {
-    __attribute__ ((unused)) signed int __anonymous_object27;
+    __attribute__ ((unused)) signed int __anonymous_object27:4;
     __attribute__ ((unused)) signed int __anonymous_object28:4;
-    __attribute__ ((unused)) signed int __anonymous_object29:4;
-    __attribute__ ((unused,unused)) signed int __anonymous_object30:6;
+    __attribute__ ((unused,unused)) signed int __anonymous_object29:6;
 };
 static inline void ___constructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1);
@@ -376 +375 @@
 static inline void ___destructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1);
 static inline struct Vad ___operator_assign__F4sVad_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1);
-static inline void ___constructor__F_4sVadi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object31);
 static inline void ___constructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1){
-    ((void)((*___dst__4sVad_1).__anonymous_object27) /* ?{} */);
 }
 static inline void ___constructor__F_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1){
-    ((void)((*___dst__4sVad_1).__anonymous_object27=___src__4sVad_1.__anonymous_object27) /* ?{} */);
 }
 static inline void ___destructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1){
-    ((void)((*___dst__4sVad_1).__anonymous_object27) /* ^?{} */);
 }
 static inline struct Vad ___operator_assign__F4sVad_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1){
     struct Vad ___ret__4sVad_1;
-    ((void)((*___dst__4sVad_1).__anonymous_object27=___src__4sVad_1.__anonymous_object27));
     ((void)___constructor__F_4sVad4sVad_autogen___1((&___ret__4sVad_1), (*___dst__4sVad_1)));
     return ___ret__4sVad_1;
 }
-static inline void ___constructor__F_4sVadi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object32){
-    ((void)((*___dst__4sVad_1).__anonymous_object27=__anonymous_object32) /* ?{} */);
-}