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

Timestamp:

Nov 28, 2017, 3:52:06 PM (6 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:

383e159, 8d5b9cf

Parents:

cf966b5 (diff), 8a0a64d9 (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

File:

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

src/libcfa/concurrency/invoke.h

@@ -14 +14 @@
 //
 
+#include "bits/containers.h"
 #include "bits/defs.h"
 #include "bits/locks.h"
 
-#ifdef __CFORALL__
+#ifdef __cforall
 extern "C" {
 #endif
@@ -25 +26 @@
 #define _INVOKE_H_
 
-        typedef void (*fptr_t)();
-        typedef int_fast16_t __lock_size_t;
-
-        struct __thread_queue_t {
-                struct thread_desc * head;
-                struct thread_desc ** tail;
-        };
-
-        struct __condition_stack_t {
-                struct __condition_criterion_t * top;
-        };
-
-        #ifdef __CFORALL__
+        #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 & );
+                static inline struct thread_desc             * & get_next( struct thread_desc             & this );
+                static inline struct __condition_criterion_t * & get_next( struct __condition_criterion_t & this );
         }
         #endif
@@ -100 +83 @@
 
                 // list of acceptable functions, null if any
-                struct __acceptable_t * clauses;
-
-                // number of acceptable functions
-                __lock_size_t size;
+                __small_array_t(struct __acceptable_t) __cfa_anonymous_object;
         };
 
@@ -114 +94 @@
 
                 // queue of threads that are blocked waiting for the monitor
-                struct __thread_queue_t entry_queue;
+                __queue_t(struct thread_desc) entry_queue;
 
                 // stack of conditions to run next once we exit the monitor
-                struct __condition_stack_t signal_stack;
+                __stack_t(struct __condition_criterion_t) signal_stack;
 
                 // monitor routines can be called recursively, we need to keep track of that
@@ -131 +111 @@
         struct __monitor_group_t {
                 // currently held monitors
-                struct monitor_desc ** list;
-
-                // number of currently held monitors
-                __lock_size_t size;
+                __small_array_t(monitor_desc*) __cfa_anonymous_object;
 
                 // last function that acquired monitors
@@ -159 +136 @@
      };
 
-     #ifdef __CFORALL__
+     #ifdef __cforall
      extern "Cforall" {
-                static inline monitor_desc * ?[?]( const __monitor_group_t & this, ptrdiff_t index ) {
-                        return this.list[index];
+                static inline thread_desc * & get_next( thread_desc & this ) {
+                        return this.next;
+                }
+
+                static inline struct __condition_criterion_t * & get_next( struct __condition_criterion_t & this );
+
+                static inline void ?{}(__monitor_group_t & this) {
+                        (this.data){NULL};
+                        (this.size){0};
+                        (this.func){NULL};
+                }
+
+                static inline void ?{}(__monitor_group_t & this, struct monitor_desc ** data, __lock_size_t size, fptr_t func) {
+                        (this.data){data};
+                        (this.size){size};
+                        (this.func){func};
                 }
 
                 static inline bool ?==?( const __monitor_group_t & lhs, const __monitor_group_t & rhs ) {
-                        if( (lhs.list != 0) != (rhs.list != 0) ) return false;
+                        if( (lhs.data != 0) != (rhs.data != 0) ) return false;
                         if( lhs.size != rhs.size ) return false;
                         if( lhs.func != rhs.func ) return false;
@@ -177 +168 @@
 
                         return true;
+                }
+
+                static inline void ?=?(__monitor_group_t & lhs, const __monitor_group_t & rhs) {
+                        lhs.data = rhs.data;
+                        lhs.size = rhs.size;
+                        lhs.func = rhs.func;
                 }
         }
@@ -210 +207 @@
 #endif //_INVOKE_PRIVATE_H_
 #endif //! defined(__CFA_INVOKE_PRIVATE__)
-#ifdef __CFORALL__
+#ifdef __cforall
 }
 #endif