Changeset c76bd34 for libcfa/src/bits/locks.hfa

Timestamp:

Oct 7, 2020, 4:31:43 PM (5 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

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

Children:

848439f

Parents:

ae2c27a (diff), 597c5d18 (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 into master

File:

• libcfa/src/bits/locks.hfa (modified) (6 diffs)

libcfa/src/bits/locks.hfa

@@ -164 +164 @@
 
         struct $thread;
-        extern void park( __cfaabi_dbg_ctx_param );
-        extern void unpark( struct $thread * this __cfaabi_dbg_ctx_param2 );
+        extern void park( void );
+        extern void unpark( struct $thread * this );
         static inline struct $thread * active_thread ();
 
@@ -191 +191 @@
                                         /* paranoid */ verify( expected == 0p );
                                         if(__atomic_compare_exchange_n(&this.ptr, &expected, active_thread(), false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
-                                                park( __cfaabi_dbg_ctx );
+                                                park();
                                                 return true;
                                         }
@@ -210 +210 @@
                                 else {
                                         if(__atomic_compare_exchange_n(&this.ptr, &expected, 0p, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
-                                                unpark( expected __cfaabi_dbg_ctx2 );
+                                                unpark( expected );
                                                 return true;
                                         }
@@ -244 +244 @@
                                 /* paranoid */ verify( expected == 0p );
                                 if(__atomic_compare_exchange_n(&this.ptr, &expected, active_thread(), false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
-                                        park( __cfaabi_dbg_ctx );
+                                        park();
                                         /* paranoid */ verify( this.ptr == 1p );
                                         return true;
@@ -256 +256 @@
                         struct $thread * got = __atomic_exchange_n( &this.ptr, 1p, __ATOMIC_SEQ_CST);
                         if( got == 0p ) return false;
-                        unpark( got __cfaabi_dbg_ctx2 );
+                        unpark( got );
                         return true;
                 }
@@ -357 +357 @@
                                 struct oneshot * expected = this.ptr;
                                 // was this abandoned?
-                                if( expected == 3p ) { free( &this ); return false; }
+                                #if defined(__GNUC__) && __GNUC__ >= 7
+                                        #pragma GCC diagnostic push
+                                        #pragma GCC diagnostic ignored "-Wfree-nonheap-object"
+                                #endif
+                                        if( expected == 3p ) { free( &this ); return false; }
+                                #if defined(__GNUC__) && __GNUC__ >= 7
+                                        #pragma GCC diagnostic pop
+                                #endif
 
                                 /* paranoid */ verify( expected != 1p ); // Future is already fulfilled, should not happen