[PATCH v2] Call the right helper function when setting mallopt M_ARENA_MAX

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH v2] Call the right helper function when setting mallopt M_ARENA_MAX

Wladimir J. van der Laan
Fixes a typo introduced in commit
be7991c0705e35b4d70a419d117addcd6c627319. This caused
mallopt(M_ARENA_MAX) as well as the environment variable
MALLOC_ARENA_MAX to not work as intended because it set the
wrong internal parameter.

  [BZ# 21338]
        * malloc/malloc.c: Call do_set_arena_max for M_ARENA_MAX
        instead of incorrect do_set_arena_test
---
 ChangeLog       | 6 ++++++
 malloc/malloc.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

Changes: added BZ reference

diff --git a/ChangeLog b/ChangeLog
index eaf7bb1..daa6437 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-30  Wladimir van der Laan  <[hidden email]>
+
+ [BZ# 21338]
+ * malloc/malloc.c: Call do_set_arena_max for M_ARENA_MAX
+ instead of incorrect do_set_arena_test.
+
 2017-03-30  Gabriel F. T. Gomes  <[hidden email]>
 
  * math/math.h: Include bits/math-finite.h once per
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 994a232..4c40e2e 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4904,7 +4904,7 @@ __libc_mallopt (int param_number, int value)
 
     case M_ARENA_MAX:
       if (value > 0)
- do_set_arena_test (value);
+ do_set_arena_max (value);
       break;
     }
   __libc_lock_unlock (av->mutex);
--
2.7.4

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v2] Call the right helper function when setting mallopt M_ARENA_MAX

Siddhesh Poyarekar-8
On Friday 31 March 2017 01:25 PM, Wladimir J. van der Laan wrote:
> Fixes a typo introduced in commit
> be7991c0705e35b4d70a419d117addcd6c627319. This caused
> mallopt(M_ARENA_MAX) as well as the environment variable
> MALLOC_ARENA_MAX to not work as intended because it set the
> wrong internal parameter.
>
>   [BZ# 21338]
> * malloc/malloc.c: Call do_set_arena_max for M_ARENA_MAX
> instead of incorrect do_set_arena_test

Thanks for catching this, I've pushed it.

Siddhesh