Changeset b62d1d6

Timestamp:

Jun 21, 2022, 2:28:20 PM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, 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:

• libcfa/src/concurrency/ready_subqueue.hfa (modified) (1 diff)
• tests/pybin/tools.py (modified) (2 diffs)

libcfa/src/concurrency/ready_subqueue.hfa

@@ -49 +49 @@
         // Get the relevant nodes locally
         this.prev->link.next = node;
-        this.prev->link.ts   = rdtscl();
+        __atomic_store_n(&this.prev->link.ts, rdtscl(), __ATOMIC_RELAXED);
         this.prev = node;
         #if !defined(__CFA_NO_STATISTICS__)

tests/pybin/tools.py

@@ -46 +46 @@
 
                         print(cmd)
-                        return 0, None
+                        return 0, None, None
 
                 with contextlib.ExitStack() as onexit:
@@ -291 +291 @@
 ################################################################################
 def jobserver_version():
-        make_ret, out, err = sh('make', '.test_makeflags', '-j2', output_file=subprocess.PIPE, error=subprocess.PIPE)
+        make_ret, out, err = sh('make', '.test_makeflags', '-j2', ignore_dry_run = True, output_file=subprocess.PIPE, error=subprocess.PIPE)
         if make_ret != 0:
                 print("ERROR: cannot find Makefile jobserver version", file=sys.stderr)