Changeset c4c8571 for libcfa/src/concurrency/kernel/cluster.hfa

Timestamp:

Jul 28, 2022, 12:04:25 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

32d1383, d0fcc82

Parents:

3f95dab (diff), 2af1943 (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

File:

• libcfa/src/concurrency/kernel/cluster.hfa (modified) (2 diffs)

libcfa/src/concurrency/kernel/cluster.hfa

@@ -39 +39 @@
         if (ts_next == ULLONG_MAX) return;
         unsigned long long now = rdtscl();
-        unsigned long long pma = __atomic_load_n(&tscs[ idx ].ma, __ATOMIC_RELAXED);
-        __atomic_store_n(&tscs[ idx ].tv, ts_next, __ATOMIC_RELAXED);
-        __atomic_store_n(&tscs[ idx ].ma, moving_average(now, ts_prev, pma), __ATOMIC_RELAXED);
+        unsigned long long pma = __atomic_load_n(&tscs[ idx ].t.ma, __ATOMIC_RELAXED);
+        __atomic_store_n(&tscs[ idx ].t.tv, ts_next, __ATOMIC_RELAXED);
+        __atomic_store_n(&tscs[ idx ].t.ma, moving_average(now, ts_prev, pma), __ATOMIC_RELAXED);
 }
 
@@ -61 +61 @@
                 if(ptsc != ULLONG_MAX) {
                         /* paranoid */ verify( start + i < count );
-                        unsigned long long tsc = moving_average(ctsc, ptsc, tscs[start + i].ma);
+                        unsigned long long tsc = moving_average(ctsc, ptsc, tscs[start + i].t.ma);
                         if(tsc > max) max = tsc;
                 }