Re: [PATCH v2 2/2] range-diff: add configurable memory limit for cost matrix

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Aug 28, 2025 at 2:00 AM pcasaretto via GitGitGadget
<gitgitgadget@xxxxxxxxx> wrote:
>
> From: pcasaretto <paulo.casaretto@xxxxxxxxxxx>
> Signed-off-by: Paulo Casaretto <paulo.casaretto@xxxxxxxxxxx>

The names (and emails) in these should match; I believe the name in
the From field is set by Gitgitgadget based on your profile settings;
see https://github.com/settings/profile and set your name there.

>  static void get_correspondences(struct string_list *a, struct string_list *b,
> -                               int creation_factor)
> +                               int creation_factor, size_t max_memory)
>  {
>         int n = a->nr + b->nr;
>         int *cost, c, *a2b, *b2a;
>         int i, j;
> -
> -       ALLOC_ARRAY(cost, st_mult(n, n));
> +       size_t cost_size = st_mult(n, n);
> +       size_t cost_bytes = st_mult(sizeof(int), cost_size);
> +       if (cost_bytes >= max_memory) {
> +               struct strbuf cost_str = STRBUF_INIT;
> +               struct strbuf max_str = STRBUF_INIT;
> +               strbuf_humanise_bytes(&cost_str, cost_bytes);
> +               strbuf_humanise_bytes(&max_str, max_memory);
> +               die(_("range-diff: unable to compute the range-diff, since it "
> +                     "exceeds the maximum memory for the cost matrix: %s "
> +                     "(%"PRIuMAX" bytes) needed, %s (%"PRIuMAX" bytes) available"),

available?  I'm worried the error message will report in users
checking system memory, claiming they have 14GB available on their
system, and then reporting a "bug".

Perhaps something like:

+                     "(%"PRIuMAX" bytes) needed, limited to %s
(%"PRIuMAX" bytes)"),

?


The rest of the patch looks good to me.





[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux