Changeset 3b8acfb for libcfa/src/concurrency

Timestamp:

Aug 13, 2021, 5:29:44 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

e3984a68

Parents:

be497c6 (diff), c9f9d4f (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' into 'andrew-mmath'. Mostly discarded changes to my thesis, I'll fold them in myself.

Location:

libcfa/src/concurrency

Files:

• kernel/startup.cfa (modified) (2 diffs)
• thread.cfa (modified) (1 diff)

libcfa/src/concurrency/kernel/startup.cfa

@@ -235 +235 @@
 
         register_tls( mainProcessor );
+        mainThread->last_cpu = __kernel_getcpu();
 
         //initialize the global state variables
@@ -478 +479 @@
         state = Start;
         self_cor{ info };
-        last_cpu = __kernel_getcpu();
         curr_cor = &self_cor;
         curr_cluster = mainCluster;

libcfa/src/concurrency/thread.cfa

@@ -34 +34 @@
         preempted = __NO_PREEMPTION;
         corctx_flag = false;
+        disable_interrupts();
         last_cpu = __kernel_getcpu();
+        enable_interrupts();
         curr_cor = &self_cor;
         self_mon.owner = &this;