Changes in src/libcfa/concurrency/monitor [59a0bde:9f5ecf5]

File:

• src/libcfa/concurrency/monitor (modified) (6 diffs)

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 Oct  7 18:06:45 2017
-// Update Count     : 10
+// Last Modified On : Sat Jul 22 09:59:01 2017
+// Update Count     : 3
 //
 
@@ -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.owner         = NULL;
-        this.recursion     = 0;
-        this.mask.accepted = NULL;
-        this.mask.clauses  = NULL;
-        this.mask.size     = 0;
-        this.dtor_node     = NULL;
+        this.recursion = 0;
+        this.acceptables = NULL;
+        this.acceptable_count = 0;
+        this.accepted_index = -1;
 }
 
 struct monitor_guard_t {
         monitor_desc ** m;
-        __lock_size_t   count;
+        int count;
         monitor_desc ** prev_mntrs;
-        __lock_size_t   prev_count;
+        unsigned short  prev_count;
         fptr_t          prev_func;
 };
 
-void ?{}( monitor_guard_t & this, monitor_desc ** m, __lock_size_t count, void (*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, int 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 );
-}
 
 //-----------------------------------------------------------------------------
@@ -70 +52 @@
 
 struct __condition_criterion_t {
-        // 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;
+        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
 };
 
 struct __condition_node_t {
-        // 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;
+        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
 };
 
@@ -105 +71 @@
 };
 
-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 {
-        // 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;
+        __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
 };
 
@@ -133 +90 @@
 }
 
-              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 );
 
 //-----------------------------------------------------------------------------
@@ -143 +100 @@
 
 struct __acceptable_t {
-        __monitor_group_t;
+        fptr_t func;
+        unsigned short count;
+        monitor_desc ** monitors;
         bool is_dtor;
 };
 
-void __waitfor_internal( const __waitfor_mask_t & mask, int duration );
+int __accept_internal( unsigned short count, __acceptable_t * acceptables );
 
 // Local Variables: //