Changes in libcfa/src/concurrency/kernel_private.hfa [b6f2b213:09f357ec]

File:

• libcfa/src/concurrency/kernel_private.hfa (modified) (5 diffs)

libcfa/src/concurrency/kernel_private.hfa

@@ -31 +31 @@
 }
 
-void __schedule_thread( $thread * ) __attribute__((nonnull (1)));
+void ScheduleThread( thread_desc * );
+static inline void WakeThread( thread_desc * thrd ) {
+        if( !thrd ) return;
+
+        verify(thrd->state == Inactive);
+
+        disable_interrupts();
+        ScheduleThread( thrd );
+        enable_interrupts( __cfaabi_dbg_ctx );
+}
+thread_desc * nextThread(cluster * this);
 
 //Block current thread and release/wake-up the following resources
-void __leave_thread() __attribute__((noreturn));
+void BlockInternal(void);
+void BlockInternal(__spinlock_t * lock);
+void BlockInternal(thread_desc * thrd);
+void BlockInternal(__spinlock_t * lock, thread_desc * thrd);
+void BlockInternal(__spinlock_t * locks [], unsigned short count);
+void BlockInternal(__spinlock_t * locks [], unsigned short count, thread_desc * thrds [], unsigned short thrd_count);
+void BlockInternal(__finish_callback_fptr_t callback);
+void LeaveThread(__spinlock_t * lock, thread_desc * thrd);
 
 //-----------------------------------------------------------------------------
@@ -40 +57 @@
 void main(processorCtx_t *);
 
-void * __create_pthread( pthread_t *, void * (*)(void *), void * );
+void * create_pthread( pthread_t *, void * (*)(void *), void * );
 
+static inline void wake_fast(processor * this) {
+        __cfaabi_dbg_print_safe("Kernel : Waking up processor %p\n", this);
+        post( this->idleLock );
+}
 
+static inline void wake(processor * this) {
+        disable_interrupts();
+        wake_fast(this);
+        enable_interrupts( __cfaabi_dbg_ctx );
+}
 
 struct event_kernel_t {
@@ -59 +85 @@
 extern volatile thread_local __cfa_kernel_preemption_state_t preemption_state __attribute__ ((tls_model ( "initial-exec" )));
 
-extern cluster * mainCluster;
-
 //-----------------------------------------------------------------------------
 // Threads
 extern "C" {
-      void __cfactx_invoke_thread(void (*main)(void *), void * this);
+      void CtxInvokeThread(void (*main)(void *), void * this);
 }
 
+extern void ThreadCtxSwitch(coroutine_desc * src, coroutine_desc * dst);
+
 __cfaabi_dbg_debug_do(
-        extern void __cfaabi_dbg_thread_register  ( $thread * thrd );
-        extern void __cfaabi_dbg_thread_unregister( $thread * thrd );
+        extern void __cfaabi_dbg_thread_register  ( thread_desc * thrd );
+        extern void __cfaabi_dbg_thread_unregister( thread_desc * thrd );
 )
-
-// KERNEL ONLY unpark with out disabling interrupts
-void __unpark( $thread * thrd __cfaabi_dbg_ctx_param2 );
-
-//-----------------------------------------------------------------------------
-// I/O
-void __kernel_io_startup     ( cluster &, int, bool );
-void __kernel_io_finish_start( cluster & );
-void __kernel_io_prepare_stop( cluster & );
-void __kernel_io_shutdown    ( cluster &, bool );
 
 //-----------------------------------------------------------------------------
@@ -86 +102 @@
 #define KERNEL_STORAGE(T,X) static char storage_##X[sizeof(T)]
 
-static inline uint32_t __tls_rand() {
+static inline uint32_t tls_rand() {
         kernelTLS.rand_seed ^= kernelTLS.rand_seed << 6;
         kernelTLS.rand_seed ^= kernelTLS.rand_seed >> 21;
@@ -97 +113 @@
 void unregister( struct cluster & cltr );
 
-void doregister( struct cluster * cltr, struct $thread & thrd );
-void unregister( struct cluster * cltr, struct $thread & thrd );
+void doregister( struct cluster * cltr, struct thread_desc & thrd );
+void unregister( struct cluster * cltr, struct thread_desc & thrd );
 
 void doregister( struct cluster * cltr, struct processor * proc );