summaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-09-20 16:04:13 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-09-21 10:57:47 -0300
commitfd36873ff9d766f5095d81bdfba900adfff5f784 (patch)
treedc8daf2a8a0e0779ca27ebb137cdb369c08032dd /elf
parentc0c9092f758d3734fd6bb3f63c6cd0c4fd464a51 (diff)
downloadglibc-fd36873ff9d766f5095d81bdfba900adfff5f784.tar.gz
elf: Use C11 atomics on _dl_mcount
All atomic operation are counters, so relaxed MO should be suffice. Checked on x86_64-linux-gnu. Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-profile.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/elf/dl-profile.c b/elf/dl-profile.c
index ec57e3a965..96ba606724 100644
--- a/elf/dl-profile.c
+++ b/elf/dl-profile.c
@@ -548,7 +548,7 @@ _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc)
size_t newfromidx;
to_index = (data[narcs].self_pc
/ (HASHFRACTION * sizeof (*tos)));
- newfromidx = catomic_exchange_and_add (&fromidx, 1) + 1;
+ newfromidx = atomic_fetch_add_relaxed (&fromidx, 1) + 1;
froms[newfromidx].here = &data[narcs];
froms[newfromidx].link = tos[to_index];
tos[to_index] = newfromidx;
@@ -558,14 +558,14 @@ _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc)
/* If we still have no entry stop searching and insert. */
if (*topcindex == 0)
{
- unsigned int newarc = catomic_exchange_and_add (narcsp, 1);
+ unsigned int newarc = atomic_fetch_add_relaxed (narcsp, 1);
/* In rare cases it could happen that all entries in FROMS are
occupied. So we cannot count this anymore. */
if (newarc >= fromlimit)
goto done;
- *topcindex = catomic_exchange_and_add (&fromidx, 1) + 1;
+ *topcindex = atomic_fetch_add_relaxed (&fromidx, 1) + 1;
fromp = &froms[*topcindex];
fromp->here = &data[newarc];
@@ -573,7 +573,7 @@ _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc)
data[newarc].self_pc = selfpc;
data[newarc].count = 0;
fromp->link = 0;
- catomic_increment (&narcs);
+ atomic_fetch_add_relaxed (&narcs, 1);
break;
}
@@ -586,7 +586,7 @@ _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc)
}
/* Increment the counter. */
- catomic_increment (&fromp->here->count);
+ atomic_fetch_add_relaxed (&fromp->here->count, 1);
done:
;