Changeset b62d1d6


Ignore:
Timestamp:
Jun 21, 2022, 2:28:20 PM (3 months ago)
Author:
JiadaL <j82liang@…>
Branches:
master, pthread-emulation, qualifiedEnum
Children:
c5d5723
Parents:
eb5962a (diff), b0be3713 (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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/concurrency/ready_subqueue.hfa

    reb5962a rb62d1d6  
    4949        // Get the relevant nodes locally
    5050        this.prev->link.next = node;
    51         this.prev->link.ts   = rdtscl();
     51        __atomic_store_n(&this.prev->link.ts, rdtscl(), __ATOMIC_RELAXED);
    5252        this.prev = node;
    5353        #if !defined(__CFA_NO_STATISTICS__)
  • tests/pybin/tools.py

    reb5962a rb62d1d6  
    4646
    4747                        print(cmd)
    48                         return 0, None
     48                        return 0, None, None
    4949
    5050                with contextlib.ExitStack() as onexit:
     
    291291################################################################################
    292292def jobserver_version():
    293         make_ret, out, err = sh('make', '.test_makeflags', '-j2', output_file=subprocess.PIPE, error=subprocess.PIPE)
     293        make_ret, out, err = sh('make', '.test_makeflags', '-j2', ignore_dry_run = True, output_file=subprocess.PIPE, error=subprocess.PIPE)
    294294        if make_ret != 0:
    295295                print("ERROR: cannot find Makefile jobserver version", file=sys.stderr)
Note: See TracChangeset for help on using the changeset viewer.