Changeset 4ee36bf0 for src/libcfa/concurrency/monitor

Timestamp:

Nov 8, 2017, 2:50:35 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

049ead9

Parents:

136ccd7 (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' into cleanup-dtors

File:

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

src/libcfa/concurrency/monitor

@@ -39 +39 @@
 }
 
-// static inline int ?<?(monitor_desc* lhs, monitor_desc* rhs) {
-//      return ((intptr_t)lhs) < ((intptr_t)rhs);
-// }
-
 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;
 };
 
-void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, void (*func)() );
+void ?{}( monitor_guard_t & this, monitor_desc ** m, __lock_size_t count, void (*func)() );
 void ^?{}( monitor_guard_t & this );
 
@@ -57 +53 @@
         monitor_desc * m;
         monitor_desc ** prev_mntrs;
-        unsigned short  prev_count;
+        __lock_size_t   prev_count;
         fptr_t          prev_func;
 };
@@ -74 +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;
 };
 
@@ -93 +105 @@
 };
 
-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 );
 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;
 };
 
@@ -116 +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 );
 
 //-----------------------------------------------------------------------------