From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 1ECC53857C59; Wed, 21 Sep 2022 14:02:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1ECC53857C59 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1663768952; bh=Tz8rB93rjg6B1J7dUPDg2ZGYbYZ4GfLB9syzhYepDH4=; h=From:To:Subject:Date:From; b=QglnZYOS5RVwan97XQVGPXJjeWSDwDYbtx3Bpx//PZGJsHshxd5QauLdvd9zRMXLK WaB28qqLg0aJTtpU5fLtTwA9wPlhpuhOx0+xGX20oOWS5VRXbxvzj76kQYKP6AXse3 6nNKfPoFE8P5JYmuzNPuO0znctrCID85fEwaSkQ8= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] elf: Use C11 atomics on _dl_mcount X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: c0c9092f758d3734fd6bb3f63c6cd0c4fd464a51 X-Git-Newrev: fd36873ff9d766f5095d81bdfba900adfff5f784 Message-Id: <20220921140232.1ECC53857C59@sourceware.org> Date: Wed, 21 Sep 2022 14:02:32 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fd36873ff9d766f5095d81bdfba900adfff5f784 commit fd36873ff9d766f5095d81bdfba900adfff5f784 Author: Adhemerval Zanella Date: Tue Sep 20 16:04:13 2022 -0300 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 Diff: --- elf/dl-profile.c | 10 +++++----- 1 file 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: ;