From patchwork Mon May 23 14:08:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 54298 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 342EC383F94A for ; Mon, 23 May 2022 14:16:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 342EC383F94A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1653315377; bh=frUSdKYxkiqBBG3PGrbzuXSpNFiuLmBY2vRM9KBwhaI=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=o5tAff862QL3L+A822OaBDN+7cMQfJtOfbytUV2NX++Y7HX7ihHmYOWG2pEZrTIuq TvJv/9/gECAKmjsr9XUU8uGEan2jrgnsUobEW6Aty2Q1G5kUTDiyM5/FX1bQmwa8gp 5taGB6wTOkJtIenN9XmbWfeNToG+cCObrpV6ybik= 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 B2794386EC04 for ; Mon, 23 May 2022 14:08:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B2794386EC04 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-209-BppUCEi2NqSOnR2GiuMf4w-1; Mon, 23 May 2022 10:08:03 -0400 X-MC-Unique: BppUCEi2NqSOnR2GiuMf4w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6E38A3C16189 for ; Mon, 23 May 2022 14:08:03 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 99F5B2026D6A for ; Mon, 23 May 2022 14:08:02 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v2 12/14] libio: Convert __vdprintf_internal to buffers In-Reply-To: References: X-From-Line: 1038125a04a7a50fd37a91995132da62d95b3cde Mon Sep 17 00:00:00 2001 Message-Id: <1038125a04a7a50fd37a91995132da62d95b3cde.1653314701.git.fweimer@redhat.com> Date: Mon, 23 May 2022 16:08:00 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 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_LOW, SPF_HELO_NONE, SPF_NONE, 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 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" The internal buffer size is set to 2048 bytes. This is less than the original BUFSIZ value used by buffered_vfprintf before the conversion, but it hopefully covers all cases where write boundaries matter. --- include/printf_buffer.h | 4 ++ libio/iovdprintf.c | 69 ++++++++++++++++++------------ stdio-common/printf_buffer_flush.c | 4 ++ 3 files changed, 49 insertions(+), 28 deletions(-) diff --git a/include/printf_buffer.h b/include/printf_buffer.h index 0f3543d9b9..1943cd76f1 100644 --- a/include/printf_buffer.h +++ b/include/printf_buffer.h @@ -49,6 +49,7 @@ enum __printf_buffer_mode __printf_buffer_mode_sprintf_chk, __printf_buffer_mode_to_file, __printf_buffer_mode_asprintf, + __printf_buffer_mode_dprintf, __printf_buffer_mode_strfmon, __printf_buffer_mode_fp, /* For __printf_fp_l_buffer. */ __printf_buffer_mode_fp_to_wide, /* For __wprintf_fp_l_buffer. */ @@ -305,6 +306,9 @@ void __printf_buffer_flush_to_file (struct __printf_buffer_to_file *) struct __printf_buffer_asprintf; void __printf_buffer_flush_asprintf (struct __printf_buffer_asprintf *) attribute_hidden; +struct __printf_buffer_dprintf; +void __printf_buffer_flush_dprintf (struct __printf_buffer_dprintf *) + attribute_hidden; struct __printf_buffer_fp; void __printf_buffer_flush_fp (struct __printf_buffer_fp *) attribute_hidden; diff --git a/libio/iovdprintf.c b/libio/iovdprintf.c index 1e483868c9..f4cdd6b537 100644 --- a/libio/iovdprintf.c +++ b/libio/iovdprintf.c @@ -24,41 +24,54 @@ This exception applies to code released by its copyright holders in files containing the exception. */ -#include +#include +#include +#include #include +#include +#include -int -__vdprintf_internal (int d, const char *format, va_list arg, - unsigned int mode_flags) +struct __printf_buffer_dprintf { - struct _IO_FILE_plus tmpfil; - struct _IO_wide_data wd; - int done; + struct __printf_buffer base; + int fd; + + /* This should cover most of the packet-oriented file descriptors, + where boundaries between writes could be visible to readers. */ + char buf[2048]; +}; -#ifdef _IO_MTSAFE_IO - tmpfil.file._lock = NULL; -#endif - _IO_no_init (&tmpfil.file, _IO_USER_LOCK, 0, &wd, &_IO_wfile_jumps); - _IO_JUMPS (&tmpfil) = &_IO_file_jumps; - _IO_new_file_init_internal (&tmpfil); - if (_IO_file_attach (&tmpfil.file, d) == NULL) +void +__printf_buffer_flush_dprintf (struct __printf_buffer_dprintf *buf) +{ + char *p = buf->buf; + char *end = buf->base.write_ptr; + while (p < end) { - _IO_un_link (&tmpfil); - return EOF; + ssize_t ret = TEMP_FAILURE_RETRY (write (buf->fd, p, end - p)); + if (ret < 0) + { + __printf_buffer_mark_failed (&buf->base); + return; + } + p += ret; } - tmpfil.file._flags |= _IO_DELETE_DONT_CLOSE; - - _IO_mask_flags (&tmpfil.file, _IO_NO_READS, - _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); - - done = __vfprintf_internal (&tmpfil.file, format, arg, mode_flags); - - if (done != EOF && _IO_do_flush (&tmpfil.file) == EOF) - done = EOF; - - _IO_FINISH (&tmpfil.file); + buf->base.write_ptr = buf->buf; +} - return done; +int +__vdprintf_internal (int d, const char *format, va_list arg, + unsigned int mode_flags) +{ + struct __printf_buffer_dprintf buf; + __printf_buffer_init (&buf.base, buf.buf, array_length (buf.buf), + __printf_buffer_mode_dprintf); + buf.fd = d; + __printf_buffer (&buf.base, format, arg, mode_flags); + if (__printf_buffer_has_failed (&buf.base)) + return -1; + __printf_buffer_flush_dprintf (&buf); + return __printf_buffer_done (&buf.base); } int diff --git a/stdio-common/printf_buffer_flush.c b/stdio-common/printf_buffer_flush.c index 14fe1b2df4..922340cc54 100644 --- a/stdio-common/printf_buffer_flush.c +++ b/stdio-common/printf_buffer_flush.c @@ -28,6 +28,7 @@ # pragma weak __printf_buffer_flush_snprintf # pragma weak __printf_buffer_flush_to_file # pragma weak __printf_buffer_flush_asprintf +# pragma weak __printf_buffer_flush_dprintf # pragma weak __printf_buffer_flush_fp # pragma weak __printf_buffer_flush_fp_to_wide # pragma weak __printf_buffer_flush_fphex_to_wide @@ -53,6 +54,9 @@ __printf_buffer_do_flush (struct __printf_buffer *buf) case __printf_buffer_mode_asprintf: __printf_buffer_flush_asprintf ((struct __printf_buffer_asprintf *) buf); return; + case __printf_buffer_mode_dprintf: + __printf_buffer_flush_dprintf ((struct __printf_buffer_dprintf *) buf); + return; case __printf_buffer_mode_strfmon: __set_errno (E2BIG); __printf_buffer_mark_failed (buf);