Changeset 63be3387 for libcfa/src/concurrency/thread.cfa

Timestamp:

Nov 14, 2022, 11:52:44 AM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

7d9598d8

Parents:

b77f0e1 (diff), 19a8c40 (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/thread.cfa (modified) (2 diffs)

libcfa/src/concurrency/thread.cfa

@@ -44 +44 @@
         self_mon_p = &self_mon;
         curr_cluster = &cl;
-        link.next = 0p;
-        link.ts   = MAX;
+        rdy_link.next = 0p;
+        rdy_link.ts   = MAX;
         preferred = ready_queue_new_preferred();
         last_proc = 0p;
         random_state = __global_random_mask ? __global_random_prime : __global_random_prime ^ rdtscl();
         #if defined( __CFA_WITH_VERIFY__ )
+                executing = 0p;
                 canary = 0x0D15EA5E0D15EA5Ep;
         #endif
-
-        node.next = 0p;
-        node.prev = 0p;
 
         clh_node = malloc( );
@@ -177 +175 @@
 
 //-----------------------------------------------------------------------------
+bool migrate( thread$ * thrd, struct cluster & cl ) {
+
+        monitor$ * tmon = get_monitor(thrd);
+        monitor$ * __monitors[] = { tmon };
+        monitor_guard_t __guard = { __monitors, 1 };
+
+
+        {
+                // if nothing needs to be done, return false
+                if( thrd->curr_cluster == &cl ) return false;
+
+                // are we migrating ourself?
+                const bool local = thrd == active_thread();
+
+                /* paranoid */ verify( !local || &cl != active_cluster() );
+                /* paranoid */ verify( !local || thrd->curr_cluster == active_cluster() );
+                /* paranoid */ verify( !local || thrd->curr_cluster == active_processor()->cltr );
+                /* paranoid */ verify( local || tmon->signal_stack.top->owner->waiting_thread == thrd );
+                /* paranoid */ verify( local || tmon->signal_stack.top );
+
+                // make sure we aren't interrupted while doing this
+                // not as important if we aren't local
+                disable_interrupts();
+
+                // actually move the thread
+                unregister( thrd->curr_cluster, *thrd );
+                thrd->curr_cluster = &cl;
+                doregister( thrd->curr_cluster, *thrd );
+
+                // restore interrupts
+                enable_interrupts();
+
+                // if this is the local thread, we are still running on the old cluster
+                if(local) yield();
+
+                /* paranoid */ verify( !local || &cl == active_cluster() );
+                /* paranoid */ verify( !local || thrd->curr_cluster == active_cluster() );
+                /* paranoid */ verify( !local || thrd->curr_cluster == active_processor()->cltr );
+                /* paranoid */ verify(  local || tmon->signal_stack.top );
+                /* paranoid */ verify(  local || tmon->signal_stack.top->owner->waiting_thread == thrd );
+
+                return true;
+        }
+}
+
+//-----------------------------------------------------------------------------
 #define GENERATOR LCG