From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by sourceware.org (Postfix) with ESMTPS id 5C7BA3858D1E; Thu, 8 Sep 2022 05:03:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5C7BA3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-x535.google.com with SMTP id z21so12580137edi.1; Wed, 07 Sep 2022 22:03:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date; bh=OSz00FSU16TaA3PhIwqAsOxOMYpvBw2ltzWAuUO68Zs=; b=palpEvTK4IQuSGvUoA3qKdoLdTZCotdybWlPaA682iZNpQtgXLOc0jR5rb8Z2E8zvd mcsAKCccEidkOXJ1mBjwxZXfev6XJLtu1LOz+E0SrP4Erg3TAEv/C2J+U5GLQnO4sqxA Qf9OV8K9I9LP5zznC6boyewA/z1eiyxZQMU7nfJzeNSVY0RoMTat+/tJ7VGXB/u7ElkC TLa5VLJGWK1DsTnWUkrgdag5TBvpanmsUGw5h2uFeHeEhQiS5fSh/8TSz8G0+o5rIEpz ywRyYdwc6bckOGNa2kPL8C1GhiIL2UYsp8iYaXpUYTILVLoiy6KmhnJBjvall03sqWEd a4ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date; bh=OSz00FSU16TaA3PhIwqAsOxOMYpvBw2ltzWAuUO68Zs=; b=3mINqGRbDXfYENYM8CSC6CVxxcDIHyOQuu8oQujy0oz2+qyQKS+B+igCK3GIT7ToMW Gl9AS4FaifIrKpCnDxs7p/2HOfEZ3KfIffNiaGLY0SHswh4KW0XmE9B69eii+Xx+TmK6 LQNDZmCRkG3jFvk5Par5g2V0kIKoo5H2Vjk6dmKFt5xBrlZom6GYpD58eKC3cEm4RtCt cByNfv07uOPENUyiIroZwEIpc9XQNR6TKRrejTPvZ2nN/oLvDI1/FXzKy7en//atp/fa EJAUdRUKVtDF88bDJHX3wgoo8WeiQ4Kgqg0rHsVKfnmeVvnMV6mB1r289mPHz9U+CtB8 7Q0g== X-Gm-Message-State: ACgBeo2SQjfbVfOfvZWWo0fdvlS0G2uVs5ybOV7XA5WkugWvCSUzbgwP 6S6tQwMGl2W8fvEmwYqA9HU= X-Google-Smtp-Source: AA6agR61U/yYV01MeI6S5CXTssIb/UfHWEjTQqXr2gEe1gHEM6H4Onr40n4dvx6tvwE/N2VCoaKL2A== X-Received: by 2002:a05:6402:1446:b0:44e:ec98:3e11 with SMTP id d6-20020a056402144600b0044eec983e11mr5694476edx.90.1662613432972; Wed, 07 Sep 2022 22:03:52 -0700 (PDT) Received: from [10.22.3.102] ([109.190.253.11]) by smtp.googlemail.com with ESMTPSA id ly4-20020a170906af4400b0073bdf71995dsm726407ejb.139.2022.09.07.22.03.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 07 Sep 2022 22:03:52 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------0gDzDVfHMg5HOMNVmalkXawP" Message-ID: <5d4e8613-c9f9-f63d-c739-fdd126f9e83a@gmail.com> Date: Thu, 8 Sep 2022 07:03:49 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH] Use mallinfo2 with glibc >= 2.33 Content-Language: fr To: Jonathan Wakely Cc: "libstdc++@gcc.gnu.org" , gcc-patches References: From: =?UTF-8?Q?Fran=c3=a7ois_Dumont?= In-Reply-To: X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_NUMSUBJECT,NICE_REPLY_A,RCVD_IN_BARRACUDACENTRAL,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This is a multi-part message in MIME format. --------------0gDzDVfHMg5HOMNVmalkXawP Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit     libstdc++: glibc mallinfo deprecated, use mallinfo2 when version => 2.33     glibc mallinfo is now deprecated resulting in make check-performance     failure. When glibc => 2.33 prefer mallinfo2.     libstdcxx-v3/ChangeLog:             * testsuite/util/testsuite_performance.h (__gnu_test::MallocInfo): New.             (__gnu_test::malloc_info): New, replace mallinfo on current platform             supporting it and use mallinfo2 when glibc >= 2.33. Tested under Linux x86_64. Ok to commit ? François On 07/09/22 19:10, Jonathan Wakely wrote: > On Wed, 7 Sept 2022 at 18:03, François Dumont via Libstdc++ > wrote: >> libstdc++: Use glibc >= 2.33 mallinfo2 function >> >> mallinfo started to be deprecated which makes performance tests failed >> to build, just >> adopt mallinfo2. >> >> libstdcxx-v3/ChangeLog: >> >> * testsuite/util/testsuite_performance.h (__mallinfo): New, our >> own mallinfo > There's no reason to use a reserved name here, this isn't a header > that users include. > > I would call the struct MallocInfo and the function malloc_info(). > Even better, put them both in namespace __gnu_test, as > __gnu_test::MallocInfo and __gnu_test::malloc_info (without the extern > "C" language linkage). If we're not calling the glibc function > directly, but via our own wrapper, then there's no reason it has to > use the name "mallinfo", no reason it has to be in the global > namespace, and no reason it has to be extern "C" (in fact, I don't > think there was ever a reason for it to be extern "C"). > > > >> struct with just what we need. When using glibc >= 2.33 use >> mallinfo2 to >> populate it. >> >> Tested under Linux x86_64, >> >> Ok to commit ? >> >> François --------------0gDzDVfHMg5HOMNVmalkXawP Content-Type: text/x-patch; charset=UTF-8; name="mallinfo.patch" Content-Disposition: attachment; filename="mallinfo.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpYnN0ZGMrKy12My90ZXN0c3VpdGUvdXRpbC90ZXN0c3VpdGVfcGVy Zm9ybWFuY2UuaCBiL2xpYnN0ZGMrKy12My90ZXN0c3VpdGUvdXRpbC90ZXN0c3VpdGVfcGVy Zm9ybWFuY2UuaAppbmRleCAyZTA1YmVmODQ2MC4uNGY4YjFlYWI4YjkgMTAwNjQ0Ci0tLSBh L2xpYnN0ZGMrKy12My90ZXN0c3VpdGUvdXRpbC90ZXN0c3VpdGVfcGVyZm9ybWFuY2UuaAor KysgYi9saWJzdGRjKystdjMvdGVzdHN1aXRlL3V0aWwvdGVzdHN1aXRlX3BlcmZvcm1hbmNl LmgKQEAgLTM2LDQyICszNiwzOSBAQAogI2luY2x1ZGUgPHRlc3RzdWl0ZV9jb21tb25fdHlw ZXMuaD4KIAogI2lmIGRlZmluZWQgKF9fbGludXhfXykgfHwgZGVmaW5lZCAoX19HTElCQ19f KQotI2luY2x1ZGUgPG1hbGxvYy5oPgotI2VsaWYgZGVmaW5lZCAoX19GcmVlQlNEX18pCi1l eHRlcm4gIkMiCi17Ci0gIHN0cnVjdCBtYWxsaW5mbwotICB7Ci0gICAgaW50IHVvcmRibGtz OwotICAgIGludCBoYmxraGQ7Ci0gIH07CisjaW5jbHVkZSA8bWFsbG9jLmg+IC8vIEZvciBt YWxsaW5mby4KKyNlbmRpZgogCi0gIHN0cnVjdCBtYWxsaW5mbwotICBtYWxsaW5mbyh2b2lk KQotICB7Ci0gICAgc3RydWN0IG1hbGxpbmZvIG0gPSB7ICgoKHN0ZDo6c2l6ZV90KSBzYnJr ICgwKSArIDEwMjMpIC8gMTAyNCksIDAgfTsKLSAgICByZXR1cm4gbTsKLSAgfQotfQotI2Vs aWYgIWRlZmluZWQgKF9faHB1eF9fKQotZXh0ZXJuICJDIgorbmFtZXNwYWNlIF9fZ251X3Rl c3QKIHsKLSAgc3RydWN0IG1hbGxpbmZvCisgIHN0cnVjdCBNYWxsb2NJbmZvCiAgIHsKLSAg ICBpbnQgdW9yZGJsa3M7Ci0gICAgaW50IGhibGtoZDsKLSAgfTsKKyAgICBNYWxsb2NJbmZv KCkgOiB1b3JkYmxrcygwKSwgaGJsa2hkKDApIHsgfQorICAgIE1hbGxvY0luZm8oc3RkOjpz aXplX3QgdW9yZGJsb2Nrcywgc3RkOjpzaXplX3QgaGJsb2NraGQpCisgICAgICA6IHVvcmRi bGtzKHVvcmRibG9ja3MpLCBoYmxraGQoaGJsb2NraGQpCisgICAgeyB9CiAKLSAgc3RydWN0 IG1hbGxpbmZvIGVtcHR5ID0geyAwLCAwIH07CisgICAgc3RkOjpzaXplX3QgdW9yZGJsa3M7 CisgICAgc3RkOjpzaXplX3QgaGJsa2hkOworICB9OwogCi0gIHN0cnVjdCBtYWxsaW5mbwot ICBtYWxsaW5mbyh2b2lkKQotICB7IHJldHVybiBlbXB0eTsgfQotfQorICBNYWxsb2NJbmZv CisgIG1hbGxvY19pbmZvKCkKKyAgeworI2lmIGRlZmluZWQgKF9fbGludXhfXykgfHwgZGVm aW5lZCAoX19ocHV4X18pIHx8IGRlZmluZWQgKF9fR0xJQkNfXykKKyNpZiBfX0dMSUJDX18g PiAyIHx8IF9fR0xJQkNfXyA9PSAyICYmIF9fR0xJQkNfTUlOT1JfXyA+PSAzMworICAgIHN0 cnVjdCBtYWxsaW5mbzIgbWkgPSBtYWxsaW5mbzIoKTsKKyNlbHNlCisgICAgc3RydWN0IG1h bGxpbmZvIG1pID0gbWFsbGluZm8oKTsKKyNlbmRpZgorICAgIHJldHVybiBNYWxsb2NJbmZv KG1pLnVvcmRibGtzLCBtaS5oYmxraGQpOworI2VsaWYgZGVmaW5lZCAoX19GcmVlQlNEX18p CisgICAgcmV0dXJuIE1hbGxvY0luZm8oKCgoc3RkOjpzaXplX3QpIHNicmsgKDApICsgMTAy MykgLyAxMDI0KSwgMCk7CisjZWxzZQorICAgIHJldHVybiBNYWxsb2NJbmZvKCk7CiAjZW5k aWYKKyAgfQogCi1uYW1lc3BhY2UgX19nbnVfdGVzdAotewogICBjbGFzcyB0aW1lX2NvdW50 ZXIKICAgewogICBwcml2YXRlOgpAQCAtMTQ2LDggKzE0Myw4IEBAIG5hbWVzcGFjZSBfX2du dV90ZXN0CiAgICAgaW50ICAgICAgICAgICAgICAgICB3aG87CiAgICAgcnVzYWdlCSAgICAg ICAgcnVzYWdlX2JlZ2luOwogICAgIHJ1c2FnZQkgICAgICAgIHJ1c2FnZV9lbmQ7Ci0gICAg c3RydWN0IG1hbGxpbmZvICAJYWxsb2NhdGlvbl9iZWdpbjsKLSAgICBzdHJ1Y3QgbWFsbGlu Zm8gIAlhbGxvY2F0aW9uX2VuZDsKKyAgICBNYWxsb2NJbmZvICAJYWxsb2NhdGlvbl9iZWdp bjsKKyAgICBNYWxsb2NJbmZvICAJYWxsb2NhdGlvbl9lbmQ7CiAKICAgcHVibGljOgogICAg IHJlc291cmNlX2NvdW50ZXIoaW50IGkgPSBSVVNBR0VfU0VMRikgOiB3aG8oaSkKQEAgLTE2 OCw3ICsxNjUsNyBAQCBuYW1lc3BhY2UgX19nbnVfdGVzdAogICAgICAgaWYgKGdldHJ1c2Fn ZSh3aG8sICZydXNhZ2VfYmVnaW4pICE9IDAgKQogCW1lbXNldCgmcnVzYWdlX2JlZ2luLCAw LCBzaXplb2YocnVzYWdlX2JlZ2luKSk7CiAgICAgICB2b2lkKiBwIF9fYXR0cmlidXRlX18o KHVudXNlZCkpID0gbWFsbG9jKDApOyAvLyBOZWVkZWQgZm9yIHNvbWUgaW1wbGVtZW50YXRp b25zLgotICAgICAgYWxsb2NhdGlvbl9iZWdpbiA9IG1hbGxpbmZvKCk7CisgICAgICBhbGxv Y2F0aW9uX2JlZ2luID0gbWFsbG9jX2luZm8oKTsKICAgICB9CiAKICAgICB2b2lkCkBAIC0x NzYsNyArMTczLDcgQEAgbmFtZXNwYWNlIF9fZ251X3Rlc3QKICAgICB7CiAgICAgICBpZiAo Z2V0cnVzYWdlKHdobywgJnJ1c2FnZV9lbmQpICE9IDAgKQogCW1lbXNldCgmcnVzYWdlX2Vu ZCwgMCwgc2l6ZW9mKHJ1c2FnZV9lbmQpKTsKLSAgICAgIGFsbG9jYXRpb25fZW5kID0gbWFs bGluZm8oKTsKKyAgICAgIGFsbG9jYXRpb25fZW5kID0gbWFsbG9jX2luZm8oKTsKICAgICB9 CiAKICAgICBpbnQK --------------0gDzDVfHMg5HOMNVmalkXawP--