Changeset 04e6f93 for libcfa/src/bits

Timestamp:

Feb 27, 2020, 4:04:25 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a037f85

Parents:

41efd33 (diff), 930b504 (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

Location:

libcfa/src/bits

Files:

• containers.hfa (modified) (2 diffs)
• locks.hfa (modified) (4 diffs)

libcfa/src/bits/containers.hfa

@@ -146 +146 @@
         static inline forall( dtype T | is_node(T) ) {
                 void ?{}( __queue(T) & this ) with( this ) {
-                        head{ 0p };
+                        head{ 1p };
                         tail{ &head };
+                        verify(*tail == 1p);
                 }
 
                 void append( __queue(T) & this, T * val ) with( this ) {
                         verify(tail != 0p);
+                        verify(*tail == 1p);
                         *tail = val;
                         tail = &get_next( *val );
+                        *tail = 1p;
                 }
 
                 T * pop_head( __queue(T) & this ) {
+                        verify(*this.tail == 1p);
                         T * head = this.head;
-                        if( head ) {
+                        if( head != 1p ) {
                                 this.head = get_next( *head );
-                                if( !get_next( *head ) ) {
+                                if( get_next( *head ) == 1p ) {
                                         this.tail = &this.head;
                                 }
                                 get_next( *head ) = 0p;
-                        }
-                        return head;
+                                verify(*this.tail == 1p);
+                                return head;
+                        }
+                        verify(*this.tail == 1p);
+                        return 0p;
                 }
 
@@ -180 +187 @@
                         get_next( *val ) = 0p;
 
-                        verify( (head == 0p) == (&head == tail) );
-                        verify( *tail == 0p );
+                        verify( (head == 1p) == (&head == tail) );
+                        verify( *tail == 1p );
                         return val;
                 }

libcfa/src/bits/locks.hfa

@@ -60 +60 @@
         }
 
-        extern void yield( unsigned int );
-
         static inline void ?{}( __spinlock_t & this ) {
                 this.lock = 0;
@@ -68 +66 @@
         // Lock the spinlock, return false if already acquired
         static inline bool try_lock  ( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
+                disable_interrupts();
                 bool result = (this.lock == 0) && (__atomic_test_and_set( &this.lock, __ATOMIC_ACQUIRE ) == 0);
                 if( result ) {
-                        disable_interrupts();
                         __cfaabi_dbg_record( this, caller );
+                } else {
+                        enable_interrupts_noPoll();
                 }
                 return result;
@@ -83 +83 @@
                 #endif
 
+                disable_interrupts();
                 for ( unsigned int i = 1;; i += 1 ) {
                         if ( (this.lock == 0) && (__atomic_test_and_set( &this.lock, __ATOMIC_ACQUIRE ) == 0) ) break;
@@ -98 +99 @@
                         #endif
                 }
-                disable_interrupts();
                 __cfaabi_dbg_record( this, caller );
         }
 
         static inline void unlock( __spinlock_t & this ) {
+                __atomic_clear( &this.lock, __ATOMIC_RELEASE );
                 enable_interrupts_noPoll();
-                __atomic_clear( &this.lock, __ATOMIC_RELEASE );
         }