Changeset f93c50a for libcfa/src/concurrency/kernel/fwd.hfa

Timestamp:

Sep 24, 2021, 6:13:46 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

166b384

Parents:

7e7a076 (diff), 9411cf0 (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:

fixed merge

File:

• libcfa/src/concurrency/kernel/fwd.hfa (modified) (1 diff)

libcfa/src/concurrency/kernel/fwd.hfa

@@ -119 +119 @@
 
         extern "Cforall" {
+                enum unpark_hint { UNPARK_LOCAL, UNPARK_REMOTE };
+
                 extern void park( void );
-                extern void unpark( struct thread$ * this );
+                extern void unpark( struct thread$ *, unpark_hint );
+                static inline void unpark( struct thread$ * thrd ) { unpark(thrd, UNPARK_LOCAL); }
                 static inline struct thread$ * active_thread () {
                         struct thread$ * t = publicTLS_get( this_thread );