From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by sourceware.org (Postfix) with ESMTPS id 311FE3858D28; Wed, 7 Sep 2022 17:02:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 311FE3858D28 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-x530.google.com with SMTP id r4so20644091edi.8; Wed, 07 Sep 2022 10:02:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date; bh=VcP4zpTrhpSVkoBKxk8UGI69DuM+tn2iM8+9ClSntRc=; b=nSpm0ufr08/58lTBQyVmaaemrEtJd0GpexwsiOIugz7XzAFrYsx5T2KTzj7K0J7mpM 7SUSbjVFMlxxUqxS4OY235kpimA6EgVGAUAA6zpl0sFPdDMBMwn0v7knc8QfSjM2Bu/v 74YgtsHNqgSdNo6NzxELT98waoMbZeIiNIOBOkHUTGi3cBkSOcgGYK3wMND0/PU7wqbq HDor1+JmV3L9b1pPvQz7eI0hsZ221kAfXY8A3hU1hiaTImgz9spE1z7HQD8MwlJAXbc/ SIKMNN3p3ydgttwwmd+XhH8DEdHbHxf3LEPmAPuZBU2bte7jR7sm35Q8e9Uykmjwi3B+ oM8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date; bh=VcP4zpTrhpSVkoBKxk8UGI69DuM+tn2iM8+9ClSntRc=; b=DQFWtG71hKZkGZmSmO9Mp5VFE7mMBepD2Bp1WfsZIV2VfF8qyOpZ67zd09Czo/DXB1 OFkjCEuyq8MLIJnV1OnLOd3OiPDpRRKrJXMiVDEXev/g0LAa/tCpwsyy5QOp3xgJQMos KmEvahdgLyVeGb2UN8/sonZUYnb9EntTxztlkOW8Pe9/om94B64bJK1mKwyAPjCY0uJF 9SBuAOfoB/sSh9313n65m7fwDirkwhI5emMpgf1+Ogs+Bex2+vwCMGrtelGsE3ixgiT1 lfWlXjx1JSnWA+nYhde0VGG9R3miZUVPRajYhoQKzExp5nCoZHQBb+yqbpztS70VwzPA kx7Q== X-Gm-Message-State: ACgBeo040/5Ec8/GmLRszQWPO+3N9TReYKiAHoQ4ljQcpWzuZzvJh/bO YZfpenT3sipl3iZtxfYGG60l5BvCk5l3ig== X-Google-Smtp-Source: AA6agR7hGJn4k5r0CypUd8ZYO3RwRsMRy9T4C+AGlQra9Id7J9iVKa3QymDpdOeeWZXjOL/T2rXgPA== X-Received: by 2002:a05:6402:1771:b0:44e:e4ec:1b1c with SMTP id da17-20020a056402177100b0044ee4ec1b1cmr3899352edb.231.1662570164544; Wed, 07 Sep 2022 10:02:44 -0700 (PDT) Received: from [10.49.1.93] ([109.190.253.15]) by smtp.googlemail.com with ESMTPSA id fi5-20020a170906da0500b0076f0ab594e9sm2916768ejb.73.2022.09.07.10.02.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 07 Sep 2022 10:02:43 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------KZhE3Y2ATTIdC0gq1PaNKzhJ" Message-ID: Date: Wed, 7 Sep 2022 19:02:39 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: fr To: "libstdc++@gcc.gnu.org" Cc: gcc-patches From: =?UTF-8?Q?Fran=c3=a7ois_Dumont?= Subject: [PATCH] Use mallinfo2 with glibc >= 2.33 X-Spam-Status: No, score=-7.3 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,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. --------------KZhE3Y2ATTIdC0gq1PaNKzhJ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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         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 --------------KZhE3Y2ATTIdC0gq1PaNKzhJ Content-Type: text/x-patch; charset=UTF-8; name="mallinfo.patch" Content-Disposition: attachment; filename="mallinfo.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpYnN0ZGMrKy12My90ZXN0c3VpdGUvdXRpbC90ZXN0c3VpdGVfcGVy Zm9ybWFuY2UuaCBiL2xpYnN0ZGMrKy12My90ZXN0c3VpdGUvdXRpbC90ZXN0c3VpdGVfcGVy Zm9ybWFuY2UuaAppbmRleCAyZTA1YmVmODQ2MC4uZGMwMDJiOGMzOTAgMTAwNjQ0Ci0tLSBh L2xpYnN0ZGMrKy12My90ZXN0c3VpdGUvdXRpbC90ZXN0c3VpdGVfcGVyZm9ybWFuY2UuaAor KysgYi9saWJzdGRjKystdjMvdGVzdHN1aXRlL3V0aWwvdGVzdHN1aXRlX3BlcmZvcm1hbmNl LmgKQEAgLTM1LDM3ICszNSw0OSBAQAogI2luY2x1ZGUgPGN4eGFiaS5oPgogI2luY2x1ZGUg PHRlc3RzdWl0ZV9jb21tb25fdHlwZXMuaD4KIAotI2lmIGRlZmluZWQgKF9fbGludXhfXykg fHwgZGVmaW5lZCAoX19HTElCQ19fKQotI2luY2x1ZGUgPG1hbGxvYy5oPgotI2VsaWYgZGVm aW5lZCAoX19GcmVlQlNEX18pCiBleHRlcm4gIkMiCiB7Ci0gIHN0cnVjdCBtYWxsaW5mbwor ICBzdHJ1Y3QgX19tYWxsaW5mbwogICB7Ci0gICAgaW50IHVvcmRibGtzOwotICAgIGludCBo YmxraGQ7CisgICAgc2l6ZV90IHVvcmRibGtzOworICAgIHNpemVfdCBoYmxraGQ7CiAgIH07 Cit9CiAKLSAgc3RydWN0IG1hbGxpbmZvCi0gIG1hbGxpbmZvKHZvaWQpCisjaWYgZGVmaW5l ZCAoX19saW51eF9fKSB8fCBkZWZpbmVkIChfX0dMSUJDX18pCisjaW5jbHVkZSA8bWFsbG9j Lmg+CitleHRlcm4gIkMiCit7CisgIHN0cnVjdCBfX21hbGxpbmZvCisgIF9fbWFsbGluZm8o dm9pZCkKKyAgeworI2lmIF9fR0xJQkNfXyA+PSAyICYmIF9fR0xJQkNfTUlOT1JfXyA+PSAz MworICAgIHN0cnVjdCBtYWxsaW5mbzIgbWkgPSBtYWxsaW5mbzIoKTsKKyAgICBzdHJ1Y3Qg X19tYWxsaW5mbyBtID0geyBtaS51b3JkYmxrcywgbWkuaGJsa2hkIH07CisjZWxzZQorICAg IHN0cnVjdCBtYWxsaW5mbyBtaSA9IG1hbGxpbmZvKCk7CisgICAgc3RydWN0IF9fbWFsbGlu Zm8gbSA9IHsgbWkudW9yZGJsa3MsIG1pLmhibGtoZCB9OworI2VuZGlmCisgICAgcmV0dXJu IG07CisgIH0KK30KKyNlbGlmIGRlZmluZWQgKF9fRnJlZUJTRF9fKQorZXh0ZXJuICJDIgor eworICBzdHJ1Y3QgX19tYWxsaW5mbworICBfX21hbGxpbmZvKHZvaWQpCiAgIHsKLSAgICBz dHJ1Y3QgbWFsbGluZm8gbSA9IHsgKCgoc3RkOjpzaXplX3QpIHNicmsgKDApICsgMTAyMykg LyAxMDI0KSwgMCB9OworICAgIHN0cnVjdCBfX21hbGxpbmZvIG0gPSB7ICgoKHN0ZDo6c2l6 ZV90KSBzYnJrICgwKSArIDEwMjMpIC8gMTAyNCksIDAgfTsKICAgICByZXR1cm4gbTsKICAg fQogfQogI2VsaWYgIWRlZmluZWQgKF9faHB1eF9fKQogZXh0ZXJuICJDIgogewotICBzdHJ1 Y3QgbWFsbGluZm8KLSAgewotICAgIGludCB1b3JkYmxrczsKLSAgICBpbnQgaGJsa2hkOwot ICB9OwotCi0gIHN0cnVjdCBtYWxsaW5mbyBlbXB0eSA9IHsgMCwgMCB9OworICBzdHJ1Y3Qg X19tYWxsaW5mbyBlbXB0eSA9IHsgMCwgMCB9OwogCi0gIHN0cnVjdCBtYWxsaW5mbwotICBt YWxsaW5mbyh2b2lkKQorICBzdHJ1Y3QgX19tYWxsaW5mbworICBfX21hbGxpbmZvKHZvaWQp CiAgIHsgcmV0dXJuIGVtcHR5OyB9CiB9CiAjZW5kaWYKQEAgLTE0Niw4ICsxNTgsOCBAQCBu YW1lc3BhY2UgX19nbnVfdGVzdAogICAgIGludCAgICAgICAgICAgICAgICAgd2hvOwogICAg IHJ1c2FnZQkgICAgICAgIHJ1c2FnZV9iZWdpbjsKICAgICBydXNhZ2UJICAgICAgICBydXNh Z2VfZW5kOwotICAgIHN0cnVjdCBtYWxsaW5mbyAgCWFsbG9jYXRpb25fYmVnaW47Ci0gICAg c3RydWN0IG1hbGxpbmZvICAJYWxsb2NhdGlvbl9lbmQ7CisgICAgc3RydWN0IF9fbWFsbGlu Zm8gIAlhbGxvY2F0aW9uX2JlZ2luOworICAgIHN0cnVjdCBfX21hbGxpbmZvICAJYWxsb2Nh dGlvbl9lbmQ7CiAKICAgcHVibGljOgogICAgIHJlc291cmNlX2NvdW50ZXIoaW50IGkgPSBS VVNBR0VfU0VMRikgOiB3aG8oaSkKQEAgLTE2OCw3ICsxODAsNyBAQCBuYW1lc3BhY2UgX19n bnVfdGVzdAogICAgICAgaWYgKGdldHJ1c2FnZSh3aG8sICZydXNhZ2VfYmVnaW4pICE9IDAg KQogCW1lbXNldCgmcnVzYWdlX2JlZ2luLCAwLCBzaXplb2YocnVzYWdlX2JlZ2luKSk7CiAg ICAgICB2b2lkKiBwIF9fYXR0cmlidXRlX18oKHVudXNlZCkpID0gbWFsbG9jKDApOyAvLyBO ZWVkZWQgZm9yIHNvbWUgaW1wbGVtZW50YXRpb25zLgotICAgICAgYWxsb2NhdGlvbl9iZWdp biA9IG1hbGxpbmZvKCk7CisgICAgICBhbGxvY2F0aW9uX2JlZ2luID0gX19tYWxsaW5mbygp OwogICAgIH0KIAogICAgIHZvaWQKQEAgLTE3Niw3ICsxODgsNyBAQCBuYW1lc3BhY2UgX19n bnVfdGVzdAogICAgIHsKICAgICAgIGlmIChnZXRydXNhZ2Uod2hvLCAmcnVzYWdlX2VuZCkg IT0gMCApCiAJbWVtc2V0KCZydXNhZ2VfZW5kLCAwLCBzaXplb2YocnVzYWdlX2VuZCkpOwot ICAgICAgYWxsb2NhdGlvbl9lbmQgPSBtYWxsaW5mbygpOworICAgICAgYWxsb2NhdGlvbl9l bmQgPSBfX21hbGxpbmZvKCk7CiAgICAgfQogCiAgICAgaW50Cg== --------------KZhE3Y2ATTIdC0gq1PaNKzhJ--