Changeset 6ae8c92 for src/libcfa/concurrency/invoke.h

Timestamp:

Sep 20, 2017, 4:50:52 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

a2dbad10

Parents:

0895cba

Message:

Changed lib-side waitfor to use a mask type instead of a pointer and an int. The accepted index is now in the mask type, everything else points to it

File:

• src/libcfa/concurrency/invoke.h (modified) (4 diffs)

src/libcfa/concurrency/invoke.h

@@ -84 +84 @@
       };
 
+      struct __waitfor_mask_t {
+            short * accepted;                         // the index of the accepted function, -1 if none
+            struct __acceptable_t * clauses;          // list of acceptable functions, null if any
+            short size;                               // number of acceptable functions
+      };
+
       struct monitor_desc {
             struct spinlock lock;                     // spinlock to protect internal data
@@ -90 +96 @@
             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 __waitfor_mask_t mask;               // mask used to know if some thread is waiting for something while holding the monitor
       };
 
-      struct __monitor_group {
+      struct __monitor_group_t {
             struct monitor_desc ** list;              // currently held monitors
             short                  size;              // number of currently held monitors
@@ -107 +110 @@
             struct monitor_desc    self_mon;          // monitor body used for mutual exclusion
             struct monitor_desc *  self_mon_p;        // pointer to monitor with sufficient lifetime for current monitors
-            struct __monitor_group monitors;          // monitors currently held by this thread
+            struct __monitor_group_t monitors;          // monitors currently held by this thread
 
             // Link lists fields
@@ -117 +120 @@
      #ifdef __CFORALL__
      extern "Cforall" {
-            static inline monitor_desc * ?[?]( const __monitor_group & this, ptrdiff_t index ) {
+            static inline monitor_desc * ?[?]( const __monitor_group_t & this, ptrdiff_t index ) {
                   return this.list[index];
             }
 
-            static inline bool ?==?( const __monitor_group & lhs, const __monitor_group & rhs ) {
+            static inline bool ?==?( const __monitor_group_t & lhs, const __monitor_group_t & rhs ) {
                   if( lhs.size != rhs.size ) return false;
                   if( lhs.func != rhs.func ) return false;