Changeset 92538ab for libcfa/src/concurrency/stats.hfa

Timestamp:

Apr 10, 2022, 2:53:18 PM (4 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

File:

• libcfa/src/concurrency/stats.hfa (modified) (1 diff)

libcfa/src/concurrency/stats.hfa

@@ -103 +103 @@
                                 volatile uint64_t drain;
                                 volatile uint64_t completed;
+                                volatile uint64_t locked;
+                                volatile uint64_t helped;
                                 volatile uint64_t flush;
                                 volatile uint64_t submitted;