Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • libcfa/src/concurrency/ready_subqueue.hfa

    r5024df4 r8a5e357  
    3232        /* paranoid */ verify( this.lock );
    3333        /* paranoid */ verify( node->link.next == 0p );
    34         /* paranoid */ verify( __atomic_load_n(&node->link.ts, __ATOMIC_RELAXED) == MAX  );
     34        /* paranoid */ verify( node->link.ts  == MAX  );
    3535        /* paranoid */ verify( this.prev->link.next == 0p );
    36         /* paranoid */ verify( __atomic_load_n(&this.prev->link.ts, __ATOMIC_RELAXED)   == MAX  );
     36        /* paranoid */ verify( this.prev->link.ts   == MAX  );
    3737        if( this.anchor.next == 0p ) {
    3838                /* paranoid */ verify( this.anchor.next == 0p );
    39                 /* paranoid */ verify( __atomic_load_n(&this.anchor.ts, __ATOMIC_RELAXED) == MAX );
    40                 /* paranoid */ verify( __atomic_load_n(&this.anchor.ts, __ATOMIC_RELAXED) != 0  );
     39                /* paranoid */ verify( this.anchor.ts  == MAX );
     40                /* paranoid */ verify( this.anchor.ts  != 0  );
    4141                /* paranoid */ verify( this.prev == mock_head( this ) );
    4242        } else {
    4343                /* paranoid */ verify( this.anchor.next != 0p );
    44                 /* paranoid */ verify( __atomic_load_n(&this.anchor.ts, __ATOMIC_RELAXED) != MAX );
    45                 /* paranoid */ verify( __atomic_load_n(&this.anchor.ts, __ATOMIC_RELAXED) != 0  );
     44                /* paranoid */ verify( this.anchor.ts  != MAX );
     45                /* paranoid */ verify( this.anchor.ts  != 0  );
    4646                /* paranoid */ verify( this.prev != mock_head( this ) );
    4747        }
    … …  
    6262        /* paranoid */ verify( this.lock );
    6363        /* paranoid */ verify( this.anchor.next != 0p );
    64         /* paranoid */ verify( __atomic_load_n(&this.anchor.ts, __ATOMIC_RELAXED) != MAX );
    65         /* paranoid */ verify( __atomic_load_n(&this.anchor.ts, __ATOMIC_RELAXED) != 0   );
     64        /* paranoid */ verify( this.anchor.ts  != MAX );
     65        /* paranoid */ verify( this.anchor.ts   != 0  );
    6666
    6767        // Get the relevant nodes locally
    6868        thread$ * node = this.anchor.next;
    6969        this.anchor.next = node->link.next;
    70         __atomic_store_n(&this.anchor.ts, __atomic_load_n(&node->link.ts, __ATOMIC_RELAXED), __ATOMIC_RELAXED);
     70        this.anchor.ts   = node->link.ts;
    7171        bool is_empty = this.anchor.next == 0p;
    7272        node->link.next = 0p;
    73         __atomic_store_n(&node->link.ts, ULLONG_MAX, __ATOMIC_RELAXED);
     73        node->link.ts   = MAX;
    7474        #if !defined(__CFA_NO_STATISTICS__)
    7575                this.cnt--;
    … …  
    7979        if(is_empty) this.prev = mock_head( this );
    8080
    81         unsigned long long ats = __atomic_load_n(&this.anchor.ts, __ATOMIC_RELAXED);
    8281        /* paranoid */ verify( node->link.next == 0p );
    83         /* paranoid */ verify( __atomic_load_n(&node->link.ts , __ATOMIC_RELAXED) == MAX );
    84         /* paranoid */ verify( __atomic_load_n(&node->link.ts , __ATOMIC_RELAXED) != 0   );
    85         /* paranoid */ verify( ats != 0 );
    86         /* paranoid */ verify( (ats == MAX) == is_empty );
    87         return [node, ats];
     82        /* paranoid */ verify( node->link.ts   == MAX );
     83        /* paranoid */ verify( node->link.ts   != 0  );
     84        /* paranoid */ verify( this.anchor.ts  != 0 );
     85        /* paranoid */ verify( (this.anchor.ts == MAX) == is_empty );
     86        return [node, this.anchor.ts];
    8887}
    8988
    … …  
    9796        // Cannot verify 'emptiness' here since it may not be locked
    9897        /* paranoid */ verify(this.anchor.ts != 0);
    99         /* paranoid */ static_assert(__atomic_always_lock_free(sizeof(this.anchor.ts), &this.anchor.ts));
    100         return __atomic_load_n(&this.anchor.ts, __ATOMIC_RELAXED);
     98        return this.anchor.ts;
    10199}
Note: See TracChangeset for help on using the changeset viewer.