Changeset 18f0b70 for libcfa/src/concurrency/kernel_private.hfa

Timestamp:

Nov 10, 2020, 12:21:21 AM (3 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:

0dd9a5e

Parents:

16ba4a6 (diff), 75baaa3 (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/kernel_private.hfa (modified) (4 diffs)

libcfa/src/concurrency/kernel_private.hfa

@@ -38 +38 @@
 #endif
 ;
+
+extern bool __preemption_enabled();
 
 //release/wake-up the following resources
@@ -181 +183 @@
 //  creating/destroying queues
 static inline void ready_schedule_lock(void) with(*__scheduler_lock) {
-        /*paranoid*/ verify( kernelTLS.this_proc_id );
-
-        unsigned iproc = kernelTLS.this_proc_id->id;
-        /*paranoid*/ verify(data[iproc].handle == kernelTLS.this_proc_id);
+        /* paranoid */ verify( ! __preemption_enabled() );
+        /* paranoid */ verify( kernelTLS().this_proc_id );
+
+        unsigned iproc = kernelTLS().this_proc_id->id;
+        /*paranoid*/ verify(data[iproc].handle == kernelTLS().this_proc_id);
         /*paranoid*/ verify(iproc < ready);
 
@@ -207 +210 @@
 
 static inline void ready_schedule_unlock(void) with(*__scheduler_lock) {
-        /*paranoid*/ verify( kernelTLS.this_proc_id );
-
-        unsigned iproc = kernelTLS.this_proc_id->id;
-        /*paranoid*/ verify(data[iproc].handle == kernelTLS.this_proc_id);
+        /* paranoid */ verify( ! __preemption_enabled() );
+        /* paranoid */ verify( kernelTLS().this_proc_id );
+
+        unsigned iproc = kernelTLS().this_proc_id->id;
+        /*paranoid*/ verify(data[iproc].handle == kernelTLS().this_proc_id);
         /*paranoid*/ verify(iproc < ready);
         /*paranoid*/ verify(data[iproc].lock);
@@ -223 +227 @@
 #ifdef __CFA_WITH_VERIFY__
         static inline bool ready_schedule_islocked(void) {
-                /*paranoid*/ verify( kernelTLS.this_proc_id );
-                __processor_id_t * proc = kernelTLS.this_proc_id;
+                /* paranoid */ verify( ! __preemption_enabled() );
+                /*paranoid*/ verify( kernelTLS().this_proc_id );
+                __processor_id_t * proc = kernelTLS().this_proc_id;
                 return __scheduler_lock->data[proc->id].owned;
         }