Changes in libcfa/src/concurrency/thread.cfa [015925a:cd5b58f]

File:

• libcfa/src/concurrency/thread.cfa (modified) (5 diffs)

libcfa/src/concurrency/thread.cfa

@@ -19 +19 @@
 #include "thread.hfa"
 
+#include "exception.hfa"
 #include "kernel/private.hfa"
-#include "exception.hfa"
+#include "limits.hfa"
 
 #define __CFA_INVOKE_PRIVATE__
@@ -26 +27 @@
 
 extern uint32_t __global_random_seed, __global_random_prime, __global_random_mask;
+
+#pragma GCC visibility push(default)
 
 //-----------------------------------------------------------------------------
@@ -41 +44 @@
         self_mon_p = &self_mon;
         curr_cluster = &cl;
-        link.next = 0p;
-        link.ts   = -1llu;
+        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( );
@@ -87 +88 @@
 }
 
-forall(T & | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T))
-    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
+forall(T & | is_thread(T) | IS_EXCEPTION(ThreadCancelled(T))
+    | { EHM_DEFAULT_VTABLE(ThreadCancelled(T)); })
 void ?{}( thread_dtor_guard_t & this,
                 T & thrd, void(*cancelHandler)(ThreadCancelled(T) &)) {
@@ -166 +167 @@
 
 //-----------------------------------------------------------------------------
-forall(T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T))
-    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
+forall(T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled(T))
+        | { EHM_DEFAULT_VTABLE(ThreadCancelled(T)); })
 T & join( T & this ) {
         thread_dtor_guard_t guard = { this, defaultResumptionHandler };
         return this;
+}
+
+//-----------------------------------------------------------------------------
+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;
+        }
 }