From patchwork Thu Mar 30 18:41:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wladimir J. van der Laan" X-Patchwork-Id: 19778 Received: (qmail 121217 invoked by alias); 30 Mar 2017 18:41:20 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 121083 invoked by uid 89); 30 Mar 2017 18:41:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=der, laan X-HELO: mail-wr0-f176.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition; bh=9ZipV6O4qarGKrdRCKnG0czyu41WCDkEwsskGLRDT7U=; b=VK4FSTB6bjcbmqf7Zl9jrsEXkW8UZGUiclVM27yWash7B32rkGXla3Wrhl8FSNopgC bceBHKBuCvLIULQ5ADXhVrFvkEEVEU/gtTRZYqKUOYLs1UNft4zfKZk2rtRsHd61F5xm SuGSJ7RNeaBq1iU/SRGFOaNT2xrLV4el7TJrOXOB8YTkapuJsLbq6VNISe8JyYg1vMD6 rr22A/oNavfWabsWTQTfyctQFFS/YACy/FtlpglQ2TfZAM5RRNYqs8UuT7cdzT8g90pA 0dl7+8FqyCSRP8KF8CZvb8M0AprplXeC/h36HyM14eOT1KDmGiY6ojqdlWduNPoRYuXi u0Cg== X-Gm-Message-State: AFeK/H1qvKs69WQyGnl7P9xq+JLneGxlxPaDjmhGyanHz2Q/ClrhUmufupfQVT7XZvFcog== X-Received: by 10.223.171.11 with SMTP id q11mr1103341wrc.35.1490899274382; Thu, 30 Mar 2017 11:41:14 -0700 (PDT) Date: Thu, 30 Mar 2017 20:41:12 +0200 From: "Wladimir J. van der Laan" To: libc-alpha@sourceware.org Subject: [PATCH] Call the right helper function when setting mallopt M_ARENA_MAX Message-ID: <20170330184112.GA19395@amethyst.visucore.com> MIME-Version: 1.0 Content-Disposition: inline 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. * malloc/malloc.c: Call do_set_arena_max for M_ARENA_MAX instead of incorrect do_set_arena_test --- ChangeLog | 5 +++++ malloc/malloc.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index eaf7bb1..536e35f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-03-30 Wladimir van der Laan + + * 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 * 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);