Changes in libcfa/src/concurrency/kernel_private.hfa [e873838:e235429]

File:

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

libcfa/src/concurrency/kernel_private.hfa

@@ -33 +33 @@
 }
 
-void __schedule_thread( $thread * )
+void __schedule_thread( struct __processor_id_t *, $thread * )
 #if defined(NDEBUG) || (!defined(__CFA_DEBUG__) && !defined(__CFA_VERIFY__))
-        __attribute__((nonnull (1)))
+        __attribute__((nonnull (2)))
 #endif
 ;
 
-//release/wake-up the following resources
-void __thread_finish( $thread * thrd );
+//Block current thread and release/wake-up the following resources
+void __leave_thread() __attribute__((noreturn));
 
 //-----------------------------------------------------------------------------
@@ -63 +63 @@
 )
 
-#define TICKET_BLOCKED (-1) // thread is blocked
-#define TICKET_RUNNING ( 0) // thread is running
-#define TICKET_UNBLOCK ( 1) // thread should ignore next block
+// KERNEL ONLY unpark with out disabling interrupts
+void __unpark( struct __processor_id_t *, $thread * thrd );
+
+static inline bool __post(single_sem & this, struct __processor_id_t * id) {
+        for() {
+                struct $thread * expected = this.ptr;
+                if(expected == 1p) return false;
+                if(expected == 0p) {
+                        if(__atomic_compare_exchange_n(&this.ptr, &expected, 1p, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
+                                return false;
+                        }
+                }
+                else {
+                        if(__atomic_compare_exchange_n(&this.ptr, &expected, 0p, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
+                                __unpark( id, expected );
+                                return true;
+                        }
+                }
+        }
+}
 
 //-----------------------------------------------------------------------------
@@ -180 +197 @@
 // Reader side : acquire when using the ready queue to schedule but not
 //  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);
+static inline void ready_schedule_lock( struct __processor_id_t * proc) with(*__scheduler_lock) {
+        unsigned iproc = proc->id;
+        /*paranoid*/ verify(data[iproc].handle == proc);
         /*paranoid*/ verify(iproc < ready);
 
@@ -206 +221 @@
 }
 
-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);
+static inline void ready_schedule_unlock( struct __processor_id_t * proc) with(*__scheduler_lock) {
+        unsigned iproc = proc->id;
+        /*paranoid*/ verify(data[iproc].handle == proc);
         /*paranoid*/ verify(iproc < ready);
         /*paranoid*/ verify(data[iproc].lock);
@@ -222 +235 @@
 
 #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;
+        static inline bool ready_schedule_islocked( struct __processor_id_t * proc) {
                 return __scheduler_lock->data[proc->id].owned;
         }