Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
MIME-Version: 1.0
References: <20220320093750.159991-1-ammarfaizi2@gnuweeb.org> <20220320093750.159991-6-ammarfaizi2@gnuweeb.org>
In-Reply-To: <20220320093750.159991-6-ammarfaizi2@gnuweeb.org>
From:   Alviro Iskandar Setiawan <alviro.iskandar@gnuweeb.org>
Date:   Sun, 20 Mar 2022 22:50:30 +0700
Message-ID: <CAOG64qMoDjLer_OgRn2edGLMLMVfA5Lv3CZSU2VeOkgzPWNVUA@mail.gmail.com>
Subject: Re: [RFC PATCH v1 5/6] tools/nolibc/stdlib: Implement `malloc()`,
 `calloc()`, `realloc()` and `free()`
To:     Ammar Faizi <ammarfaizi2@gnuweeb.org>
Cc:     Willy Tarreau <w@1wt.eu>, "Paul E. McKenney" <paulmck@kernel.org>,
        Nugraha <richiisei@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        "GNU/Weeb Mailing List" <gwml@vger.gnuweeb.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Sun, Mar 20, 2022 at 4:37 PM Ammar Faizi wrote:
> +void *realloc(void *old_ptr, size_t new_size)
> +{
> +       struct nolibc_heap *heap;
> +       void *ret;
> +
> +       if (!old_ptr)
> +               return malloc(new_size);
> +
> +       ret = malloc(new_size);
> +       if (__builtin_expect(!ret, 0))
> +               return NULL;
> +
> +       heap = container_of(old_ptr, struct nolibc_heap, user_p);
> +       memcpy(ret, heap->user_p, heap->len);
> +       munmap(heap, heap->len);
> +       return ret;
> +}

This better be simplified like this, so only have 1 malloc() call that
applies to both branches.

  void *realloc(void *old_ptr, size_t new_size)
  {
         struct nolibc_heap *heap;
         void *ret;

         ret = malloc(new_size);
         if (__builtin_expect(!ret, 0))
                 return NULL;

         if (!old_ptr)
                 return ret;

         heap = container_of(old_ptr, struct nolibc_heap, user_p);
         memcpy(ret, heap->user_p, heap->len);
         munmap(heap, heap->len);
         return ret;
  }

-- Viro