From: Carlos O'Donell via Libc-alpha <libc-alpha@sourceware.org>
To: Siddhesh Poyarekar <siddhesh@sourceware.org>, libc-alpha@sourceware.org
Cc: fweimer@redhat.com
Subject: Re: [PATCH v8 06/10] Simplify __malloc_initialized
Date: Sat, 17 Jul 2021 18:04:16 -0400 [thread overview]
Message-ID: <165ce484-9210-fd21-57df-7e5b3978cc69@redhat.com> (raw)
In-Reply-To: <20210713073845.504356-7-siddhesh@sourceware.org>
On 7/13/21 3:38 AM, Siddhesh Poyarekar wrote:
> Now that mcheck no longer needs to check __malloc_initialized (and no
> other third party hook can since the symbol is not exported), make the
> variable boolean and static so that it is used strictly within malloc.
OK for 2.34.
Tested without regression on x86_64 and i686.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
> ---
> include/malloc.h | 6 ------
> malloc/arena.c | 12 ++++++------
> malloc/malloc.c | 24 ++++++++++++------------
> 3 files changed, 18 insertions(+), 24 deletions(-)
>
> diff --git a/include/malloc.h b/include/malloc.h
> index b77761f74d..f9c9610548 100644
> --- a/include/malloc.h
> +++ b/include/malloc.h
> @@ -5,12 +5,6 @@
> # ifndef _ISOMAC
> # include <rtld-malloc.h>
>
> -/* In the GNU libc we rename the global variable
> - `__malloc_initialized' to `__libc_malloc_initialized'. */
> -#define __malloc_initialized __libc_malloc_initialized
> -/* Nonzero if the malloc is already initialized. */
> -extern int __malloc_initialized attribute_hidden;
OK.
> -
> struct malloc_state;
> typedef struct malloc_state *mstate;
>
> diff --git a/malloc/arena.c b/malloc/arena.c
> index 9111b49589..840426f9fb 100644
> --- a/malloc/arena.c
> +++ b/malloc/arena.c
> @@ -97,7 +97,7 @@ static mstate free_list;
> __libc_lock_define_initialized (static, list_lock);
>
> /* Already initialized? */
> -int __malloc_initialized = -1;
> +static bool __malloc_initialized = false;
OK.
>
> /**************************************************************************/
>
> @@ -143,7 +143,7 @@ int __malloc_initialized = -1;
> void
> __malloc_fork_lock_parent (void)
> {
> - if (__malloc_initialized < 1)
> + if (!__malloc_initialized)
OK.
> return;
>
> /* We do not acquire free_list_lock here because we completely
> @@ -163,7 +163,7 @@ __malloc_fork_lock_parent (void)
> void
> __malloc_fork_unlock_parent (void)
> {
> - if (__malloc_initialized < 1)
> + if (!__malloc_initialized)
> return;
>
> for (mstate ar_ptr = &main_arena;; )
> @@ -179,7 +179,7 @@ __malloc_fork_unlock_parent (void)
> void
> __malloc_fork_unlock_child (void)
> {
> - if (__malloc_initialized < 1)
> + if (!__malloc_initialized)
> return;
>
> /* Push all arenas to the free list, except thread_arena, which is
> @@ -286,10 +286,10 @@ static void tcache_key_initialize (void);
> static void
> ptmalloc_init (void)
> {
> - if (__malloc_initialized >= 0)
> + if (__malloc_initialized)
> return;
>
> - __malloc_initialized = 0;
> + __malloc_initialized = true;
>
> #if USE_TCACHE
> tcache_key_initialize ();
> diff --git a/malloc/malloc.c b/malloc/malloc.c
> index cf71314b2b..ed0316e690 100644
> --- a/malloc/malloc.c
> +++ b/malloc/malloc.c
> @@ -3195,7 +3195,7 @@ __libc_malloc (size_t bytes)
> _Static_assert (PTRDIFF_MAX <= SIZE_MAX / 2,
> "PTRDIFF_MAX is not more than half of SIZE_MAX");
>
> - if (__malloc_initialized < 0)
> + if (!__malloc_initialized)
> ptmalloc_init ();
> #if USE_TCACHE
> /* int_free also calls request2size, be careful to not pad twice. */
> @@ -3308,7 +3308,7 @@ __libc_realloc (void *oldmem, size_t bytes)
>
> void *newp; /* chunk to return */
>
> - if (__malloc_initialized < 0)
> + if (!__malloc_initialized)
> ptmalloc_init ();
>
> #if REALLOC_ZERO_BYTES_FREES
> @@ -3444,7 +3444,7 @@ libc_hidden_def (__libc_realloc)
> void *
> __libc_memalign (size_t alignment, size_t bytes)
> {
> - if (__malloc_initialized < 0)
> + if (!__malloc_initialized)
> ptmalloc_init ();
>
> void *address = RETURN_ADDRESS (0);
> @@ -3515,7 +3515,7 @@ libc_hidden_def (__libc_memalign)
> void *
> __libc_valloc (size_t bytes)
> {
> - if (__malloc_initialized < 0)
> + if (!__malloc_initialized)
> ptmalloc_init ();
>
> void *address = RETURN_ADDRESS (0);
> @@ -3526,7 +3526,7 @@ __libc_valloc (size_t bytes)
> void *
> __libc_pvalloc (size_t bytes)
> {
> - if (__malloc_initialized < 0)
> + if (!__malloc_initialized)
> ptmalloc_init ();
>
> void *address = RETURN_ADDRESS (0);
> @@ -3565,7 +3565,7 @@ __libc_calloc (size_t n, size_t elem_size)
>
> sz = bytes;
>
> - if (__malloc_initialized < 0)
> + if (!__malloc_initialized)
> ptmalloc_init ();
>
> MAYBE_INIT_TCACHE ();
> @@ -5022,7 +5022,7 @@ __malloc_trim (size_t s)
> {
> int result = 0;
>
> - if (__malloc_initialized < 0)
> + if (!__malloc_initialized)
> ptmalloc_init ();
>
> mstate ar_ptr = &main_arena;
> @@ -5157,7 +5157,7 @@ __libc_mallinfo2 (void)
> struct mallinfo2 m;
> mstate ar_ptr;
>
> - if (__malloc_initialized < 0)
> + if (!__malloc_initialized)
> ptmalloc_init ();
>
> memset (&m, 0, sizeof (m));
> @@ -5208,7 +5208,7 @@ __malloc_stats (void)
> mstate ar_ptr;
> unsigned int in_use_b = mp_.mmapped_mem, system_b = in_use_b;
>
> - if (__malloc_initialized < 0)
> + if (!__malloc_initialized)
> ptmalloc_init ();
> _IO_flockfile (stderr);
> int old_flags2 = stderr->_flags2;
> @@ -5377,7 +5377,7 @@ __libc_mallopt (int param_number, int value)
> mstate av = &main_arena;
> int res = 1;
>
> - if (__malloc_initialized < 0)
> + if (!__malloc_initialized)
> ptmalloc_init ();
> __libc_lock_lock (av->mutex);
>
> @@ -5595,7 +5595,7 @@ __posix_memalign (void **memptr, size_t alignment, size_t size)
> {
> void *mem;
>
> - if (__malloc_initialized < 0)
> + if (!__malloc_initialized)
> ptmalloc_init ();
>
> /* Test whether the SIZE argument is valid. It must be a power of
> @@ -5639,7 +5639,7 @@ __malloc_info (int options, FILE *fp)
>
>
>
> - if (__malloc_initialized < 0)
> + if (!__malloc_initialized)
> ptmalloc_init ();
>
> fputs ("<malloc version=\"1\">\n", fp);
>
OK.
--
Cheers,
Carlos.
next prev parent reply other threads:[~2021-07-17 22:08 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-13 7:38 [PATCH v8 00/10] malloc hooks removal Siddhesh Poyarekar via Libc-alpha
2021-07-13 7:38 ` [PATCH v8 01/10] Make mcheck tests conditional on GLIBC_2.24 or earlier Siddhesh Poyarekar via Libc-alpha
2021-07-17 22:03 ` Carlos O'Donell via Libc-alpha
2021-07-13 7:38 ` [PATCH v8 02/10] Remove __after_morecore_hook Siddhesh Poyarekar via Libc-alpha
2021-07-17 22:03 ` Carlos O'Donell via Libc-alpha
2021-07-13 7:38 ` [PATCH v8 03/10] Remove __morecore and __default_morecore Siddhesh Poyarekar via Libc-alpha
2021-07-14 7:01 ` Siddhesh Poyarekar
2021-07-14 12:54 ` Guillaume Morin
2021-07-14 14:13 ` Siddhesh Poyarekar
2021-07-14 16:42 ` Guillaume Morin
2021-07-14 17:15 ` Carlos O'Donell via Libc-alpha
2021-07-14 17:42 ` Adhemerval Zanella via Libc-alpha
2021-07-14 18:37 ` Guillaume Morin
2021-07-14 18:48 ` Siddhesh Poyarekar
2021-07-14 18:31 ` Guillaume Morin
2021-07-14 17:32 ` Siddhesh Poyarekar
2021-07-14 18:25 ` Guillaume Morin
2021-07-14 18:43 ` Siddhesh Poyarekar
2021-07-14 18:51 ` Guillaume Morin
2021-07-17 22:03 ` Carlos O'Donell via Libc-alpha
2021-07-13 7:38 ` [PATCH v8 04/10] Move malloc hooks into a compat DSO Siddhesh Poyarekar via Libc-alpha
2021-07-17 22:04 ` Carlos O'Donell via Libc-alpha
2021-07-13 7:38 ` [PATCH v8 05/10] mcheck: Wean away from malloc hooks Siddhesh Poyarekar via Libc-alpha
2021-07-13 15:47 ` H.J. Lu via Libc-alpha
2021-07-14 2:44 ` Siddhesh Poyarekar via Libc-alpha
2021-07-17 22:04 ` Carlos O'Donell via Libc-alpha
2021-07-13 7:38 ` [PATCH v8 06/10] Simplify __malloc_initialized Siddhesh Poyarekar via Libc-alpha
2021-07-17 22:04 ` Carlos O'Donell via Libc-alpha [this message]
2021-07-13 7:38 ` [PATCH v8 07/10] mtrace: Wean away from malloc hooks Siddhesh Poyarekar via Libc-alpha
2021-07-17 22:04 ` Carlos O'Donell via Libc-alpha
2021-07-13 7:38 ` [PATCH v8 08/10] glibc.malloc.check: " Siddhesh Poyarekar via Libc-alpha
2021-07-17 22:04 ` Carlos O'Donell via Libc-alpha
2021-07-13 7:38 ` [PATCH v8 09/10] Remove " Siddhesh Poyarekar via Libc-alpha
2021-07-17 22:04 ` Carlos O'Donell via Libc-alpha
2021-07-13 7:38 ` [PATCH v8 10/10] mcheck Fix malloc_usable_size [BZ #22057] Siddhesh Poyarekar via Libc-alpha
2021-07-17 22:04 ` Carlos O'Donell via Libc-alpha
2021-07-13 14:48 ` [PATCH v8 00/10] malloc hooks removal H.J. Lu via Libc-alpha
2021-07-13 15:41 ` Siddhesh Poyarekar via Libc-alpha
2021-07-17 22:03 ` Carlos O'Donell via Libc-alpha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=165ce484-9210-fd21-57df-7e5b3978cc69@redhat.com \
--to=libc-alpha@sourceware.org \
--cc=carlos@redhat.com \
--cc=fweimer@redhat.com \
--cc=siddhesh@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).