Changeset 08e8851 for libcfa/src

Timestamp:

Sep 29, 2020, 1:51:01 PM (5 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

1526e86, 87b9332, 9dc3eb21

Parents:

2ff78aae (diff), d13dd6b (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 into master

Location:

libcfa/src

Files:

• Makefile.am (modified) (2 diffs)
• concurrency/clib/cfathread.cfa (added)
• concurrency/clib/cfathread.h (added)
• concurrency/io/setup.cfa (modified) (1 diff)
• concurrency/kernel.cfa (modified) (6 diffs)
• concurrency/kernel.hfa (modified) (1 diff)
• concurrency/kernel/startup.cfa (modified) (1 diff)
• concurrency/preemption.cfa (modified) (1 diff)
• parseargs.cfa (modified) (1 diff)

libcfa/src/Makefile.am

@@ -88 +88 @@
 inst_thread_headers_nosrc = \
         bits/random.hfa \
+        concurrency/clib/cfathread.h \
         concurrency/invoke.h \
         concurrency/kernel/fwd.hfa
@@ -103 +104 @@
         concurrency/alarm.cfa \
         concurrency/alarm.hfa \
+        concurrency/clib/cfathread.cfa \
         concurrency/CtxSwitch-@ARCHITECTURE@.S \
         concurrency/invoke.c \

libcfa/src/concurrency/io/setup.cfa

@@ -147 +147 @@
         static void * iopoll_loop( __attribute__((unused)) void * args ) {
                 __processor_id_t id;
+                id.full_proc = false;
                 id.id = doregister(&id);
                 __cfaabi_dbg_print_safe( "Kernel : IO poller thread starting\n" );

libcfa/src/concurrency/kernel.cfa

@@ -237 +237 @@
         $coroutine * proc_cor = get_coroutine(this->runner);
 
-        // Update global state
-        kernelTLS.this_thread = thrd_dst;
-
         // set state of processor coroutine to inactive
         verify(proc_cor->state == Active);
@@ -253 +250 @@
                         thrd_dst->unpark_stale = true;
                 )
+                // Update global state
+                kernelTLS.this_thread = thrd_dst;
 
                 /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
@@ -259 +258 @@
                 /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) > ((uintptr_t)__get_stack(thrd_dst->curr_cor)->limit) || thrd_dst->curr_cor == proc_cor, "ERROR : Destination $thread %p has been corrupted.\n StackPointer too large.\n", thrd_dst ); // add escape condition if we are setting up the processor
 
+
                 // set context switch to the thread that the processor is executing
                 verify( thrd_dst->context.SP );
@@ -269 +269 @@
                 /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
 
+                // Reset global state
+                kernelTLS.this_thread = 0p;
 
                 // We just finished running a thread, there are a few things that could have happened.
@@ -313 +315 @@
         // Just before returning to the processor, set the processor coroutine to active
         proc_cor->state = Active;
-        kernelTLS.this_thread = 0p;
 
         /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
@@ -521 +522 @@
         disable_interrupts();
                 /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
-                bool ret = post( this->idle );
+                post( this->idle );
         enable_interrupts( __cfaabi_dbg_ctx );
 }

libcfa/src/concurrency/kernel.hfa

@@ -48 +48 @@
 // Processor id, required for scheduling threads
 struct __processor_id_t {
-        unsigned id;
+        unsigned id:24;
+        bool full_proc:1;
 
         #if !defined(__CFA_NO_STATISTICS__)

libcfa/src/concurrency/kernel/startup.cfa

@@ -470 +470 @@
         this.name = name;
         this.cltr = &_cltr;
-        id = -1u;
+        full_proc = true;
         destroyer = 0p;
         do_terminate = false;

libcfa/src/concurrency/preemption.cfa

@@ -411 +411 @@
 static void * alarm_loop( __attribute__((unused)) void * args ) {
         __processor_id_t id;
+        id.full_proc = false;
         id.id = doregister(&id);
 

libcfa/src/parseargs.cfa

@@ -25 +25 @@
 #include "limits.hfa"
 
-extern int cfa_args_argc;
-extern char ** cfa_args_argv;
-extern char ** cfa_args_envp;
+extern int cfa_args_argc __attribute__((weak));
+extern char ** cfa_args_argv __attribute__((weak));
+extern char ** cfa_args_envp __attribute__((weak));
 
 static void usage(char * cmd, cfa_option options[], size_t opt_count, const char * usage, FILE * out)  __attribute__ ((noreturn));
 
 void parse_args( cfa_option options[], size_t opt_count, const char * usage, char ** & left ) {
-        parse_args(cfa_args_argc, cfa_args_argv, options, opt_count, usage, left );
+        if( 0p != &cfa_args_argc ) {
+                parse_args(cfa_args_argc, cfa_args_argv, options, opt_count, usage, left );
+        }
+        else {
+                char * temp = "";
+                parse_args(0, &temp, options, opt_count, usage, left );
+        }
 }