From patchwork Mon Aug 24 09:07:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 509950 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AF9351401CB for ; Mon, 24 Aug 2015 19:07:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=vx6nncle; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; q=dns; s= default; b=UPN8Miv5XIftrrwD4vRmYWfEH9zC8hMOhKf7JAU8UIQ2wKHd39rt1 ZiqZfP9X+5eqOavqG9k+Ji9c0Z6NIRawM+10GK2F3jiHwr/4mXgI7eFPQVURZJx3 dMi7ZDMgSjef3Zw4Acu4M1cOPTaO1QkERNqP5ATTkoypcWfIKU4KnI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; s=default; bh=fW/AwW0q1razbwO6Alf4ajJxjPw=; b=vx6nnclelzHRL4nueP0P4MDX5yVO 5u7/sGBJxsio2avyAthEJuWfOmoyr/u12BQ+Q1F9RcUvfOznpEeFwSfmPC01E+NR 6Fk4ByHRPzBc3DpXnnrzFNAGfMTCovy/ZKxHJ3tFlprgDudq4cLdEdPL5X0zV71p gzkSxALG6miG/8U= Received: (qmail 37800 invoked by alias); 24 Aug 2015 09:07:25 -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 37789 invoked by uid 89); 24 Aug 2015 09:07:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=AWL, BAYES_40, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com From: "Siddhesh Poyarekar" To: libc-alpha@sourceware.org Subject: [COMMITTED] Drop unused first argument from arena_get2 Date: Mon, 24 Aug 2015 14:37:16 +0530 Message-Id: <1440407236-10939-1-git-send-email-siddhesh@redhat.com> The arena pointer in the first argument to arena_get2 was used in the old days before per-thread arenas. They're unused now and hence can be dropped. Committed since the generated code remains identical as verified by using objdump and ignoring differences in labels such as __malloc_info.part.9 to __malloc_info.part.8. ChangeLog: * malloc/arena.c (arena_get2): Drop unused argument. (arena_lock): Adjust. (arena_get_retry): Likewise. --- ChangeLog | 6 ++++++ malloc/arena.c | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2797de4..1b5b03e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-08-24 Siddhesh Poyarekar + + * malloc/arena.c (arena_get2): Drop unused argument. + (arena_lock): Adjust. + (arena_get_retry): Likewise. + 2015-08-24 Andreas Schwab * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_IPC64): diff --git a/malloc/arena.c b/malloc/arena.c index 21ecc5a1..cfec94d 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -102,7 +102,7 @@ int __malloc_initialized = -1; if (ptr && !arena_is_corrupt (ptr)) \ (void) mutex_lock (&ptr->mutex); \ else \ - ptr = arena_get2 (ptr, (size), NULL); \ + ptr = arena_get2 ((size), NULL); \ } while (0) /* find the heap and corresponding arena for a given ptr */ @@ -849,7 +849,7 @@ out: static mstate internal_function -arena_get2 (mstate a_tsd, size_t size, mstate avoid_arena) +arena_get2 (size_t size, mstate avoid_arena) { mstate a; @@ -914,10 +914,8 @@ arena_get_retry (mstate ar_ptr, size_t bytes) } else { - /* Grab ar_ptr->next prior to releasing its lock. */ - mstate prev = ar_ptr->next ? ar_ptr : 0; (void) mutex_unlock (&ar_ptr->mutex); - ar_ptr = arena_get2 (prev, bytes, ar_ptr); + ar_ptr = arena_get2 (bytes, ar_ptr); } return ar_ptr;