Changeset 41b8ea4 for libcfa/src/bits

Timestamp:

Oct 7, 2020, 5:10:45 PM (5 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

490fb92e, 69c5c00

Parents:

2fb35df (diff), 848439f (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

Location:

libcfa/src/bits

Files:

• containers.hfa (modified) (1 diff)
• locks.hfa (modified) (5 diffs)

libcfa/src/bits/containers.hfa

@@ -157 +157 @@
                         tail = &get_next( *val );
                         *tail = 1p;
+                }
+
+                T * peek( __queue(T) & this ) {
+                        verify(*this.tail == 1p);
+                        T * head = this.head;
+                        if( head != 1p ) {
+                                verify(*this.tail == 1p);
+                                return head;
+                        }
+                        verify(*this.tail == 1p);
+                        return 0p;
                 }
 

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;
                 }