Changeset 3f7e12cb for src/libcfa/concurrency

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, stuck-waitfor-destruct, with_gc

Children:

954908d

Parents:

78315272 (diff), e35f30a (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

Location:

src/libcfa/concurrency

Files:

• coroutine.c (modified) (2 diffs)
• invoke.h (modified) (2 diffs)
• kernel (modified) (4 diffs)
• kernel.c (modified) (16 diffs)
• kernel_private.h (modified) (1 diff)
• monitor (modified) (6 diffs)
• monitor.c (modified) (31 diffs)
• preemption.c (modified) (3 diffs)
• thread (modified) (1 diff)
• thread.c (modified) (1 diff)

src/libcfa/concurrency/coroutine.c

@@ -123 +123 @@
         if(pageSize == 0ul) pageSize = sysconf( _SC_PAGESIZE );
 
-        LIB_DEBUG_PRINT_SAFE("FRED");
-
         size_t cxtSize = libCeiling( sizeof(machine_context_t), 8 ); // minimum alignment
 
@@ -158 +156 @@
                 this->limit = (char *)libCeiling( (unsigned long)this->storage, 16 ); // minimum alignment
         } // if
-        assertf( this->size >= MinStackSize, "Stack size %d provides less than minimum of %d bytes for a stack.", this->size, MinStackSize );
+        assertf( this->size >= MinStackSize, "Stack size %zd provides less than minimum of %d bytes for a stack.", this->size, MinStackSize );
 
         this->base = (char *)this->limit + this->size;

src/libcfa/concurrency/invoke.h

@@ -25 +25 @@
 #define _INVOKE_H_
 
-      #define unlikely(x)    __builtin_expect(!!(x), 0)
-      #define thread_local _Thread_local
-
-      typedef void (*fptr_t)();
-
-      struct spinlock {
-            volatile int lock;
-            #ifdef __CFA_DEBUG__
-                  const char * prev_name;
-                  void* prev_thrd;
-            #endif
-      };
-
-      struct __thread_queue_t {
-            struct thread_desc * head;
-            struct thread_desc ** tail;
-      };
-
-      struct __condition_stack_t {
-            struct __condition_criterion_t * top;
-      };
-
-      #ifdef __CFORALL__
-      extern "Cforall" {
-            void ?{}( struct __thread_queue_t & );
-            void append( struct __thread_queue_t *, struct thread_desc * );
-            struct thread_desc * pop_head( struct __thread_queue_t * );
-            struct thread_desc * remove( struct __thread_queue_t *, struct thread_desc ** );
-
-            void ?{}( struct __condition_stack_t & );
-            void push( struct __condition_stack_t *, struct __condition_criterion_t * );
-            struct __condition_criterion_t * pop( struct __condition_stack_t * );
-
-            void ?{}(spinlock & this);
-            void ^?{}(spinlock & this);
-      }
-      #endif
-
-      struct coStack_t {
-            unsigned int size;                        // size of stack
-            void *storage;                            // pointer to stack
-            void *limit;                              // stack grows towards stack limit
-            void *base;                               // base of stack
-            void *context;                            // address of cfa_context_t
-            void *top;                                // address of top of storage
-            bool userStack;                           // whether or not the user allocated the stack
-      };
-
-      enum coroutine_state { Halted, Start, Inactive, Active, Primed };
-
-      struct coroutine_desc {
-            struct coStack_t stack;                   // stack information of the coroutine
-            const char *name;                         // textual name for coroutine/task, initialized by uC++ generated code
-            int errno_;                               // copy of global UNIX variable errno
-            enum coroutine_state state;               // current execution status for coroutine
-            struct coroutine_desc * starter;          // first coroutine to resume this one
-            struct coroutine_desc * last;             // last coroutine to resume this one
-      };
-
-      struct monitor_desc {
-            struct spinlock lock;                     // spinlock to protect internal data
-            struct thread_desc * owner;               // current owner of the monitor
-            struct __thread_queue_t entry_queue;      // queue of threads that are blocked waiting for the monitor
-            struct __condition_stack_t signal_stack;  // stack of conditions to run next once we exit the monitor
-            unsigned int recursion;                   // monitor routines can be called recursively, we need to keep track of that
-
-            struct __acceptable_t * acceptables;      // list of acceptable functions, null if any
-            unsigned short acceptable_count;          // number of acceptable functions
-            short accepted_index;                     // the index of the accepted function, -1 if none
-       };
-
-      struct thread_desc {
-            // Core threading fields
-            struct coroutine_desc cor;                // coroutine body used to store context
-            struct monitor_desc mon;                  // monitor body used for mutual exclusion
-
-            // Link lists fields
-            struct thread_desc * next;                // instrusive link field for threads
-
-            // Current status related to monitors
-            struct monitor_desc ** current_monitors;  // currently held monitors
-            unsigned short current_monitor_count;     // number of currently held monitors
-            fptr_t current_monitor_func;              // last function that acquired monitors
+        #define unlikely(x)    __builtin_expect(!!(x), 0)
+        #define thread_local _Thread_local
+
+        typedef void (*fptr_t)();
+        typedef int_fast16_t __lock_size_t;
+
+        struct spinlock {
+                volatile int lock;
+                #ifdef __CFA_DEBUG__
+                        const char * prev_name;
+                        void* prev_thrd;
+                #endif
+        };
+
+        struct __thread_queue_t {
+                struct thread_desc * head;
+                struct thread_desc ** tail;
+        };
+
+        struct __condition_stack_t {
+                struct __condition_criterion_t * top;
+        };
+
+        #ifdef __CFORALL__
+        extern "Cforall" {
+                void ?{}( struct __thread_queue_t & );
+                void append( struct __thread_queue_t &, struct thread_desc * );
+                struct thread_desc * pop_head( struct __thread_queue_t & );
+                struct thread_desc * remove( struct __thread_queue_t &, struct thread_desc ** );
+
+                void ?{}( struct __condition_stack_t & );
+                void push( struct __condition_stack_t &, struct __condition_criterion_t * );
+                struct __condition_criterion_t * pop( struct __condition_stack_t & );
+
+                void  ?{}(spinlock & this);
+                void ^?{}(spinlock & this);
+        }
+        #endif
+
+        struct coStack_t {
+                // size of stack
+                size_t size;
+
+                // pointer to stack
+                void *storage;
+
+                // stack grows towards stack limit
+                void *limit;
+
+                // base of stack
+                void *base;
+
+                // address of cfa_context_t
+                void *context;
+
+                // address of top of storage
+                void *top;
+
+                // whether or not the user allocated the stack
+                bool userStack;
+        };
+
+        enum coroutine_state { Halted, Start, Inactive, Active, Primed };
+
+        struct coroutine_desc {
+                // stack information of the coroutine
+                struct coStack_t stack;
+
+                // textual name for coroutine/task, initialized by uC++ generated code
+                const char *name;
+
+                // copy of global UNIX variable errno
+                int errno_;
+
+                // current execution status for coroutine
+                enum coroutine_state state;
+
+                // first coroutine to resume this one
+                struct coroutine_desc * starter;
+
+                // last coroutine to resume this one
+                struct coroutine_desc * last;
+        };
+
+        struct __waitfor_mask_t {
+                // the index of the accepted function, -1 if none
+                short * accepted;
+
+                // list of acceptable functions, null if any
+                struct __acceptable_t * clauses;
+
+                // number of acceptable functions
+                __lock_size_t size;
+        };
+
+        struct monitor_desc {
+                // spinlock to protect internal data
+                struct spinlock lock;
+
+                // current owner of the monitor
+                struct thread_desc * owner;
+
+                // queue of threads that are blocked waiting for the monitor
+                struct __thread_queue_t entry_queue;
+
+                // stack of conditions to run next once we exit the monitor
+                struct __condition_stack_t signal_stack;
+
+                // monitor routines can be called recursively, we need to keep track of that
+                unsigned int recursion;
+
+                // mask used to know if some thread is waiting for something while holding the monitor
+                struct __waitfor_mask_t mask;
+
+                // node used to signal the dtor in a waitfor dtor
+                struct __condition_node_t * dtor_node;
+        };
+
+        struct __monitor_group_t {
+                // currently held monitors
+                struct monitor_desc ** list;
+
+                // number of currently held monitors
+                __lock_size_t size;
+
+                // last function that acquired monitors
+                fptr_t func;
+        };
+
+        struct thread_desc {
+                // Core threading fields
+                // coroutine body used to store context
+                struct coroutine_desc  self_cor;
+
+                // monitor body used for mutual exclusion
+                struct monitor_desc    self_mon;
+
+                // pointer to monitor with sufficient lifetime for current monitors
+                struct monitor_desc *  self_mon_p;
+
+                // monitors currently held by this thread
+                struct __monitor_group_t monitors;
+
+                // Link lists fields
+                // instrusive link field for threads
+                struct thread_desc * next;
      };
+
+     #ifdef __CFORALL__
+     extern "Cforall" {
+                static inline monitor_desc * ?[?]( const __monitor_group_t & this, ptrdiff_t index ) {
+                        return this.list[index];
+                }
+
+                static inline bool ?==?( const __monitor_group_t & lhs, const __monitor_group_t & rhs ) {
+                        if( (lhs.list != 0) != (rhs.list != 0) ) return false;
+                        if( lhs.size != rhs.size ) return false;
+                        if( lhs.func != rhs.func ) return false;
+
+                        // Check that all the monitors match
+                        for( int i = 0; i < lhs.size; i++ ) {
+                                // If not a match, check next function
+                                if( lhs[i] != rhs[i] ) return false;
+                        }
+
+                        return true;
+                }
+        }
+        #endif
 
 #endif //_INVOKE_H_
@@ -115 +200 @@
 #define _INVOKE_PRIVATE_H_
 
-      struct machine_context_t {
-            void *SP;
-            void *FP;
-            void *PC;
-      };
-
-      // assembler routines that performs the context switch
-      extern void CtxInvokeStub( void );
-      void CtxSwitch( void * from, void * to ) asm ("CtxSwitch");
-
-      #if   defined( __x86_64__ )
-      #define CtxGet( ctx ) __asm__ ( \
-                  "movq %%rsp,%0\n"   \
-                  "movq %%rbp,%1\n"   \
-            : "=rm" (ctx.SP), "=rm" (ctx.FP) )
-      #elif defined( __i386__ )
-      #define CtxGet( ctx ) __asm__ ( \
-                  "movl %%esp,%0\n"   \
-                  "movl %%ebp,%1\n"   \
-            : "=rm" (ctx.SP), "=rm" (ctx.FP) )
-      #endif
+        struct machine_context_t {
+                void *SP;
+                void *FP;
+                void *PC;
+        };
+
+        // assembler routines that performs the context switch
+        extern void CtxInvokeStub( void );
+        void CtxSwitch( void * from, void * to ) asm ("CtxSwitch");
+
+        #if   defined( __x86_64__ )
+        #define CtxGet( ctx ) __asm__ ( \
+                        "movq %%rsp,%0\n"   \
+                        "movq %%rbp,%1\n"   \
+                : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+        #elif defined( __i386__ )
+        #define CtxGet( ctx ) __asm__ ( \
+                        "movl %%esp,%0\n"   \
+                        "movl %%ebp,%1\n"   \
+                : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+        #endif
 
 #endif //_INVOKE_PRIVATE_H_

