From patchwork Wed Aug 7 13:08:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Scharfe?= X-Patchwork-Id: 11082137 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8097D1395 for ; Wed, 7 Aug 2019 13:09:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E17B285E5 for ; Wed, 7 Aug 2019 13:09:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C22128A34; Wed, 7 Aug 2019 13:09:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69E2D28A34 for ; Wed, 7 Aug 2019 13:08:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729929AbfHGNI5 (ORCPT ); Wed, 7 Aug 2019 09:08:57 -0400 Received: from mout.web.de ([212.227.15.4]:47239 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726873AbfHGNI5 (ORCPT ); Wed, 7 Aug 2019 09:08:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1565183332; bh=g5/5IL/iYKgE/6OQ1UDjJ+uDAgkBdlV7PcveBhOiCpk=; h=X-UI-Sender-Class:Subject:From:To:Cc:References:Date:In-Reply-To; b=bmiNmWJioG9UWGPJMNRylc7AtQEqCkD25MBxKJR8CxO2Ak1pn7gemhiM6jeDvjA8B GnF0nbJNSaNDeDHTUaD05Mjf62F3NHbIW2FASEL7o+H0tizYf1+aF6oMrQ6NFafh9N NYSyCzWkUbSid1s+TtNIVC8Wjl5LlCNtjvPEZFpM= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.23] ([79.203.24.71]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MWRoI-1hoAvZ3uiA-00Xda4; Wed, 07 Aug 2019 15:08:52 +0200 Subject: [PATCH 1/2] nedmalloc: do assignments only after the declaration section From: =?utf-8?q?Ren=C3=A9_Scharfe?= To: Carlo Arenas Cc: git@vger.kernel.org, gitster@pobox.com, johannes.schindelin@gmx.de, avarab@gmail.com, michal.kiedrowicz@gmail.com References: <20190806085014.47776-1-carenas@gmail.com> <20190806163658.66932-1-carenas@gmail.com> <20190806163658.66932-3-carenas@gmail.com> Message-ID: <5077f91b-958b-bf00-565f-7b96aa05a614@web.de> Date: Wed, 7 Aug 2019 15:08:51 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Provags-ID: V03:K1:ddmMI2gY/MAQIMf0ULsxOpNyz5lV/CB/id6drpYm/1eq+3KArCs ckO9rDhR2ppBU1kz5e6dD5XdIPqsB+LrHDRbWo6A/7DuM5U7EjUELXICPH0CaO5MebxKMtd Jzc3KYSCaY2hnPKFIsazsIgTubeeOUgEYZtNFis5O5h5pjKWlvl8FmDvC44jZ60OiKL+wlq 2m5YeSMqKRYb1nNrcjBXw== X-UI-Out-Filterresults: notjunk:1;V03:K0:nFcXAqOtkJA=:D5xtYVPtAGNbiqrLr+hjo3 a8Kr/NDbwFu1SmZE8Tj+cdhAxW8DBJss4u1wjFhLlQV4f86q8Z78lkHG8pPc+FO0k4Ie/6hpj AEghR+bFu6XPH624DFB/uEPBL+h61DMViMnZQz9gv2ok8CvSW9GtUFAPPAzT3mt+chnMtag4Z TfbePuw5X8YAYNThbdA+zROb+eYdnnqK/oCMsiXWeX0N0zTNryXyABx0zjO9ZE0pnZFOsUdWG lIdULjgCw5PS8QTrhDFdntXLP6/CUWnBcCHbV59VL+PbAnRXjV6hCxSRVE0p/keYMYV0IEtAA N2nles/rmf4qZAoVmQY8kMmx8QwuOo8qhH89auw3LNK4Kqzvcb2CFjhfsyLH3taqHkjHeMyco slpQi2xN8C5GmH8M+khnu8VtyBjp8hi3aJlnljFQ8v9RxaosrsszSzHyWsP3MKdbkNUkvNsUB ptmbvbhcfYn2hQUEU9PbkzEihLw4qF/qpWppbsbFnr8FK8eryTJBrbOCQsAOwAWOySsZ9W21n kzGNYnM1YOhmk6VM2EITratmFxDB7pGpLsrzvvvuzmqIFQ+aNJwnD4ugSKh/5ZWviGAKoQMma BJyxhMV/itflXGyodE/+FPHhxHfd4qGz1xwC9SO5ilSTY+dP/EQzf173icwKwu6heCFN0Nsgv Jf8u/9WAQIffxA5IHe8VFEP5vU7VewdHrdF8Aix9btYB2ITU16o2Ztp6k+CdQhvewYAiy6cb9 UuoqrRtVEEBW/hSAzTSH7RadPugT4quxUfXrh0PGX6RHWiHwDARO4K9PRNnsZ1yXzn0PlW/7T MW4GWvvJjaIgcKVJq6OjyaI0Cc3DvZiupKeSqVGvdUp6dlvyltXf1bq6vNnU+hNuMnJqErg8d qiy5fKAP9ARKAvKCoSM4zNfUvRPBio6EjYqc1pgrRzCXWEAq476ZgNDD+EAVEQSjvnu8DpGE1 2RQcA3CbmaqyJvkPOQo4jBWuXPL2U/QZ1RK4LUba1MIpdJnHEhbUqmscPEmFfZMXjKtig6EyU 3D0qz3Us1O4KvLTBq1oDC6HjTQQgY/QzhdCimDwqTU536OlWd+mBsRyefOON8jnC/2+64PWlV 38LZzE3e9EldW+o/DfrfB11aFC4wXJ0WpIfmiRmwTnTpY3yYrFN+1G0jj26uAbA8Mf7JSrpM0 3vvt4= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Avoid the following compiler warning: In file included from compat/nedmalloc/nedmalloc.c:63: compat/nedmalloc/malloc.c.h: In function ‘pthread_release_lock’: compat/nedmalloc/malloc.c.h:1759:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] 1759 | volatile unsigned int* lp = &sl->l; | ^~~~~~~~ Signed_off-by: René Scharfe --- compat/nedmalloc/malloc.c.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.22.0 diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h index b833ff9225..88c131ca93 100644 --- a/compat/nedmalloc/malloc.c.h +++ b/compat/nedmalloc/malloc.c.h @@ -1755,10 +1755,10 @@ static FORCEINLINE void pthread_release_lock (MLOCK_T *sl) { assert(sl->l != 0); assert(sl->threadid == CURRENT_THREAD); if (--sl->c == 0) { - sl->threadid = 0; volatile unsigned int* lp = &sl->l; int prev = 0; int ret; + sl->threadid = 0; __asm__ __volatile__ ("lock; xchgl %0, %1" : "=r" (ret) : "m" (*(lp)), "0"(prev) From patchwork Wed Aug 7 13:09:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Scharfe?= X-Patchwork-Id: 11082139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6E6D11395 for ; Wed, 7 Aug 2019 13:09:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E2ED28A32 for ; Wed, 7 Aug 2019 13:09:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51B8E28A33; Wed, 7 Aug 2019 13:09:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D818F28421 for ; Wed, 7 Aug 2019 13:09:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387981AbfHGNJH (ORCPT ); Wed, 7 Aug 2019 09:09:07 -0400 Received: from mout.web.de ([212.227.15.4]:49231 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726873AbfHGNJG (ORCPT ); Wed, 7 Aug 2019 09:09:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1565183342; bh=5syvMQWVIsQaCmRocbkSA2sBjepuQEoaCbOQfmTI8Wg=; h=X-UI-Sender-Class:Subject:From:To:Cc:References:Date:In-Reply-To; b=qV3N1Kg6EBvv5Bke1+S446Ne3hx85Ec5A8gQbUfTa/g4WOaHbk7TwyOjSp71YfWff n+3lUGL0GVqM2o3owXBodI5O18YGWfEkd95aixz4XBz/HfQhb1EUjNj2qJsvFa4iQY g0/938rncujLmRIoHjL5HbZyOtcbEviP3whE6uFA= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.23] ([79.203.24.71]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MCZfe-1i3dPQ2dAg-009SEE; Wed, 07 Aug 2019 15:09:02 +0200 Subject: [PATCH 2/2] nedmalloc: avoid compiler warning about unused value From: =?utf-8?q?Ren=C3=A9_Scharfe?= To: Carlo Arenas Cc: git@vger.kernel.org, gitster@pobox.com, johannes.schindelin@gmx.de, avarab@gmail.com, michal.kiedrowicz@gmail.com References: <20190806085014.47776-1-carenas@gmail.com> <20190806163658.66932-1-carenas@gmail.com> <20190806163658.66932-3-carenas@gmail.com> Message-ID: <5933e4d2-8141-efd9-9ed4-76946a84974b@web.de> Date: Wed, 7 Aug 2019 15:09:02 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Provags-ID: V03:K1:ik0G8RVWw3b/wCo6ZO6vUu19GqdFj7/KeLZUzuD2WLvWAxDXdXB FJtLqzffXK/oWxEWAPOujDhwGc6ekZWdloKDaz3x5V2hRxW8AujR0g0Zh236LZE2fpqS0Hd Shc/J91ime1ODMXXqMcRYgOdTNtzdxAEYYTL9DiX93RIPqp1blsLQBdqojoP2Tl8UbtXobv alhbjKxrMQAYo6qTJ+mQw== X-UI-Out-Filterresults: notjunk:1;V03:K0:S8JJSBgwprc=:FClAZEh3wPMNAs1aS+z9xi Y8khAXoZlxWxt45Hk7JJkecJEoTwNa2Bd+Mp+tDt7POa8rBNAYmnJtAwMP/ofl3NzO/80Ige8 tFQoWFn+0a/knMy8s5Gay9rUaJKjseQcK1lCfndIG4QmZgEIf3ILpmKmhwHGLju4+Iym3zZRq zKiaSci99Fg10k898ofFqBKAZ6UbnRYgE9UBV/iQxzAPenMMPEmd5xi9pg5HnQF+06HSccGIK bxfQs+aJI10+FZCe9kUxlsbtN5y6841luQER0erqtvjB2yEi7VSn0bkVouRD9z6M4a2WFE0TD Py6dwEWrA3l6KqQxoL7QO8HVv4SDTmOT4CIF0V4xnF0FXU1kD6KM38AeNz/70+h8VrVY8zspJ V5nR9mrPurVcvEKOjIxzLvipuhLOoX50vD9uxJCKntDO0MJgun3s27d+QLbILGMyxZH2v8fsg S+C1rJUzVsZ8V2LRLHu0EOziJS2tsiQTBMVLn+Z6k8mZF9rHHbPlRmDk8uDyvaJo0M+JDOzG/ x54XAhcU0OIenvQQcAIUtSoVntrBGaPlWQh3XwnhzPeG5vq2tMLKDqX+K4ZwaYe7BN5R2rbkR 9SG5uGi8HuZ2qe8vOIIgnFF6zbgVoZwelGGhpscU+SYSx3+jKbhDj/Cuo+ESRRE8XtEp/+BbA MiIc76qbGK/UhirwAk07R0DEHNTSQGZCsIGXe7Im2WX35Sc7coVRUOHQPt89Iuumu7wmxZHk+ RY9tNeEC2nl78qZ6UK0PG5NR7grdqxHzRylkjsP/QNRRZS9KBLgcnC7MWqmdwh01AZ07WJ8s9 7FCFFpGDYm5yKh8pzGtkeq99YoQW2bZpdjuQo85zNoORStn3UbSfu/izvtWCS1w5z3so9+xgR t087l5kbzJyzo6BjVgHOYNVo+g7T/fUoFM5HW92UTFeW6NqVmVMdAbXd1mcVEeORUo+SDTYdH 48O8ZCNO+3Ru9WqPHdbV8Rz6qgZ3n9o3goFvOAUWXIG9vXXlp3MnpwQi/2PUH8ojOPDL/2BHA ShL3qHQd/DbhzStV3wX5USyDBgxER72oManlMvBtY+2jETaDXkURaCMrIwLBhSFYKyTxve7aU 924DgqDG757l0gjTeJAnVIeZv4M2of9AxTvvsjKEp5JKhzjCCk6pq34gFTtZBgwPYBsELfWCp gZG80= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Cast the evaluated value of the macro INITIAL_LOCK to void to instruct the compiler that we're not interested in said value nor the following warning: In file included from compat/nedmalloc/nedmalloc.c:63: compat/nedmalloc/malloc.c.h: In function ‘init_user_mstate’: compat/nedmalloc/malloc.c.h:1706:62: error: right-hand operand of comma expression has no effect [-Werror=unused-value] 1706 | #define INITIAL_LOCK(sl) (memset(sl, 0, sizeof(MLOCK_T)), 0) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ compat/nedmalloc/malloc.c.h:5020:3: note: in expansion of macro ‘INITIAL_LOCK’ 5020 | INITIAL_LOCK(&m->mutex); | ^~~~~~~~~~~~ Signed-off-by: René Scharfe --- compat/nedmalloc/malloc.c.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.22.0 diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h index 88c131ca93..9134349590 100644 --- a/compat/nedmalloc/malloc.c.h +++ b/compat/nedmalloc/malloc.c.h @@ -3066,7 +3066,7 @@ static int init_mparams(void) { #if !ONLY_MSPACES /* Set up lock for main malloc area */ gm->mflags = mparams.default_mflags; - INITIAL_LOCK(&gm->mutex); + (void)INITIAL_LOCK(&gm->mutex); #endif #if (FOOTERS && !INSECURE) @@ -5017,7 +5017,7 @@ static mstate init_user_mstate(char* tbase, size_t tsize) { mchunkptr msp = align_as_chunk(tbase); mstate m = (mstate)(chunk2mem(msp)); memset(m, 0, msize); - INITIAL_LOCK(&m->mutex); + (void)INITIAL_LOCK(&m->mutex); msp->head = (msize|PINUSE_BIT|CINUSE_BIT); m->seg.base = m->least_addr = tbase; m->seg.size = m->footprint = m->max_footprint = tsize;