Changeset 254ad1b

Timestamp:

Apr 24, 2021, 7:24:09 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a76efc8, cfff639

Parents:

734908c

Message:

Separate schedule_thread from the scheduler lock

Location:

libcfa/src/concurrency

Files:

• kernel.cfa (modified) (5 diffs)
• kernel/startup.cfa (modified) (1 diff)
• kernel_private.hfa (modified) (1 diff)
• thread.cfa (modified) (1 diff)

libcfa/src/concurrency/kernel.cfa

@@ -349 +349 @@
                 if(unlikely(thrd_dst->preempted != __NO_PREEMPTION)) {
                         // The thread was preempted, reschedule it and reset the flag
-                        __schedule_thread( thrd_dst );
+                        schedule_thread$( thrd_dst );
                         break RUNNING;
                 }
@@ -439 +439 @@
         /* paranoid */ verify( ! __preemption_enabled() );
         /* paranoid */ verify( kernelTLS().this_proc_id );
+        /* paranoid */ verify( ready_schedule_islocked());
         /* paranoid */ verify( thrd );
         /* paranoid */ verify( thrd->state != Halted );
@@ -457 +458 @@
         struct cluster * cl = thrd->curr_cluster;
 
-        ready_schedule_lock();
-                // push the thread to the cluster ready-queue
-                push( cl, thrd );
-
-                // variable thrd is no longer safe to use
+        // push the thread to the cluster ready-queue
+        push( cl, thrd );
+
+        // variable thrd is no longer safe to use
         thrd = 0xdeaddeaddeaddeadp;
 
-                // wake the cluster using the save variable.
-                __wake_one( cl );
-        ready_schedule_unlock();
+        // wake the cluster using the save variable.
+        __wake_one( cl );
 
         #if !defined(__CFA_NO_STATISTICS__)
@@ -479 +478 @@
         #endif
 
-        /* paranoid */ verify( ! __preemption_enabled() );
+        /* paranoid */ verify( ready_schedule_islocked());
+        /* paranoid */ verify( ! __preemption_enabled() );
+}
+
+void schedule_thread$( $thread * thrd ) {
+        ready_schedule_lock();
+                __schedule_thread( thrd );
+        ready_schedule_unlock();
 }
 
@@ -532 +538 @@
                 disable_interrupts();
                         // Wake lost the race,
-                        __schedule_thread( thrd );
+                        schedule_thread$( thrd );
                 enable_interrupts(false);
         }

libcfa/src/concurrency/kernel/startup.cfa

@@ -225 +225 @@
         // Add the main thread to the ready queue
         // once resume is called on mainProcessor->runner the mainThread needs to be scheduled like any normal thread
-        __schedule_thread(mainThread);
+        schedule_thread$(mainThread);
 
         // SKULLDUGGERY: Force a context switch to the main processor to set the main thread's context to the current UNIX

libcfa/src/concurrency/kernel_private.hfa

@@ -32 +32 @@
 }
 
-void __schedule_thread( $thread * )
-#if defined(NDEBUG) || (!defined(__CFA_DEBUG__) && !defined(__CFA_VERIFY__))
-        __attribute__((nonnull (1)))
-#endif
-;
+void schedule_thread$( $thread * ) __attribute__((nonnull (1)));
 
 extern bool __preemption_enabled();

libcfa/src/concurrency/thread.cfa

@@ -134 +134 @@
         /* paranoid */ verify( this_thrd->context.SP );
 
-        __schedule_thread( this_thrd );
+        schedule_thread$( this_thrd );
         enable_interrupts();
 }