src/libcfa/concurrency/kernel

@@ -26 +26 @@
 //-----------------------------------------------------------------------------
 // Locks
-void lock      ( spinlock * DEBUG_CTX_PARAM2 );       // Lock the spinlock, spin if already acquired
-void lock_yield( spinlock * DEBUG_CTX_PARAM2 );       // Lock the spinlock, yield repeatedly if already acquired
-bool try_lock  ( spinlock * DEBUG_CTX_PARAM2 );       // Lock the spinlock, return false if already acquired
-void unlock    ( spinlock * );                        // Unlock the spinlock
+// Lock the spinlock, spin if already acquired
+void lock      ( spinlock * DEBUG_CTX_PARAM2 );
+
+// Lock the spinlock, yield repeatedly if already acquired
+void lock_yield( spinlock * DEBUG_CTX_PARAM2 );
+
+// Lock the spinlock, return false if already acquired
+bool try_lock  ( spinlock * DEBUG_CTX_PARAM2 );
+
+// Unlock the spinlock
+void unlock    ( spinlock * );
 
 struct semaphore {
@@ -39 +46 @@
 void  ?{}(semaphore & this, int count = 1);
 void ^?{}(semaphore & this);
-void P(semaphore * this);
-void V(semaphore * this);
+void   P (semaphore & this);
+void   V (semaphore & this);
 
 
@@ -46 +53 @@
 // Cluster
 struct cluster {
-        spinlock ready_queue_lock;                      // Ready queue locks
-        __thread_queue_t ready_queue;                   // Ready queue for threads
-        unsigned long long int preemption;              // Preemption rate on this cluster
+        // Ready queue locks
+        spinlock ready_queue_lock;
+
+        // Ready queue for threads
+        __thread_queue_t ready_queue;
+
+        // Preemption rate on this cluster
+        unsigned long long int preemption;
 };
 
-void ?{}(cluster & this);
+void ?{} (cluster & this);
 void ^?{}(cluster & this);
 
@@ -79 +91 @@
 struct processor {
         // Main state
-        struct processorCtx_t * runner;                 // Coroutine ctx who does keeps the state of the processor
-        cluster * cltr;                                 // Cluster from which to get threads
-        pthread_t kernel_thread;                        // Handle to pthreads
+        // Coroutine ctx who does keeps the state of the processor
+        struct processorCtx_t * runner;
+
+        // Cluster from which to get threads
+        cluster * cltr;
+
+        // Handle to pthreads
+        pthread_t kernel_thread;
 
         // Termination
-        volatile bool do_terminate;                     // Set to true to notify the processor should terminate
-        semaphore terminated;                           // Termination synchronisation
+        // Set to true to notify the processor should terminate
+        volatile bool do_terminate;
+
+        // Termination synchronisation
+        semaphore terminated;
 
         // RunThread data
-        struct FinishAction finish;                     // Action to do after a thread is ran
+        // Action to do after a thread is ran
+        struct FinishAction finish;
 
         // Preemption data
-        struct alarm_node_t * preemption_alarm;         // Node which is added in the discrete event simulaiton
-        bool pending_preemption;                        // If true, a preemption was triggered in an unsafe region, the processor must preempt as soon as possible
+        // Node which is added in the discrete event simulaiton
+        struct alarm_node_t * preemption_alarm;
+
+        // If true, a preemption was triggered in an unsafe region, the processor must preempt as soon as possible
+        bool pending_preemption;
 
 #ifdef __CFA_DEBUG__
-        char * last_enable;                             // Last function to enable preemption on this processor
+        // Last function to enable preemption on this processor
+        char * last_enable;
 #endif
 };
 
-void ?{}(processor & this);
-void ?{}(processor & this, cluster * cltr);
+void  ?{}(processor & this);
+void  ?{}(processor & this, cluster * cltr);
 void ^?{}(processor & this);
 

src/libcfa/concurrency/kernel.c

@@ -106 +106 @@
 
 void ?{}( thread_desc & this, current_stack_info_t * info) {
-        (this.cor){ info };
+        (this.self_cor){ info };
 }
 
@@ -158 +158 @@
                 LIB_DEBUG_PRINT_SAFE("Kernel : core %p signaling termination\n", &this);
                 this.do_terminate = true;
-                P( &this.terminated );
+                P( this.terminated );
                 pthread_join( this.kernel_thread, NULL );
         }
@@ -216 +216 @@
         }
 
-        V( &this->terminated );
+        V( this->terminated );
 
         LIB_DEBUG_PRINT_SAFE("Kernel : core %p terminated\n", this);
@@ -328 +328 @@
         // if( !thrd ) return;
         verify( thrd );
-        verify( thrd->cor.state != Halted );
+        verify( thrd->self_cor.state != Halted );
 
         verify( disable_preempt_count > 0 );
@@ -335 +335 @@
 
         lock(   &this_processor->cltr->ready_queue_lock DEBUG_CTX2 );
-        append( &this_processor->cltr->ready_queue, thrd );
+        append( this_processor->cltr->ready_queue, thrd );
         unlock( &this_processor->cltr->ready_queue_lock );
 
@@ -344 +344 @@
         verify( disable_preempt_count > 0 );
         lock( &this->ready_queue_lock DEBUG_CTX2 );
-        thread_desc * head = pop_head( &this->ready_queue );
+        thread_desc * head = pop_head( this->ready_queue );
         unlock( &this->ready_queue_lock );
         verify( disable_preempt_count > 0 );
@@ -373 +373 @@
         assert(thrd);
         disable_interrupts();
-        assert( thrd->cor.state != Halted );
+        assert( thrd->self_cor.state != Halted );
         this_processor->finish.action_code = Schedule;
         this_processor->finish.thrd = thrd;
@@ -398 +398 @@
 }
 
