Changeset f302d80


Ignore:
Timestamp:
May 5, 2021, 1:17:07 PM (6 weeks ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master
Children:
b9376fe
Parents:
f55d54d
Message:

Fix timestamp with new subqueue which was read after being cleared.

Location:
libcfa/src/concurrency
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/concurrency/ready_queue.cfa

    rf55d54d rf302d80  
    406406
    407407                        // WARNING: std::min is polymorphic and therefore causes 500% slowdown instead of the expected 2%
    408                         proc->rdq.cutoff = tsc1 < tsc2 ? tsc1 : tsc2; 
     408                        proc->rdq.cutoff = tsc1 < tsc2 ? tsc1 : tsc2;
    409409                }
    410410                else {
     
    469469        // Actually pop the list
    470470        struct $thread * thrd;
    471         thrd = pop(lane);
     471        unsigned long long tsv;
     472        [thrd, tsv] = pop(lane);
    472473
    473474        /* paranoid */ verify(thrd);
     
    481482
    482483        #if defined(USE_WORK_STEALING)
    483                 lanes.tscs[w].tv = thrd->link.ts;
     484                lanes.tscs[w].tv = tsv;
    484485        #endif
    485486
     
    663664                        while(!is_empty(lanes.data[idx])) {
    664665                                struct $thread * thrd;
    665                                 thrd = pop(lanes.data[idx]);
     666                                unsigned long long _;
     667                                [thrd, _] = pop(lanes.data[idx]);
    666668
    667669                                push(cltr, thrd);
  • libcfa/src/concurrency/ready_subqueue.hfa

    rf55d54d rf302d80  
    5353// Push a thread onto this lane
    5454// returns true of lane was empty before push, false otherwise
    55 void push( __intrusive_lane_t & this, $thread * node ) {
     55static inline void push( __intrusive_lane_t & this, $thread * node ) {
    5656        /* paranoid */ verify( node->link.next == 0p );
    5757        /* paranoid */ verify( node->link.ts   == 0  );
     
    7777// returns popped
    7878// returns true of lane was empty before push, false otherwise
    79 $thread * pop( __intrusive_lane_t & this ) {
     79static inline [* $thread, unsigned long long] pop( __intrusive_lane_t & this ) {
    8080        /* paranoid */ verify( this.anchor.next != 0p );
    8181        /* paranoid */ verify( this.anchor.ts   != 0  );
    8282
    8383        // Get the relevant nodes locally
     84        unsigned long long ts = this.anchor.ts;
    8485        $thread * node = this.anchor.next;
    8586        this.anchor.next = node->link.next;
     
    9495        /* paranoid */ verify( node->link.next == 0p );
    9596        /* paranoid */ verify( node->link.ts   == 0  );
    96         return node;
     97        return [node, ts];
    9798}
    9899
Note: See TracChangeset for help on using the changeset viewer.