Changeset c0d00b6 for src/libcfa/concurrency/invoke.h

Timestamp:

Nov 25, 2017, 3:22:18 PM (6 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:

c6e2c18

Parents:

9d06142 (diff), 3de176d (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/invoke.h (modified) (4 diffs)

src/libcfa/concurrency/invoke.h

@@ -14 +14 @@
 //
 
-#include <stdbool.h>
-#include <stdint.h>
+#include "bits/defs.h"
+#include "bits/locks.h"
 
 #ifdef __CFORALL__
@@ -25 +25 @@
 #define _INVOKE_H_
 
-        #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 {
@@ -58 +47 @@
                 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
@@ -122 +108 @@
         struct monitor_desc {
                 // spinlock to protect internal data
-                struct spinlock lock;
+                struct __spinlock_t lock;
 
                 // current owner of the monitor