Changeset 0f89d4f

Timestamp:

Jun 19, 2020, 5:30:16 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

b232745

Parents:

68f36f4

Message:

Modified StackLF to use `next instead of getNext

Location:

libcfa/src

Files:

• concurrency/kernel.hfa (modified) (1 diff)
• containers/stackLockFree.hfa (modified) (4 diffs)
• heap.cfa (modified) (3 diffs)

libcfa/src/concurrency/kernel.hfa

@@ -118 +118 @@
 static inline void  ?{}(processor & this, const char name[]) { this{name, *mainCluster }; }
 
-static inline Link(processor) * getNext( processor * this ) { return &this->link; }
+static inline Link(processor) * ?`next( processor * this ) { return &this->link; }
 
 //-----------------------------------------------------------------------------

libcfa/src/containers/stackLockFree.hfa

@@ -31 +31 @@
 }; // Link
 
-forall( otype T | { Link(T) * getNext( T * ); } ) {
+forall( otype T | { Link(T) * ?`next( T * ); } ) {
         struct StackLF {
                 Link(T) stack;
@@ -43 +43 @@
                 void push( StackLF(T) & this, T & n ) with(this) {
                         for () {                                                                        // busy wait
-                                *getNext( &n ) = stack;                                 // atomic assignment unnecessary, or use CAA
-                          if ( __atomic_compare_exchange_n( &stack.atom, &getNext( &n )->atom, (Link(T))@{ {&n, getNext( &n )->count + 1} }.atom, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST ) ) break; // attempt to update top node
+                                *( &n )`next = stack;                                   // atomic assignment unnecessary, or use CAA
+                          if ( __atomic_compare_exchange_n( &stack.atom, &( &n )`next->atom, (Link(T))@{ {&n, ( &n )`next->count + 1} }.atom, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST ) ) break; // attempt to update top node
                         } // for
                 } // push
@@ -53 +53 @@
                                 t = stack;                                                              // atomic assignment unnecessary, or use CAA
                           if ( t.top == 0p ) return 0p;                         // empty stack ?
-                          if ( __atomic_compare_exchange_n( &stack.atom, &t.atom, (Link(T))@{ {getNext( t.top )->top, t.count} }.atom, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST ) ) return t.top; // attempt to update top node
+                          if ( __atomic_compare_exchange_n( &stack.atom, &t.atom, (Link(T))@{ {( t.top )`next->top, t.count} }.atom, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST ) ) return t.top; // attempt to update top node
                         } // for
                 } // pop
@@ -62 +62 @@
                                 T * next = link->top;
                                 if( next == node ) {
-                                        link->top = getNext( node )->top;
+                                        link->top = ( node )`next->top;
                                         return true;
                                 }
                                 if( next == 0p ) return false;
-                                link = getNext(next);
+                                link = (next)`next;
                         }
                 }

libcfa/src/heap.cfa

@@ -208 +208 @@
 
 #if BUCKETLOCK == LOCKFREE
-static inline Link(HeapManager.Storage) * getNext( HeapManager.Storage * this ) { return &this->header.kind.real.next; }
+static inline Link(HeapManager.Storage) * ?`next( HeapManager.Storage * this ) { return &this->header.kind.real.next; }
 static inline void ?{}( HeapManager.FreeHeader & ) {}
 static inline void ^?{}( HeapManager.FreeHeader & ) {}
@@ -665 +665 @@
                 #else
                 for ( HeapManager.Storage * p = top( freeLists[i].freeList ); p != 0p; /* p = getNext( p )->top */) {
-                        typeof(p) temp = getNext( p )->top;                     // FIX ME: direct assignent fails, initialization works
+                        typeof(p) temp = ( p )`next->top;                       // FIX ME: direct assignent fails, initialization works
                         p = temp;
                 #endif // BUCKETLOCK
@@ -901 +901 @@
                         return oaddr;
                 } // if
-        
+
                 // change size, DO NOT preserve STICKY PROPERTIES.
                 free( oaddr );