From patchwork Fri Feb 24 14:28:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 65594 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3B433384F002 for ; Fri, 24 Feb 2023 14:28:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3B433384F002 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677248923; bh=tZ3GqxVPL4kCCkzdESQkkSGbn8USBfxWncrfp/E3VvQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=OFevHXwQHNOatJ+HwTxNr6iS15R1JBNkImHmWweSgriMzRXKpdNTF14SoV0/rXtEE vbNPpZKBGpBRbEO3J+7PQ6ynQBoquBamKZ6IP9uBZHRFoHjLYNSxZ68v08zTTYMObX xg5FikFPhie/6RQc0WlE/SoECdpMLWn2BMWNwmTY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id AC3E53857365 for ; Fri, 24 Feb 2023 14:28:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AC3E53857365 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-68-ynXBJp27OiOwQOYRIdMP7A-1; Fri, 24 Feb 2023 09:28:09 -0500 X-MC-Unique: ynXBJp27OiOwQOYRIdMP7A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 26DAF95D601; Fri, 24 Feb 2023 14:28:09 +0000 (UTC) Received: from localhost (unknown [10.33.36.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id E54FD404BEC0; Fri, 24 Feb 2023 14:28:08 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed 1/5] libstdc++: Optimize net::ip::address_v4::to_string() Date: Fri, 24 Feb 2023 14:28:04 +0000 Message-Id: <20230224142808.714075-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-linux. Pushed to trunk. -- >8 -- This is an order of magnitude faster than calling inet_ntop (and not only because we now avoid allocating a string that is one byte larger than the SSO buffer). libstdc++-v3/ChangeLog: * include/experimental/internet (address_v4::to_string): Optimize. * testsuite/experimental/net/internet/address/v4/members.cc: Check more addresses. --- libstdc++-v3/include/experimental/internet | 28 +++++++++++++------ .../net/internet/address/v4/members.cc | 11 ++++++++ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/include/experimental/internet b/libstdc++-v3/include/experimental/internet index 707370d5611..08bd0db4bb2 100644 --- a/libstdc++-v3/include/experimental/internet +++ b/libstdc++-v3/include/experimental/internet @@ -44,6 +44,7 @@ #include #include #include +#include #ifdef _GLIBCXX_HAVE_UNISTD_H # include #endif @@ -241,17 +242,28 @@ namespace ip __string_with<_Allocator> to_string(const _Allocator& __a = _Allocator()) const { -#ifdef _GLIBCXX_HAVE_ARPA_INET_H + auto __write = [__addr = to_uint()](char* __p, size_t __n) { + auto __to_chars = [](char* __p, uint8_t __v) { + unsigned __n = __v >= 100u ? 3 : __v >= 10u ? 2 : 1; + std::__detail::__to_chars_10_impl(__p, __n, __v); + return __p + __n; + }; + const auto __begin = __p; + __p = __to_chars(__p, uint8_t(__addr >> 24)); + for (int __i = 2; __i >= 0; __i--) { + *__p++ = '.'; + __p = __to_chars(__p, uint8_t(__addr >> (__i * 8))); + } + return __p - __begin; + }; __string_with<_Allocator> __str(__a); - __str.resize(INET_ADDRSTRLEN); - if (inet_ntop(AF_INET, &_M_addr, &__str.front(), __str.size())) - __str.erase(__str.find('\0')); - else - __str.resize(0); - return __str; +#if __cpp_lib_string_resize_and_overwrite + __str.resize_and_overwrite(15, __write); #else - std::__throw_system_error((int)__unsupported_err()); + __str.resize(15); + __str.resize(__write(&__str.front(), 15)); #endif + return __str; } // static members: diff --git a/libstdc++-v3/testsuite/experimental/net/internet/address/v4/members.cc b/libstdc++-v3/testsuite/experimental/net/internet/address/v4/members.cc index df19b11804d..c40a8103664 100644 --- a/libstdc++-v3/testsuite/experimental/net/internet/address/v4/members.cc +++ b/libstdc++-v3/testsuite/experimental/net/internet/address/v4/members.cc @@ -22,6 +22,7 @@ #include #include #include +#include using std::experimental::net::ip::address_v4; @@ -100,6 +101,16 @@ test04() VERIFY( address_v4::any().to_string() == "0.0.0.0" ); VERIFY( address_v4::loopback().to_string() == "127.0.0.1" ); VERIFY( address_v4::broadcast().to_string() == "255.255.255.255" ); + using b = address_v4::bytes_type; + VERIFY( address_v4(b(1, 23, 45, 67)).to_string() == "1.23.45.67" ); + VERIFY( address_v4(b(12, 34, 56, 78)).to_string() == "12.34.56.78" ); + VERIFY( address_v4(b(123, 4, 5, 6)).to_string() == "123.4.5.6" ); + VERIFY( address_v4(b(123, 234, 124, 235)).to_string() == "123.234.124.235" ); + + __gnu_test::uneq_allocator alloc(123); + auto str = address_v4(b(12, 34, 56, 78)).to_string(alloc); + VERIFY(str.get_allocator().get_personality() == alloc.get_personality()); + VERIFY( str == "12.34.56.78" ); } void