-void BlockInternal(spinlock ** locks, unsigned short count) {
+void BlockInternal(spinlock * locks [], unsigned short count) {
         disable_interrupts();
         this_processor->finish.action_code = Release_Multi;
@@ -411 +411 @@
 }
 
-void BlockInternal(spinlock ** locks, unsigned short lock_count, thread_desc ** thrds, unsigned short thrd_count) {
+void BlockInternal(spinlock * locks [], unsigned short lock_count, thread_desc * thrds [], unsigned short thrd_count) {
         disable_interrupts();
         this_processor->finish.action_code = Release_Multi_Schedule;
@@ -466 +466 @@
         this_processor = mainProcessor;
         this_thread = mainThread;
-        this_coroutine = &mainThread->cor;
+        this_coroutine = &mainThread->self_cor;
 
         // Enable preemption
@@ -547 +547 @@
         thread_desc * thrd = kernel_data;
 
-        int len = snprintf( abort_text, abort_text_size, "Error occurred while executing task %.256s (%p)", thrd->cor.name, thrd );
-        __lib_debug_write( STDERR_FILENO, abort_text, len );
+        int len = snprintf( abort_text, abort_text_size, "Error occurred while executing task %.256s (%p)", thrd->self_cor.name, thrd );
+        __lib_debug_write( abort_text, len );
 
         if ( thrd != this_coroutine ) {
                 len = snprintf( abort_text, abort_text_size, " in coroutine %.256s (%p).\n", this_coroutine->name, this_coroutine );
-                __lib_debug_write( STDERR_FILENO, abort_text, len );
+                __lib_debug_write( abort_text, len );
         }
         else {
-                __lib_debug_write( STDERR_FILENO, ".\n", 2 );
+                __lib_debug_write( ".\n", 2 );
         }
 }
@@ -618 +618 @@
 void ^?{}(semaphore & this) {}
 
-void P(semaphore * this) {
-        lock( &this->lock DEBUG_CTX2 );
-        this->count -= 1;
-        if ( this->count < 0 ) {
+void P(semaphore & this) {
+        lock( &this.lock DEBUG_CTX2 );
+        this.count -= 1;
+        if ( this.count < 0 ) {
                 // queue current task
-                append( &this->waiting, (thread_desc *)this_thread );
+                append( this.waiting, (thread_desc *)this_thread );
 
                 // atomically release spin lock and block
-                BlockInternal( &this->lock );
+                BlockInternal( &this.lock );
         }
         else {
-            unlock( &this->lock );
-        }
-}
-
-void V(semaphore * this) {
+            unlock( &this.lock );
+        }
+}
+
+void V(semaphore & this) {
         thread_desc * thrd = NULL;
-        lock( &this->lock DEBUG_CTX2 );
-        this->count += 1;
-        if ( this->count <= 0 ) {
+        lock( &this.lock DEBUG_CTX2 );
+        this.count += 1;
+        if ( this.count <= 0 ) {
                 // remove task at head of waiting list
-                thrd = pop_head( &this->waiting );
-        }
-
-        unlock( &this->lock );
+                thrd = pop_head( this.waiting );
+        }
+
+        unlock( &this.lock );
 
         // make new owner
@@ -655 +655 @@
 }
 
-void append( __thread_queue_t * this, thread_desc * t ) {
-        verify(this->tail != NULL);
-        *this->tail = t;
-        this->tail = &t->next;
-}
-
-thread_desc * pop_head( __thread_queue_t * this ) {
-        thread_desc * head = this->head;
+void append( __thread_queue_t & this, thread_desc * t ) {
+        verify(this.tail != NULL);
+        *this.tail = t;
+        this.tail = &t->next;
+}
+
+thread_desc * pop_head( __thread_queue_t & this ) {
+        thread_desc * head = this.head;
         if( head ) {
-                this->head = head->next;
+                this.head = head->next;
                 if( !head->next ) {
-                        this->tail = &this->head;
+                        this.tail = &this.head;
                 }
                 head->next = NULL;
@@ -673 +673 @@
 }
 
-thread_desc * remove( __thread_queue_t * this, thread_desc ** it ) {
+thread_desc * remove( __thread_queue_t & this, thread_desc ** it ) {
         thread_desc * thrd = *it;
         verify( thrd );
@@ -679 +679 @@
         (*it) = thrd->next;
 
-        if( this->tail == &thrd->next ) {
-                this->tail = it;
+        if( this.tail == &thrd->next ) {
+                this.tail = it;
         }
 
         thrd->next = NULL;
 
-        verify( (this->head == NULL) == (&this->head == this->tail) );
-        verify( *this->tail == NULL );
+        verify( (this.head == NULL) == (&this.head == this.tail) );
+        verify( *this.tail == NULL );
         return thrd;
 }
@@ -694 +694 @@
 }
 
-void push( __condition_stack_t * this, __condition_criterion_t * t ) {
+void push( __condition_stack_t & this, __condition_criterion_t * t ) {
         verify( !t->next );
-        t->next = this->top;
-        this->top = t;
-}
-
-__condition_criterion_t * pop( __condition_stack_t * this ) {
-        __condition_criterion_t * top = this->top;
+        t->next = this.top;
+        this.top = t;
+}
+
+__condition_criterion_t * pop( __condition_stack_t & this ) {
+        __condition_criterion_t * top = this.top;
         if( top ) {
-                this->top = top->next;
+                this.top = top->next;
                 top->next = NULL;
         }

src/libcfa/concurrency/kernel_private.h

@@ -48 +48 @@
 void BlockInternal(thread_desc * thrd);
 void BlockInternal(spinlock * lock, thread_desc * thrd);
-void BlockInternal(spinlock ** locks, unsigned short count);
-void BlockInternal(spinlock ** locks, unsigned short count, thread_desc ** thrds, unsigned short thrd_count);
+void BlockInternal(spinlock * locks [], unsigned short count);
+void BlockInternal(spinlock * locks [], unsigned short count, thread_desc * thrds [], unsigned short thrd_count);
 void LeaveThread(spinlock * lock, thread_desc * thrd);
 

src/libcfa/concurrency/monitor

@@ -10 +10 @@
 // Created On       : Thd Feb 23 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:59:01 2017
-// Update Count     : 3
+// Last Modified On : Sat Oct  7 18:06:45 2017
+// Update Count     : 10
 //
 
@@ -22 +22 @@
 #include "stdlib"
 
+trait is_monitor(dtype T) {
+        monitor_desc * get_monitor( T & );
+        void ^?{}( T & mutex );
+};
+
 static inline void ?{}(monitor_desc & this) {
         (this.lock){};
-        this.owner = NULL;
         (this.entry_queue){};
         (this.signal_stack){};
-        this.recursion = 0;
-        this.acceptables = NULL;
-        this.acceptable_count = 0;
-        this.accepted_index = -1;
+        this.owner         = NULL;
+        this.recursion     = 0;
+        this.mask.accepted = NULL;
+        this.mask.clauses  = NULL;
+        this.mask.size     = 0;
+        this.dtor_node     = NULL;
 }
 
 struct monitor_guard_t {
         monitor_desc ** m;
-        int count;
+        __lock_size_t   count;
         monitor_desc ** prev_mntrs;
-        unsigned short  prev_count;
+        __lock_size_t   prev_count;
         fptr_t          prev_func;
 };
 
-static inline int ?<?(monitor_desc* lhs, monitor_desc* rhs) {
-        return ((intptr_t)lhs) < ((intptr_t)rhs);
+void ?{}( monitor_guard_t & this, monitor_desc ** m, __lock_size_t count, void (*func)() );
+void ^?{}( monitor_guard_t & this );
+
+struct monitor_dtor_guard_t {
+        monitor_desc * m;
+        monitor_desc ** prev_mntrs;
+        __lock_size_t   prev_count;
+        fptr_t          prev_func;
+};
+
+void ?{}( monitor_dtor_guard_t & this, monitor_desc ** m, void (*func)() );
+void ^?{}( monitor_dtor_guard_t & this );
+
+static inline forall( dtype T | sized(T) | { void ^?{}( T & mutex ); } )
+void delete( T * th ) {
+        ^(*th){};
+        free( th );
 }
-
-void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, void (*func)() );
-void ^?{}( monitor_guard_t & this );
 
 //-----------------------------------------------------------------------------
@@ -52 +70 @@
 
 struct __condition_criterion_t {
-        bool ready;                                             //Whether or not the criterion is met (True if met)
-        monitor_desc * target;                          //The monitor this criterion concerns
-        struct __condition_node_t * owner;              //The parent node to which this criterion belongs
-        __condition_criterion_t * next;         //Intrusive linked list Next field
+        // Whether or not the criterion is met (True if met)
+        bool ready;
+
+        // The monitor this criterion concerns
+        monitor_desc * target;
+
+        // The parent node to which this criterion belongs
+        struct __condition_node_t * owner;
+
+        // Intrusive linked list Next field
+        __condition_criterion_t * next;
 };
 
 struct __condition_node_t {
-        thread_desc * waiting_thread;                   //Thread that needs to be woken when all criteria are met
-        __condition_criterion_t * criteria;     //Array of criteria (Criterions are contiguous in memory)
-        unsigned short count;                           //Number of criterions in the criteria
-        __condition_node_t * next;                      //Intrusive linked list Next field
-        uintptr_t user_info;                            //Custom user info accessible before signalling
+        // Thread that needs to be woken when all criteria are met
+        thread_desc * waiting_thread;
+
+        // Array of criteria (Criterions are contiguous in memory)
+        __condition_criterion_t * criteria;
+
+        // Number of criterions in the criteria
+        __lock_size_t count;
+
+        // Intrusive linked list Next field
+        __condition_node_t * next;
+
+        // Custom user info accessible before signalling
+        uintptr_t user_info;
 };
 
@@ -71 +105 @@
 };
 
+void ?{}(__condition_node_t & this, thread_desc * waiting_thread, __lock_size_t count, uintptr_t user_info );
+void ?{}(__condition_criterion_t & this );
+void ?{}(__condition_criterion_t & this, monitor_desc * target, __condition_node_t * owner );
+
 void ?{}( __condition_blocked_queue_t & );
-void append( __condition_blocked_queue_t *, __condition_node_t * );
-__condition_node_t * pop_head( __condition_blocked_queue_t * );
+void append( __condition_blocked_queue_t &, __condition_node_t * );
+__condition_node_t * pop_head( __condition_blocked_queue_t & );
 
 struct condition {
-        __condition_blocked_queue_t blocked;    //Link list which contains the blocked threads as-well as the information needed to unblock them
-        monitor_desc ** monitors;                       //Array of monitor pointers (Monitors are NOT contiguous in memory)
-        unsigned short monitor_count;                   //Number of monitors in the array
+        // Link list which contains the blocked threads as-well as the information needed to unblock them
+        __condition_blocked_queue_t blocked;
+
+        // Array of monitor pointers (Monitors are NOT contiguous in memory)
+        monitor_desc ** monitors;
+
+        // Number of monitors in the array
+        __lock_size_t monitor_count;
 };
 
@@ -90 +133 @@
 }
 
-void wait( condition * this, uintptr_t user_info = 0 );
-bool signal( condition * this );
-bool signal_block( condition * this );
-static inline bool is_empty( condition * this ) { return !this->blocked.head; }
-uintptr_t front( condition * this );
+              void wait        ( condition & this, uintptr_t user_info = 0 );
+              bool signal      ( condition & this );
+              bool signal_block( condition & this );
+static inline bool is_empty    ( condition & this ) { return !this.blocked.head; }
+         uintptr_t front       ( condition & this );
 
 //-----------------------------------------------------------------------------
@@ -100 +143 @@
 
 struct __acceptable_t {
-        fptr_t func;
-        unsigned short count;
-        monitor_desc ** monitors;
+        __monitor_group_t;
         bool is_dtor;
 };
 
-int __accept_internal( unsigned short count, __acceptable_t * acceptables );
+void __waitfor_internal( const __waitfor_mask_t & mask, int duration );
 
 // Local Variables: //

src/libcfa/concurrency/monitor.c

@@ -17 +17 @@
 
 #include <stdlib>
+#include <inttypes.h>
 
 #include "libhdr.h"
 #include "kernel_private.h"
 
+#include "bits/algorithms.h"
+
 //-----------------------------------------------------------------------------
 // Forward declarations
-static inline void set_owner( monitor_desc * this, thread_desc * owner );
+static inline void set_owner ( monitor_desc * this, thread_desc * owner );
+static inline void set_owner ( monitor_desc * storage [], __lock_size_t count, thread_desc * owner );
+static inline void set_mask  ( monitor_desc * storage [], __lock_size_t count, const __waitfor_mask_t & mask );
+static inline void reset_mask( monitor_desc * this );
+
 static inline thread_desc * next_thread( monitor_desc * this );
-static inline int is_accepted( thread_desc * owner, monitor_desc * this, monitor_desc ** group, int group_cnt, void (*func)() );
-
-static inline void lock_all( spinlock ** locks, unsigned short count );
-static inline void lock_all( monitor_desc ** source, spinlock ** /*out*/ locks, unsigned short count );
-static inline void unlock_all( spinlock ** locks, unsigned short count );
-static inline void unlock_all( monitor_desc ** locks, unsigned short count );
-
-static inline void save_recursion   ( monitor_desc ** ctx, unsigned int * /*out*/ recursions, unsigned short count );
-static inline void restore_recursion( monitor_desc ** ctx, unsigned int * /*in */ recursions, unsigned short count );
-
-static inline void init     ( int count, monitor_desc ** monitors, __condition_node_t * waiter, __condition_criterion_t * criteria );
-static inline void init_push( int count, monitor_desc ** monitors, __condition_node_t * waiter, __condition_criterion_t * criteria );
-
-static inline thread_desc * check_condition( __condition_criterion_t * );
-static inline void brand_condition( condition * );
-static inline unsigned short insert_unique( thread_desc ** thrds, unsigned short end, thread_desc * val );
-
-static inline thread_desc * search_entry_queue( __acceptable_t * acceptables, int acc_count, monitor_desc ** monitors, int count );
+static inline bool is_accepted( monitor_desc * this, const __monitor_group_t & monitors );
+
+static inline void lock_all  ( spinlock * locks [], __lock_size_t count );
+static inline void lock_all  ( monitor_desc * source [], spinlock * /*out*/ locks [], __lock_size_t count );
+static inline void unlock_all( spinlock * locks [], __lock_size_t count );
+static inline void unlock_all( monitor_desc * locks [], __lock_size_t count );
+
+static inline void save   ( monitor_desc * ctx [], __lock_size_t count, spinlock * locks [], unsigned int /*out*/ recursions [], __waitfor_mask_t /*out*/ masks [] );
+static inline void restore( monitor_desc * ctx [], __lock_size_t count, spinlock * locks [], unsigned int /*in */ recursions [], __waitfor_mask_t /*in */ masks [] );
+
+static inline void init     ( __lock_size_t count, monitor_desc * monitors [], __condition_node_t & waiter, __condition_criterion_t criteria [] );
+static inline void init_push( __lock_size_t count, monitor_desc * monitors [], __condition_node_t & waiter, __condition_criterion_t criteria [] );
+
+static inline thread_desc *        check_condition   ( __condition_criterion_t * );
+static inline void                 brand_condition   ( condition & );
+static inline [thread_desc *, int] search_entry_queue( const __waitfor_mask_t &, monitor_desc * monitors [], __lock_size_t count );
+
+forall(dtype T | sized( T ))
+static inline __lock_size_t insert_unique( T * array [], __lock_size_t & size, T * val );
+static inline __lock_size_t count_max    ( const __waitfor_mask_t & mask );
+static inline __lock_size_t aggregate    ( monitor_desc * storage [], const __waitfor_mask_t & mask );
 
 //-----------------------------------------------------------------------------
 // Useful defines
-#define wait_ctx(thrd, user_info)                               /* Create the necessary information to use the signaller stack       */ \
-        __condition_node_t waiter = { thrd, count, user_info };   /* Create the node specific to this wait operation                   */ \
-        __condition_criterion_t criteria[count];                  /* Create the creteria this wait operation needs to wake up          */ \
-        init( count, monitors, &waiter, criteria );               /* Link everything together                                          */ \
-
-#define wait_ctx_primed(thrd, user_info)                        /* Create the necessary information to use the signaller stack       */ \
-        __condition_node_t waiter = { thrd, count, user_info };   /* Create the node specific to this wait operation                   */ \
-        __condition_criterion_t criteria[count];                  /* Create the creteria this wait operation needs to wake up          */ \
-        init_push( count, monitors, &waiter, criteria );          /* Link everything together and push it to the AS-Stack              */ \
-
-#define monitor_ctx( mons, cnt )              /* Define that create the necessary struct for internal/external scheduling operations */ \
-        monitor_desc ** monitors = mons;        /* Save the targeted monitors                                                          */ \
-        unsigned short count = cnt;             /* Save the count to a local variable                                                  */ \
-        unsigned int recursions[ count ];       /* Save the current recursion levels to restore them later                             */ \
-        spinlock *   locks     [ count ];       /* We need to pass-in an array of locks to BlockInternal                               */ \
+#define wait_ctx(thrd, user_info)                               /* Create the necessary information to use the signaller stack                         */ \
+        __condition_node_t waiter = { thrd, count, user_info };   /* Create the node specific to this wait operation                                     */ \
+        __condition_criterion_t criteria[count];                  /* Create the creteria this wait operation needs to wake up                            */ \
+        init( count, monitors, waiter, criteria );                /* Link everything together                                                            */ \
+
+#define wait_ctx_primed(thrd, user_info)                        /* Create the necessary information to use the signaller stack                         */ \
+        __condition_node_t waiter = { thrd, count, user_info };   /* Create the node specific to this wait operation                                     */ \
+        __condition_criterion_t criteria[count];                  /* Create the creteria this wait operation needs to wake up                            */ \
+        init_push( count, monitors, waiter, criteria );           /* Link everything together and push it to the AS-Stack                                */ \
+
+#define monitor_ctx( mons, cnt )                                /* Define that create the necessary struct for internal/external scheduling operations */ \
+        monitor_desc ** monitors = mons;                          /* Save the targeted monitors                                                          */ \
+        __lock_size_t count = cnt;                                /* Save the count to a local variable                                                  */ \
+        unsigned int recursions[ count ];                         /* Save the current recursion levels to restore them later                             */ \
+        __waitfor_mask_t masks [ count ];                         /* Save the current waitfor masks to restore them later                                */ \
+        spinlock *   locks     [ count ];                         /* We need to pass-in an array of locks to BlockInternal                               */ \
+
+#define monitor_save    save   ( monitors, count, locks, recursions, masks )
+#define monitor_restore restore( monitors, count, locks, recursions, masks )
+
 
 //-----------------------------------------------------------------------------
@@ -68 +83 @@
 extern "C" {
         // Enter single monitor
-        static void __enter_monitor_desc( monitor_desc * this, monitor_desc ** group, int group_cnt, void (*func)() ) {
+        static void __enter_monitor_desc( monitor_desc * this, const __monitor_group_t & group ) {
                 // Lock the monitor spinlock, lock_yield to reduce contention
                 lock_yield( &this->lock DEBUG_CTX2 );
@@ -75 +90 @@
                 LIB_DEBUG_PRINT_SAFE("Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner);
 
-                this->accepted_index = -1;
                 if( !this->owner ) {
                         // No one has the monitor, just take it
@@ -83 +97 @@
                 }
                 else if( this->owner == thrd) {
-                        // We already have the monitor, just not how many times we took it
-                        verify( this->recursion > 0 );
+                        // We already have the monitor, just note how many times we took it
                         this->recursion += 1;
 
                         LIB_DEBUG_PRINT_SAFE("Kernel :  mon already owned \n");
                 }
-                else if( (this->accepted_index = is_accepted( thrd, this, group, group_cnt, func)) >= 0 ) {
+                else if( is_accepted( this, group) ) {
                         // Some one was waiting for us, enter
                         set_owner( this, thrd );
 
+                        // Reset mask
+                        reset_mask( this );
+
                         LIB_DEBUG_PRINT_SAFE("Kernel :  mon accepts \n");
                 }
@@ -99 +115 @@
 
                         // Some one else has the monitor, wait in line for it
-                        append( &this->entry_queue, thrd );
+                        append( this->entry_queue, thrd );
                         BlockInternal( &this->lock );
 
@@ -113 +129 @@
                 unlock( &this->lock );
                 return;
+        }
+
+        static void __enter_monitor_dtor( monitor_desc * this, fptr_t func ) {
+                // Lock the monitor spinlock, lock_yield to reduce contention
+                lock_yield( &this->lock DEBUG_CTX2 );
+                thread_desc * thrd = this_thread;
+
+                LIB_DEBUG_PRINT_SAFE("Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner);
+
+
+                if( !this->owner ) {
+                        LIB_DEBUG_PRINT_SAFE("Kernel : Destroying free mon %p\n", this);
+
+                        // No one has the monitor, just take it
+                        set_owner( this, thrd );
+
+                        unlock( &this->lock );
+                        return;
+                }
+                else if( this->owner == thrd) {
+                        // We already have the monitor... but where about to destroy it so the nesting will fail
+                        // Abort!
+                        abortf("Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex.");
+                }
+
+                __lock_size_t count = 1;
+                monitor_desc ** monitors = &this;
+                __monitor_group_t group = { &this, 1, func };
+                if( is_accepted( this, group) ) {
+                        LIB_DEBUG_PRINT_SAFE("Kernel :  mon accepts dtor, block and signal it \n");
+
+                        // Wake the thread that is waiting for this
+                        __condition_criterion_t * urgent = pop( this->signal_stack );
+                        verify( urgent );
+
+                        // Reset mask
+                        reset_mask( this );
+
+                        // Create the node specific to this wait operation
+                        wait_ctx_primed( this_thread, 0 )
+
+                        // Some one else has the monitor, wait for him to finish and then run
+                        BlockInternal( &this->lock, urgent->owner->waiting_thread );
+
+                        // Some one was waiting for us, enter
+                        set_owner( this, thrd );
+                }
+                else {
+                        LIB_DEBUG_PRINT_SAFE("Kernel :  blocking \n");
+
+                        wait_ctx( this_thread, 0 )
+                        this->dtor_node = &waiter;
+
+                        // Some one else has the monitor, wait in line for it
+                        append( this->entry_queue, thrd );
+                        BlockInternal( &this->lock );
+
+                        // BlockInternal will unlock spinlock, no need to unlock ourselves
+                        return;
+                }
+
+                LIB_DEBUG_PRINT_SAFE("Kernel : Destroying %p\n", this);
+
         }
 
@@ -120 +199 @@
                 lock_yield( &this->lock DEBUG_CTX2 );
 
-                verifyf( this_thread == this->owner, "Expected owner to be %p, got %p (r: %i)", this_thread, this->owner, this->recursion );
+                LIB_DEBUG_PRINT_SAFE("Kernel : %10p Leaving mon %p (%p)\n", this_thread, this, this->owner);
+
+                verifyf( this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", this_thread, this->owner, this->recursion, this );
 
                 // Leaving a recursion level, decrement the counter
@@ -128 +209 @@
                 // it means we don't need to do anything
                 if( this->recursion != 0) {
+                        LIB_DEBUG_PRINT_SAFE("Kernel :  recursion still %d\n", this->recursion);
                         unlock( &this->lock );
                         return;
@@ -140 +222 @@
                 //We need to wake-up the thread
                 WakeThread( new_owner );
+        }
+
+        // Leave single monitor for the last time
+        void __leave_dtor_monitor_desc( monitor_desc * this ) {
+                LIB_DEBUG_DO(
+                        if( this_thread != this->owner ) {
+                                abortf("Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, this_thread, this->owner);
+                        }
+                        if( this->recursion != 1 ) {
+                                abortf("Destroyed monitor %p has %d outstanding nested calls.\n", this, this->recursion - 1);
+                        }
+                )
         }
 
@@ -146 +240 @@
         // Should never return
         void __leave_thread_monitor( thread_desc * thrd ) {
-                monitor_desc * this = &thrd->mon;
+                monitor_desc * this = &thrd->self_mon;
 
                 // Lock the monitor now
@@ -153 +247 @@
                 disable_interrupts();
 
-                thrd->cor.state = Halted;
-
-                verifyf( thrd == this->owner, "Expected owner to be %p, got %p (r: %i)", thrd, this->owner, this->recursion );
+                thrd->self_cor.state = Halted;
+
+                verifyf( thrd == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", thrd, this->owner, this->recursion, this );
 
                 // Leaving a recursion level, decrement the counter
@@ -178 +272 @@
 // Enter multiple monitor
 // relies on the monitor array being sorted
-static inline void enter(monitor_desc ** monitors, int count, void (*func)() ) {
-        for(int i = 0; i < count; i++) {
-                __enter_monitor_desc( monitors[i], monitors, count, func );
+static inline void enter( __monitor_group_t monitors ) {
+        for( __lock_size_t i = 0; i < monitors.size; i++) {
+                __enter_monitor_desc( monitors.list[i], monitors );
         }
 }
@@ -186 +280 @@
 // Leave multiple monitor
 // relies on the monitor array being sorted
-static inline void leave(monitor_desc ** monitors, int count) {
-        for(int i = count - 1; i >= 0; i--) {
+static inline void leave(monitor_desc * monitors [], __lock_size_t count) {
+        for( __lock_size_t i = count - 1; i >= 0; i--) {
                 __leave_monitor_desc( monitors[i] );
         }
@@ -194 +288 @@
 // Ctor for monitor guard
 // Sorts monitors before entering
-void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, void (*func)() ) {
+void ?{}( monitor_guard_t & this, monitor_desc * m [], __lock_size_t count, fptr_t func ) {
         // Store current array
         this.m = m;
@@ -200 +294 @@
 
         // Sort monitors based on address -> TODO use a sort specialized for small numbers
-        qsort(this.m, count);
+        __libcfa_small_sort(this.m, count);
 
         // Save previous thread context
-        this.prev_mntrs = this_thread->current_monitors;
-        this.prev_count = this_thread->current_monitor_count;
-        this.prev_func  = this_thread->current_monitor_func;
+        this.[prev_mntrs, prev_count, prev_func] = this_thread->monitors.[list, size, func];
 
         // Update thread context (needed for conditions)
-        this_thread->current_monitors      = m;
-        this_thread->current_monitor_count = count;
-        this_thread->current_monitor_func  = func;
+        this_thread->monitors.[list, size, func] = [m, count, func];
+
+        // LIB_DEBUG_PRINT_SAFE("MGUARD : enter %d\n", count);
 
         // Enter the monitors in order
-        enter( this.m, this.count, func );
+        __monitor_group_t group = {this.m, this.count, func};
+        enter( group );
+
+        // LIB_DEBUG_PRINT_SAFE("MGUARD : entered\n");
 }
 
@@ -219 +314 @@
 // Dtor for monitor guard
 void ^?{}( monitor_guard_t & this ) {
+        // LIB_DEBUG_PRINT_SAFE("MGUARD : leaving %d\n", this.count);
+
         // Leave the monitors in order
         leave( this.m, this.count );
 
+        // LIB_DEBUG_PRINT_SAFE("MGUARD : left\n");
+
         // Restore thread context
-        this_thread->current_monitors      = this.prev_mntrs;
-        this_thread->current_monitor_count = this.prev_count;
-        this_thread->current_monitor_func  = this.prev_func;
+        this_thread->monitors.[list, size, func] = this.[prev_mntrs, prev_count, prev_func];
+}
+
+// Ctor for monitor guard
+// Sorts monitors before entering
+void ?{}( monitor_dtor_guard_t & this, monitor_desc * m [], fptr_t func ) {
+        // Store current array
+        this.m = *m;
+
+        // Save previous thread context
+        this.[prev_mntrs, prev_count, prev_func] = this_thread->monitors.[list, size, func];
+
+        // Update thread context (needed for conditions)
+        this_thread->monitors.[list, size, func] = [m, 1, func];
+
+        __enter_monitor_dtor( this.m, func );
+}
+
+// Dtor for monitor guard
+void ^?{}( monitor_dtor_guard_t & this ) {
+        // Leave the monitors in order
+        __leave_dtor_monitor_desc( this.m );
+
+        // Restore thread context
+        this_thread->monitors.[list, size, func] = this.[prev_mntrs, prev_count, prev_func];
 }
 
 //-----------------------------------------------------------------------------
 // Internal scheduling types
-void ?{}(__condition_node_t & this, thread_desc * waiting_thread, unsigned short count, uintptr_t user_info ) {
+void ?{}(__condition_node_t & this, thread_desc * waiting_thread, __lock_size_t count, uintptr_t user_info ) {
         this.waiting_thread = waiting_thread;
         this.count = count;
@@ -244 +365 @@
 }
 
-void ?{}(__condition_criterion_t & this, monitor_desc * target, __condition_node_t * owner ) {
+void ?{}(__condition_criterion_t & this, monitor_desc * target, __condition_node_t & owner ) {
         this.ready  = false;
         this.target = target;
-        this.owner  = owner;
+        this.owner  = &owner;
         this.next   = NULL;
 }
@@ -253 +374 @@
 //-----------------------------------------------------------------------------
 // Internal scheduling
-void wait( condition * this, uintptr_t user_info = 0 ) {
+void wait( condition & this, uintptr_t user_info = 0 ) {
         brand_condition( this );
 
         // Check that everything is as expected
-        assertf( this->monitors != NULL, "Waiting with no monitors (%p)", this->monitors );
-        verifyf( this->monitor_count != 0, "Waiting with 0 monitors (%i)", this->monitor_count );
-        verifyf( this->monitor_count < 32u, "Excessive monitor count (%i)", this->monitor_count );
+        assertf( this.monitors != NULL, "Waiting with no monitors (%p)", this.monitors );
+        verifyf( this.monitor_count != 0, "Waiting with 0 monitors (%"PRIiFAST16")", this.monitor_count );
+        verifyf( this.monitor_count < 32u, "Excessive monitor count (%"PRIiFAST16")", this.monitor_count );
 
         // Create storage for monitor context
-        monitor_ctx( this->monitors, this->monitor_count );
+        monitor_ctx( this.monitors, this.monitor_count );
 
         // Create the node specific to this wait operation
@@ -269 +390 @@
         // Append the current wait operation to the ones already queued on the condition
         // We don't need locks for that since conditions must always be waited on inside monitor mutual exclusion
-        append( &this->blocked, &waiter );
-
-        // Lock all monitors (aggregates the lock them as well)
+        append( this.blocked, &waiter );
+
+        // Lock all monitors (aggregates the locks as well)
         lock_all( monitors, locks, count );
 
-        // DON'T unlock, ask the kernel to do it
-
-        // Save monitor state
-        save_recursion( monitors, recursions, count );
-
         // Find the next thread(s) to run
-        unsigned short thread_count = 0;
+        __lock_size_t thread_count = 0;
         thread_desc * threads[ count ];
-        for(int i = 0; i < count; i++) {
-                threads[i] = 0;
-        }
+        __builtin_memset( threads, 0, sizeof( threads ) );
+
+        // Save monitor states
+        monitor_save;
 
         // Remove any duplicate threads
-        for( int i = 0; i < count; i++) {
+        for( __lock_size_t i = 0; i < count; i++) {
                 thread_desc * new_owner = next_thread( monitors[i] );
-                thread_count = insert_unique( threads, thread_count, new_owner );
+                insert_unique( threads, thread_count, new_owner );
         }
 
@@ -295 +412 @@
         BlockInternal( locks, count, threads, thread_count );
 
-
-        // WE WOKE UP
-
-
         // We are back, restore the owners and recursions
-        lock_all( locks, count );
-        restore_recursion( monitors, recursions, count );
-        unlock_all( locks, count );
-}
-
-bool signal( condition * this ) {
+        monitor_restore;
+}
+
+bool signal( condition & this ) {
         if( is_empty( this ) ) { return false; }
 
         //Check that everything is as expected
-        verify( this->monitors );
-        verify( this->monitor_count != 0 );
+        verify( this.monitors );
+        verify( this.monitor_count != 0 );
 
         //Some more checking in debug
         LIB_DEBUG_DO(
                 thread_desc * this_thrd = this_thread;
-                if ( this->monitor_count != this_thrd->current_monitor_count ) {
-                        abortf( "Signal on condition %p made with different number of monitor(s), expected %i got %i", this, this->monitor_count, this_thrd->current_monitor_count );
-                }
-
-                for(int i = 0; i < this->monitor_count; i++) {
-                        if ( this->monitors[i] != this_thrd->current_monitors[i] ) {
-                                abortf( "Signal on condition %p made with different monitor, expected %p got %i", this, this->monitors[i], this_thrd->current_monitors[i] );
+                if ( this.monitor_count != this_thrd->monitors.size ) {
+                        abortf( "Signal on condition %p made with different number of monitor(s), expected %i got %i", &this, this.monitor_count, this_thrd->monitors.size );
+                }
+
+                for(int i = 0; i < this.monitor_count; i++) {
+                        if ( this.monitors[i] != this_thrd->monitors.list[i] ) {
+                                abortf( "Signal on condition %p made with different monitor, expected %p got %i", &this, this.monitors[i], this_thrd->monitors.list[i] );
                         }
                 }
         );
 
-        unsigned short count = this->monitor_count;
+        __lock_size_t count = this.monitor_count;
 
         // Lock all monitors
-        lock_all( this->monitors, NULL, count );
+        lock_all( this.monitors, NULL, count );
 
         //Pop the head of the waiting queue
-        __condition_node_t * node = pop_head( &this->blocked );
+        __condition_node_t * node = pop_head( this.blocked );
 
         //Add the thread to the proper AS stack
@@ -338 +449 @@
                 __condition_criterion_t * crit = &node->criteria[i];
                 assert( !crit->ready );
-                push( &crit->target->signal_stack, crit );
+                push( crit->target->signal_stack, crit );
         }
 
         //Release
-        unlock_all( this->monitors, count );
+        unlock_all( this.monitors, count );
 
         return true;
 }
 
-bool signal_block( condition * this ) {
-        if( !this->blocked.head ) { return false; }
+bool signal_block( condition & this ) {
+        if( !this.blocked.head ) { return false; }
 
         //Check that everything is as expected
-        verifyf( this->monitors != NULL, "Waiting with no monitors (%p)", this->monitors );
-        verifyf( this->monitor_count != 0, "Waiting with 0 monitors (%i)", this->monitor_count );
+        verifyf( this.monitors != NULL, "Waiting with no monitors (%p)", this.monitors );
+        verifyf( this.monitor_count != 0, "Waiting with 0 monitors (%"PRIiFAST16")", this.monitor_count );
 
         // Create storage for monitor context
-        monitor_ctx( this->monitors, this->monitor_count );
+        monitor_ctx( this.monitors, this.monitor_count );
 
         // Lock all monitors (aggregates the locks them as well)
@@ -364 +475 @@
 
         //save contexts
-        save_recursion( monitors, recursions, count );
+        monitor_save;
 
         //Find the thread to run
-        thread_desc * signallee = pop_head( &this->blocked )->waiting_thread;
-        for(int i = 0; i < count; i++) {
-                set_owner( monitors[i], signallee );
-        }
+        thread_desc * signallee = pop_head( this.blocked )->waiting_thread;
+        set_owner( monitors, count, signallee );
+
+        LIB_DEBUG_PRINT_BUFFER_DECL( "Kernel : signal_block condition %p (s: %p)\n", &this, signallee );
 
         //Everything is ready to go to sleep
@@ -379 +490 @@
 
 
-        //We are back, restore the owners and recursions
-        lock_all( locks, count );
-        restore_recursion( monitors, recursions, count );
-        unlock_all( locks, count );
+        LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel :   signal_block returned\n" );
+
+        //We are back, restore the masks and recursions
+        monitor_restore;
 
         return true;
@@ -388 +499 @@
 
 // Access the user_info of the thread waiting at the front of the queue
-uintptr_t front( condition * this ) {
+uintptr_t front( condition & this ) {
         verifyf( !is_empty(this),
                 "Attempt to access user data on an empty condition.\n"
                 "Possible cause is not checking if the condition is empty before reading stored data."
         );
-        return this->blocked.head->user_info;
+        return this.blocked.head->user_info;
 }
 
 //-----------------------------------------------------------------------------
-// Internal scheduling
-int __accept_internal( unsigned short acc_count, __acceptable_t * acceptables ) {
-        thread_desc * thrd = this_thread;
+// External scheduling
+// cases to handle :
+//      - target already there :
+//              block and wake
+//      - dtor already there
+//              put thread on signaller stack
+//      - non-blocking
+//              return else
+//      - timeout
+//              return timeout
+//      - block
+//              setup mask
+//              block
+void __waitfor_internal( const __waitfor_mask_t & mask, int duration ) {
+        // This statment doesn't have a contiguous list of monitors...
+        // Create one!
+        __lock_size_t max = count_max( mask );
+        monitor_desc * mon_storage[max];
+        __builtin_memset( mon_storage, 0, sizeof( mon_storage ) );
+        __lock_size_t actual_count = aggregate( mon_storage, mask );
+
+        LIB_DEBUG_PRINT_BUFFER_DECL( "Kernel : waitfor %d (s: %d, m: %d)\n", actual_count, mask.size, (__lock_size_t)max);
+
+        if(actual_count == 0) return;
+
+        LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : waitfor internal proceeding\n");
 
         // Create storage for monitor context
-        monitor_ctx( acceptables->monitors, acceptables->count );
-
-        // Lock all monitors (aggregates the lock them as well)
+        monitor_ctx( mon_storage, actual_count );
+
+        // Lock all monitors (aggregates the locks as well)
         lock_all( monitors, locks, count );
 
+        {
+                // Check if the entry queue
+                thread_desc * next; int index;
+                [next, index] = search_entry_queue( mask, monitors, count );
+
+                if( next ) {
+                        *mask.accepted = index;
+                        if( mask.clauses[index].is_dtor ) {
+                                LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : dtor already there\n");
+                                verifyf( mask.clauses[index].size == 1        , "ERROR: Accepted dtor has more than 1 mutex parameter." );
+
+                                monitor_desc * mon2dtor = mask.clauses[index].list[0];
+                                verifyf( mon2dtor->dtor_node, "ERROR: Accepted monitor has no dtor_node." );
+
+                                __condition_criterion_t * dtor_crit = mon2dtor->dtor_node->criteria;
+                                push( mon2dtor->signal_stack, dtor_crit );
+
+                                unlock_all( locks, count );
+                        }
+                        else {
+                                LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : thread present, baton-passing\n");
+
+                                // Create the node specific to this wait operation
+                                wait_ctx_primed( this_thread, 0 );
+
+                                // Save monitor states
+                                monitor_save;
+
+                                LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel :  baton of %d monitors : ", count );
+                                #ifdef __CFA_DEBUG_PRINT__
+                                        for( int i = 0; i < count; i++) {
+                                                LIB_DEBUG_PRINT_BUFFER_LOCAL( "%p %p ", monitors[i], monitors[i]->signal_stack.top );
+                                        }
+                                #endif
+                                LIB_DEBUG_PRINT_BUFFER_LOCAL( "\n");
+
+                                // Set the owners to be the next thread
+                                set_owner( monitors, count, next );
+
+                                // Everything is ready to go to sleep
+                                BlockInternal( locks, count, &next, 1 );
+
+                                // We are back, restore the owners and recursions
+                                monitor_restore;
+
+                                LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : thread present, returned\n");
+                        }
+
+                        LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : accepted %d\n", *mask.accepted);
+
+                        return;
+                }
+        }
+
+
+        if( duration == 0 ) {
+                LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : non-blocking, exiting\n");
+
+                unlock_all( locks, count );
+
+                LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : accepted %d\n", *mask.accepted);
+                return;
+        }
+
+
+        verifyf( duration < 0, "Timeout on waitfor statments not supported yet.");
+
+        LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : blocking waitfor\n");
+
         // Create the node specific to this wait operation
-        wait_ctx_primed( thrd, 0 );
-
-        // Check if the entry queue
-        thread_desc * next = search_entry_queue( acceptables, acc_count, monitors, count );
-
-        LIB_DEBUG_PRINT_SAFE("Owner(s) :");
-        for(int i = 0; i < count; i++) {
-                LIB_DEBUG_PRINT_SAFE(" %p", monitors[i]->owner );
-        }
-        LIB_DEBUG_PRINT_SAFE("\n");
-
-        LIB_DEBUG_PRINT_SAFE("Passing mon to %p\n", next);
-
-        if( !next ) {
-                // Update acceptables on the current monitors
-                for(int i = 0; i < count; i++) {
-                        monitors[i]->acceptables = acceptables;
-                        monitors[i]->acceptable_count = acc_count;
-                }
-        }
-        else {
-                for(int i = 0; i < count; i++) {
-                        set_owner( monitors[i], next );
-                }
-        }
-
-
-        save_recursion( monitors, recursions, count );
-
-
-        // Everything is ready to go to sleep
-        BlockInternal( locks, count, &next, next ? 1 : 0 );
-
-
-        //WE WOKE UP
-
-
-        //We are back, restore the owners and recursions
-        lock_all( locks, count );
-        restore_recursion( monitors, recursions, count );
-        int acc_idx = monitors[0]->accepted_index;
-        unlock_all( locks, count );
-
-        return acc_idx;
+        wait_ctx_primed( this_thread, 0 );
+
+        monitor_save;
+        set_mask( monitors, count, mask );
+
+        for( __lock_size_t i = 0; i < count; i++) {
+                verify( monitors[i]->owner == this_thread );
+        }
+
+        //Everything is ready to go to sleep
+        BlockInternal( locks, count );
+
+
+        // WE WOKE UP
+
+
+        //We are back, restore the masks and recursions
+        monitor_restore;
+
+        LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : exiting\n");
+
+        LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : accepted %d\n", *mask.accepted);
 }
 
@@ -458 +639 @@
 
 static inline void set_owner( monitor_desc * this, thread_desc * owner ) {
+        // LIB_DEBUG_PRINT_SAFE("Kernal :   Setting owner of %p to %p ( was %p)\n", this, owner, this->owner );
+
         //Pass the monitor appropriately
         this->owner = owner;
@@ -465 +648 @@
 }
 
+static inline void set_owner( monitor_desc * monitors [], __lock_size_t count, thread_desc * owner ) {
+        monitors[0]->owner     = owner;
+        monitors[0]->recursion = 1;
+        for( __lock_size_t i = 1; i < count; i++ ) {
+                monitors[i]->owner     = owner;
+                monitors[i]->recursion = 0;
+        }
+}
+
+static inline void set_mask( monitor_desc * storage [], __lock_size_t count, const __waitfor_mask_t & mask ) {
+        for( __lock_size_t i = 0; i < count; i++) {
+                storage[i]->mask = mask;
+        }
+}
+
+static inline void reset_mask( monitor_desc * this ) {
+        this->mask.accepted = NULL;
+        this->mask.clauses = NULL;
+        this->mask.size = 0;
+}
+
 static inline thread_desc * next_thread( monitor_desc * this ) {
         //Check the signaller stack
-        __condition_criterion_t * urgent = pop( &this->signal_stack );
+        LIB_DEBUG_PRINT_SAFE("Kernel :  mon %p AS-stack top %p\n", this, this->signal_stack.top);
+        __condition_criterion_t * urgent = pop( this->signal_stack );
         if( urgent ) {
                 //The signaller stack is not empty,
@@ -479 +684 @@
         // No signaller thread
         // Get the next thread in the entry_queue
-        thread_desc * new_owner = pop_head( &this->entry_queue );
+        thread_desc * new_owner = pop_head( this->entry_queue );
         set_owner( this, new_owner );
 
@@ -485 +690 @@
 }
 
-static inline int is_accepted( thread_desc * owner, monitor_desc * this, monitor_desc ** group, int group_cnt, void (*func)() ) {
-        __acceptable_t* accs = this->acceptables; // Optim
-        int acc_cnt = this->acceptable_count;
+static inline bool is_accepted( monitor_desc * this, const __monitor_group_t & group ) {
+        __acceptable_t * it = this->mask.clauses; // Optim
+        __lock_size_t count = this->mask.size;
 
         // Check if there are any acceptable functions
-        if( !accs ) return -1;
+        if( !it ) return false;
 
         // If this isn't the first monitor to test this, there is no reason to repeat the test.
-        if( this != group[0] ) return group[0]->accepted_index;
+        if( this != group[0] ) return group[0]->mask.accepted >= 0;
 
         // For all acceptable functions check if this is the current function.
-        OUT_LOOP:
-        for( int i = 0; i < acc_cnt; i++ ) {
-                __acceptable_t * acc = &accs[i];
-
-                // if function matches, check the monitors
-                if( acc->func == func ) {
-
-                        // If the group count is different then it can't be a match
-                        if( acc->count != group_cnt ) return -1;
-
-                        // Check that all the monitors match
-                        for( int j = 0; j < group_cnt; j++ ) {
-                                // If not a match, check next function
-                                if( acc->monitors[j] != group[j] ) continue OUT_LOOP;
-                        }
-
-                        // It's a complete match, accept the call
-                        return i;
+        for( __lock_size_t i = 0; i < count; i++, it++ ) {
+                if( *it == group ) {
+                        *this->mask.accepted = i;
+                        return true;
                 }
         }
 
         // No function matched
-        return -1;
-}
-
-static inline void init( int count, monitor_desc ** monitors, __condition_node_t * waiter, __condition_criterion_t * criteria ) {
-        for(int i = 0; i < count; i++) {
+        return false;
+}
+
+static inline void init( __lock_size_t count, monitor_desc * monitors [], __condition_node_t & waiter, __condition_criterion_t criteria [] ) {
+        for( __lock_size_t i = 0; i < count; i++) {
                 (criteria[i]){ monitors[i], waiter };
         }
 
-        waiter->criteria = criteria;
-}
-
-static inline void init_push( int count, monitor_desc ** monitors, __condition_node_t * waiter, __condition_criterion_t * criteria ) {
-        for(int i = 0; i < count; i++) {
+        waiter.criteria = criteria;
+}
+
+static inline void init_push( __lock_size_t count, monitor_desc * monitors [], __condition_node_t & waiter, __condition_criterion_t criteria [] ) {
+        for( __lock_size_t i = 0; i < count; i++) {
                 (criteria[i]){ monitors[i], waiter };
-                push( &criteria[i].target->signal_stack, &criteria[i] );
-        }
-
-        waiter->criteria = criteria;
-}
-
-static inline void lock_all( spinlock ** locks, unsigned short count ) {
-        for( int i = 0; i < count; i++ ) {
+                LIB_DEBUG_PRINT_SAFE( "Kernel :  target %p = %p\n", criteria[i].target, &criteria[i] );
+                push( criteria[i].target->signal_stack, &criteria[i] );
+        }
+
+        waiter.criteria = criteria;
+}
+
+static inline void lock_all( spinlock * locks [], __lock_size_t count ) {
+        for( __lock_size_t i = 0; i < count; i++ ) {
                 lock_yield( locks[i] DEBUG_CTX2 );
         }
 }
 
-static inline void lock_all( monitor_desc ** source, spinlock ** /*out*/ locks, unsigned short count ) {
-        for( int i = 0; i < count; i++ ) {
+static inline void lock_all( monitor_desc * source [], spinlock * /*out*/ locks [], __lock_size_t count ) {
+        for( __lock_size_t i = 0; i < count; i++ ) {
                 spinlock * l = &source[i]->lock;
                 lock_yield( l DEBUG_CTX2 );
@@ -552 +744 @@
 }
 
-static inline void unlock_all( spinlock ** locks, unsigned short count ) {
-        for( int i = 0; i < count; i++ ) {
+static inline void unlock_all( spinlock * locks [], __lock_size_t count ) {
+        for( __lock_size_t i = 0; i < count; i++ ) {
                 unlock( locks[i] );
         }
 }
 
-static inline void unlock_all( monitor_desc ** locks, unsigned short count ) {
-        for( int i = 0; i < count; i++ ) {
+static inline void unlock_all( monitor_desc * locks [], __lock_size_t count ) {
+        for( __lock_size_t i = 0; i < count; i++ ) {
                 unlock( &locks[i]->lock );
         }
 }
 
-
-static inline void save_recursion   ( monitor_desc ** ctx, unsigned int * /*out*/ recursions, unsigned short count ) {
-        for( int i = 0; i < count; i++ ) {
+static inline void save(
+        monitor_desc * ctx [],
+        __lock_size_t count,
+        __attribute((unused)) spinlock * locks [],
+        unsigned int /*out*/ recursions [],
+        __waitfor_mask_t /*out*/ masks []
+) {
+        for( __lock_size_t i = 0; i < count; i++ ) {
                 recursions[i] = ctx[i]->recursion;
-        }
-}
-
-static inline void restore_recursion( monitor_desc ** ctx, unsigned int * /*in */ recursions, unsigned short count ) {
-        for( int i = 0; i < count; i++ ) {
+                masks[i]      = ctx[i]->mask;
+        }
+}
+
+static inline void restore(
+        monitor_desc * ctx [],
+        __lock_size_t count,
+        spinlock * locks [],
+        unsigned int /*out*/ recursions [],
+        __waitfor_mask_t /*out*/ masks []
+) {
+        lock_all( locks, count );
+        for( __lock_size_t i = 0; i < count; i++ ) {
                 ctx[i]->recursion = recursions[i];
-        }
+                ctx[i]->mask      = masks[i];
+        }
+        unlock_all( locks, count );
 }
 
@@ -599 +806 @@
         }
 
-        // LIB_DEBUG_PRINT_SAFE( "Runing %i\n", ready2run );
+        LIB_DEBUG_PRINT_SAFE( "Kernel :  Runing %i (%p)\n", ready2run, ready2run ? node->waiting_thread : NULL );
         return ready2run ? node->waiting_thread : NULL;
 }
 
-static inline void brand_condition( condition * this ) {
+static inline void brand_condition( condition & this ) {
         thread_desc * thrd = this_thread;
-        if( !this->monitors ) {
+        if( !this.monitors ) {
                 // LIB_DEBUG_PRINT_SAFE("Branding\n");
-                assertf( thrd->current_monitors != NULL, "No current monitor to brand condition %p", thrd->current_monitors );
-                this->monitor_count = thrd->current_monitor_count;
-
-                this->monitors = malloc( this->monitor_count * sizeof( *this->monitors ) );
-                for( int i = 0; i < this->monitor_count; i++ ) {
-                        this->monitors[i] = thrd->current_monitors[i];
-                }
-        }
-}
-
-static inline unsigned short insert_unique( thread_desc ** thrds, unsigned short end, thread_desc * val ) {
-        if( !val ) return end;
-
-        for(int i = 0; i <= end; i++) {
-                if( thrds[i] == val ) return end;
-        }
-
-        thrds[end] = val;
-        return end + 1;
-}
-
-
-static inline bool match( __acceptable_t * acc, thread_desc * thrd ) {
-        verify( thrd );
-        verify( acc );
-        if( acc->func != thrd->current_monitor_func ) return false;
-
-        return true;
-}
-
-static inline thread_desc * search_entry_queue( __acceptable_t * acceptables, int acc_count, monitor_desc ** monitors, int count ) {
-
-        __thread_queue_t * entry_queue = &monitors[0]->entry_queue;
+                assertf( thrd->monitors.list != NULL, "No current monitor to brand condition %p", thrd->monitors.list );
+                this.monitor_count = thrd->monitors.size;
+
+                this.monitors = malloc( this.monitor_count * sizeof( *this.monitors ) );
+                for( int i = 0; i < this.monitor_count; i++ ) {
+                        this.monitors[i] = thrd->monitors.list[i];
+                }
+        }
+}
+
+static inline [thread_desc *, int] search_entry_queue( const __waitfor_mask_t & mask, monitor_desc * monitors [], __lock_size_t count ) {
+
+        __thread_queue_t & entry_queue = monitors[0]->entry_queue;
 
         // For each thread in the entry-queue
-        for(    thread_desc ** thrd_it = &entry_queue->head;
+        for(    thread_desc ** thrd_it = &entry_queue.head;
                 *thrd_it;
-                thrd_it = &(*thrd_it)->next)
-        {
+                thrd_it = &(*thrd_it)->next
+        ) {
                 // For each acceptable check if it matches
-                __acceptable_t * acc_end = acceptables + acc_count;
-                for( __acceptable_t * acc_it = acceptables; acc_it != acc_end; acc_it++ ) {
+                int i = 0;
+                __acceptable_t * end = mask.clauses + mask.size;
+                for( __acceptable_t * it = mask.clauses; it != end; it++, i++ ) {
                         // Check if we have a match
-                        if( match( acc_it, *thrd_it ) ) {
+                        if( *it == (*thrd_it)->monitors ) {
 
                                 // If we have a match return it
                                 // after removeing it from the entry queue
-                                return remove( entry_queue, thrd_it );
+                                return [remove( entry_queue, thrd_it ), i];
                         }
                 }
         }
 
-        return NULL;
-}
+        return [0, -1];
+}
+
+forall(dtype T | sized( T ))
+static inline __lock_size_t insert_unique( T * array [], __lock_size_t & size, T * val ) {
+        if( !val ) return size;
+
+        for( __lock_size_t i = 0; i <= size; i++) {
+                if( array[i] == val ) return size;
+        }
+
+        array[size] = val;
+        size = size + 1;
+        return size;
+}
+
+static inline __lock_size_t count_max( const __waitfor_mask_t & mask ) {
+        __lock_size_t max = 0;
+        for( __lock_size_t i = 0; i < mask.size; i++ ) {
+                max += mask.clauses[i].size;
+        }
+        return max;
+}
+
+static inline __lock_size_t aggregate( monitor_desc * storage [], const __waitfor_mask_t & mask ) {
+        __lock_size_t size = 0;
+        for( __lock_size_t i = 0; i < mask.size; i++ ) {
+                __libcfa_small_sort( mask.clauses[i].list, mask.clauses[i].size );
+                for( __lock_size_t j = 0; j < mask.clauses[i].size; j++) {
+                        insert_unique( storage, size, mask.clauses[i].list[j] );
+                }
+        }
+        // TODO insertion sort instead of this
+        __libcfa_small_sort( storage, size );
+        return size;
+}
+
 void ?{}( __condition_blocked_queue_t & this ) {
         this.head = NULL;
@@ -666 +889 @@
 }
 
-void append( __condition_blocked_queue_t * this, __condition_node_t * c ) {
-        verify(this->tail != NULL);
-        *this->tail = c;
-        this->tail = &c->next;
-}
-
-__condition_node_t * pop_head( __condition_blocked_queue_t * this ) {
-        __condition_node_t * head = this->head;
+void append( __condition_blocked_queue_t & this, __condition_node_t * c ) {
+        verify(this.tail != NULL);
+        *this.tail = c;
+        this.tail = &c->next;
+}
+
+__condition_node_t * pop_head( __condition_blocked_queue_t & this ) {
+        __condition_node_t * head = this.head;
         if( head ) {
-                this->head = head->next;
+                this.head = head->next;
                 if( !head->next ) {
-                        this->tail = &this->head;
+                        this.tail = &this.head;
                 }
                 head->next = NULL;

src/libcfa/concurrency/preemption.c

@@ -328 +328 @@
                 siginfo_t info;
                 int sig = sigwaitinfo( &mask, &info );
+
+                if( sig < 0 ) {
+                        //Error!
+                        int err = errno;
+                        switch( err ) {
+                                case EAGAIN :
+                                case EINTR :
+                                        continue;
+                        case EINVAL :
+                                        abortf("Timeout was invalid.");
+                                default:
+                                        abortf("Unhandled error %d", err);
+                        }
+                }
 
                 // If another signal arrived something went wrong
@@ -366 +380 @@
 
         if ( sigaction( sig, &act, NULL ) == -1 ) {
-                LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO,
+                LIB_DEBUG_PRINT_BUFFER_DECL(
                         " __kernel_sigaction( sig:%d, handler:%p, flags:%d ), problem installing signal handler, error(%d) %s.\n",
                         sig, handler, flags, errno, strerror( errno )
@@ -383 +397 @@
 
         if ( sigaction( sig, &act, NULL ) == -1 ) {
-                LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO,
+                LIB_DEBUG_PRINT_BUFFER_DECL(
                         " __kernel_sigdefault( sig:%d ), problem reseting signal handler, error(%d) %s.\n",
                         sig, errno, strerror( errno )

src/libcfa/concurrency/thread

@@ -36 +36 @@
 forall( dtype T | is_thread(T) )
 static inline coroutine_desc* get_coroutine(T & this) {
-        return &get_thread(this)->cor;
+        return &get_thread(this)->self_cor;
 }
 
 forall( dtype T | is_thread(T) )
 static inline monitor_desc* get_monitor(T & this) {
-        return &get_thread(this)->mon;
+        return &get_thread(this)->self_mon;
 }
 
 static inline coroutine_desc* get_coroutine(thread_desc * this) {
-        return &this->cor;
+        return &this->self_cor;
 }
 
 static inline monitor_desc* get_monitor(thread_desc * this) {
-        return &this->mon;
+        return &this->self_mon;
 }
 

src/libcfa/concurrency/thread.c

@@ -33 +33 @@
 
 void ?{}(thread_desc& this) {
-        (this.cor){};
-        this.cor.name = "Anonymous Coroutine";
-        this.mon.owner = &this;
-        this.mon.recursion = 1;
+        (this.self_cor){};
+        this.self_cor.name = "Anonymous Coroutine";
+        this.self_mon.owner = &this;
+        this.self_mon.recursion = 1;
+        this.self_mon_p = &this.self_mon;
         this.next = NULL;
 
-        this.current_monitors      = &this.mon;
-        this.current_monitor_count = 1;
+        (this.monitors){ &this.self_mon_p, 1, (fptr_t)0 };
 }
 
 void ^?{}(thread_desc& this) {
-        ^(this.cor){};
+        ^(this.self_cor){};
 }