From patchwork Fri Dec 16 20:15:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 55366 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 852133840121 for ; Fri, 16 Dec 2022 20:15:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 852133840121 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671221733; bh=QEClZfm3Wvin552HM5sPSAZEUlJTOVjKurbUcicODi4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=rqHPmg17KnYLwLjaU7dB62ZdSJ0hF8q/j81T4W3tUAA8j8SGXbFGVtRj20L1WlZZ2 p8KSZbgBvE6tgjCQovPKtdhKDqYOUS0jyH700TgpR+g8uLF86KDKRQxmxvzbcoozg8 a8OgKRxif8rBg2HAAbzSEo1mdhX4C+sBX+wCqFZg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 9BCFE38518A3 for ; Fri, 16 Dec 2022 20:15:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9BCFE38518A3 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-649-ZrCZAvUKM4q8lxqBHLeYAg-1; Fri, 16 Dec 2022 15:15:06 -0500 X-MC-Unique: ZrCZAvUKM4q8lxqBHLeYAg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4B6BD2801E5C for ; Fri, 16 Dec 2022 20:15:06 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.61]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 708F2400F58 for ; Fri, 16 Dec 2022 20:15:05 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v6 00/11] vfprintf refactor X-From-Line: d432961e08bf2c452c12644aeaeffbfe961a0ed3 Mon Sep 17 00:00:00 2001 Message-Id: Date: Fri, 16 Dec 2022 21:15:03 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This should address Adhemerval's review comments, I hope. I retested it on latest master on i686-linux-gnu and x86_64-linux-gnu. Built with build-many-glibcs.py. The tests included “elf: Fix tst-relro-symbols.py argument passing” (thanks for that!). Thanks, Florian Florian Weimer (11): locale: Implement struct grouping_iterator stdio-common: Introduce buffers for implementing printf stdio-common: Add __printf_function_invoke stdio-common: Add __translated_number_width stdio-common: Convert vfprintf and related functions to buffers stdio-common: Add lock optimization to vfprintf and vfwprintf libio: Convert __vsprintf_internal to buffers libio: Convert __vasprintf_internal to buffers libio: Convert __vdprintf_internal to buffers libio: Convert __obstack_vprintf_internal to buffers (bug 27124) libio: Convert __vswprintf_internal to buffers (bug 27857) elf/Makefile | 7 +- include/printf.h | 52 +- include/printf_buffer.h | 358 +++++++++ libio/iovdprintf.c | 67 +- libio/iovsprintf.c | 70 +- libio/obprintf.c | 170 ++-- libio/strfile.h | 3 - libio/tst-vtables-common.c | 9 +- libio/tst_swprintf.c | 31 +- libio/vasprintf.c | 141 ++-- libio/vsnprintf.c | 131 ++-- libio/vswprintf.c | 100 +-- manual/stdio.texi | 7 +- stdio-common/Makefile | 28 +- stdio-common/Xprintf_buffer_done.c | 40 + stdio-common/Xprintf_buffer_flush.c | 72 ++ stdio-common/Xprintf_buffer_pad_1.c | 44 ++ stdio-common/Xprintf_buffer_putc_1.c | 29 + stdio-common/Xprintf_buffer_puts_1.c | 38 + stdio-common/Xprintf_buffer_write.c | 44 ++ stdio-common/Xprintf_function_invoke.c | 58 ++ stdio-common/grouping_iterator.c | 126 +++ stdio-common/grouping_iterator.h | 65 ++ stdio-common/printf_buffer-char.h | 24 + stdio-common/printf_buffer-wchar_t.h | 24 + stdio-common/printf_buffer_as_file.c | 148 ++++ stdio-common/printf_buffer_as_file.h | 87 +++ stdio-common/printf_buffer_done.c | 21 + stdio-common/printf_buffer_flush.c | 81 ++ stdio-common/printf_buffer_pad_1.c | 21 + stdio-common/printf_buffer_putc_1.c | 21 + stdio-common/printf_buffer_puts_1.c | 21 + stdio-common/printf_buffer_to_file.c | 122 +++ stdio-common/printf_buffer_to_file.h | 57 ++ stdio-common/printf_buffer_write.c | 21 + stdio-common/printf_fp.c | 736 ++++++++---------- stdio-common/printf_fphex.c | 260 +++---- stdio-common/printf_function_invoke.c | 22 + stdio-common/translated_number_width.c | 42 + stdio-common/tst-grouping_iterator.c | 262 +++++++ stdio-common/vfprintf-internal.c | 672 +++++----------- stdio-common/vfprintf-process-arg.c | 172 ++-- stdio-common/wprintf_buffer_as_file.c | 153 ++++ stdio-common/wprintf_buffer_done.c | 21 + stdio-common/wprintf_buffer_flush.c | 42 + stdio-common/wprintf_buffer_pad_1.c | 21 + stdio-common/wprintf_buffer_putc_1.c | 21 + stdio-common/wprintf_buffer_puts_1.c | 21 + stdio-common/wprintf_buffer_to_file.c | 55 ++ stdio-common/wprintf_buffer_write.c | 21 + stdio-common/wprintf_function_invoke.c | 22 + stdlib/strfmon_l.c | 196 ++--- stdlib/strfrom-skeleton.c | 38 +- sysdeps/ia64/fpu/printf_fphex.c | 8 +- .../ieee754/ldbl-128/printf_fphex_macros.h | 36 +- sysdeps/ieee754/ldbl-128ibm/printf_fphex.c | 36 +- sysdeps/ieee754/ldbl-96/printf_fphex.c | 22 +- sysdeps/x86_64/fpu/printf_fphex.c | 21 +- 58 files changed, 3421 insertions(+), 1817 deletions(-) create mode 100644 include/printf_buffer.h create mode 100644 stdio-common/Xprintf_buffer_done.c create mode 100644 stdio-common/Xprintf_buffer_flush.c create mode 100644 stdio-common/Xprintf_buffer_pad_1.c create mode 100644 stdio-common/Xprintf_buffer_putc_1.c create mode 100644 stdio-common/Xprintf_buffer_puts_1.c create mode 100644 stdio-common/Xprintf_buffer_write.c create mode 100644 stdio-common/Xprintf_function_invoke.c create mode 100644 stdio-common/grouping_iterator.c create mode 100644 stdio-common/grouping_iterator.h create mode 100644 stdio-common/printf_buffer-char.h create mode 100644 stdio-common/printf_buffer-wchar_t.h create mode 100644 stdio-common/printf_buffer_as_file.c create mode 100644 stdio-common/printf_buffer_as_file.h create mode 100644 stdio-common/printf_buffer_done.c create mode 100644 stdio-common/printf_buffer_flush.c create mode 100644 stdio-common/printf_buffer_pad_1.c create mode 100644 stdio-common/printf_buffer_putc_1.c create mode 100644 stdio-common/printf_buffer_puts_1.c create mode 100644 stdio-common/printf_buffer_to_file.c create mode 100644 stdio-common/printf_buffer_to_file.h create mode 100644 stdio-common/printf_buffer_write.c create mode 100644 stdio-common/printf_function_invoke.c create mode 100644 stdio-common/translated_number_width.c create mode 100644 stdio-common/tst-grouping_iterator.c create mode 100644 stdio-common/wprintf_buffer_as_file.c create mode 100644 stdio-common/wprintf_buffer_done.c create mode 100644 stdio-common/wprintf_buffer_flush.c create mode 100644 stdio-common/wprintf_buffer_pad_1.c create mode 100644 stdio-common/wprintf_buffer_putc_1.c create mode 100644 stdio-common/wprintf_buffer_puts_1.c create mode 100644 stdio-common/wprintf_buffer_to_file.c create mode 100644 stdio-common/wprintf_buffer_write.c create mode 100644 stdio-common/wprintf_function_invoke.c base-commit: 71e408e45dcacf429a94b2807f75aaadd8d37cb9