mirror of
https://forge.sourceware.org/marek/gcc.git
synced 2026-02-22 03:47:02 -05:00
The names of the vprint functions follow the convention from P3235R3. This takes advantage of the additional permission proposed by P3107R5 so that std::print can write directly to a FILE stream, rather than formatting to an intermediate std::string temporary and then writing that to the stream. The change is to write to a new _File_sink type instead of a _Str_sink that populates a std::string. There are three implementations of _File_sink. For non-Glibc targets that support POSIX flockfile and putc_unlocked, the stream will be locked and then formatted characters will be buffered on the stack (instead of allocating a std::string) and copied to the stream when the buffer fills up. For Glibc, _File_sink will lock the stream but then if the file is line-buffered or fully buffered, characters will be written directly into the file's output buffer. This avoids two levels of buffering and copying the characters from one to the other. For an unbuffered stream (like stderr) the _File_sink buffer will still be used, to avoid the overhead of lots of small writes to the stream. Because this version of _File_sink accesses the stream's buffer directly it relies on glibc-specific implementation details that are exposed in public headers. A fallback definition of _File_sink just wraps a _Str_sink so is equivalent to the original code, and is used when flockfile isn't available. Both forms of std::println (taking a FILE* and a std::ostream) can be implemented more efficiently by appending a newline to the format string, to avoid formatting twice. PR libstdc++/121790 libstdc++-v3/ChangeLog: * acinclude.m4 (GLIBCXX_CHECK_STDIO_LOCKING): New macro to check for std::print dependencies. * config.h.in: Regenerate. * configure: Regenerate. * configure.ac: Use GLIBCXX_CHECK_STDIO_LOCKING. * include/bits/formatfwd.h (enable_nonlocking_formatter_optimization): Define new variable template. * include/bits/version.def (print): Bump value. * include/bits/version.h: Regenerate. * include/std/format (enable_nonlocking_formatter_optimization): Define specializations for variable template. * include/std/ostream (print) [!_WIN32]: Do not use vprint_unicode at all. (println): Append newline to format string instead of formatting twice. * include/std/print (_File_sink): New class. (vprint_nonunicode_locking): New function. (vprint_unicode_locking): New function reusing previous code from vprint_unicode. (vprintf_unicode): Defer to vprint_nonunicode for Windows or to vprint_unicode_locking otherwise. (print): [!_WIN32]: Do no use vprint_unicode at all. Check enable_nonlocking_formatter_optimization and defer to either vprint_nonunicode_locking or vprint_nonunicode. (println): Use vprint_unicode or format directly to a _File_sink instead of formatting twice. * testsuite/27_io/print/1.cc: Updated and added new tests. * testsuite/std/format/formatter/nonlocking.cc: New tests. Reviewed-by: Jonathan Wakely <jwakely@redhat.com> Reviewed-by: Tomasz Kamiński <tkaminsk@redhat.com> Co-authored-by: Tomasz Kamiński <tkaminsk@redhat.com>
202 lines
6.4 KiB
C++
202 lines
6.4 KiB
C++
// <format> Formatting -*- C++ -*-
|
|
|
|
// Copyright The GNU Toolchain Authors.
|
|
//
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
// software; you can redistribute it and/or modify it under the
|
|
// terms of the GNU General Public License as published by the
|
|
// Free Software Foundation; either version 3, or (at your option)
|
|
// any later version.
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
/** @file bits/formatfwd.h
|
|
* This is an internal header file, included by other library headers.
|
|
* Do not attempt to use it directly. @headername{format}
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_FORMAT_FWD_H
|
|
#define _GLIBCXX_FORMAT_FWD_H 1
|
|
|
|
#ifdef _GLIBCXX_SYSHDR
|
|
#pragma GCC system_header
|
|
#endif
|
|
|
|
// <bits/version.h> must have been included before this header:
|
|
#ifdef __glibcxx_format // C++ >= 20 && HOSTED
|
|
|
|
#include <concepts>
|
|
#include <type_traits>
|
|
#if __glibcxx_format_ranges // C++ >= 23 && HOSTED
|
|
# include <bits/ranges_base.h> // input_range, range_reference_t
|
|
#endif
|
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
|
|
// [format.context], class template basic_format_context
|
|
template<typename _Out, typename _CharT> class basic_format_context;
|
|
|
|
// [format.parse.ctx], class template basic_format_parse_context
|
|
template<typename _CharT> class basic_format_parse_context;
|
|
|
|
// [format.formatter], formatter
|
|
template<typename _Tp, typename _CharT = char> struct formatter;
|
|
|
|
/// @cond undocumented
|
|
[[noreturn]]
|
|
inline void
|
|
__throw_format_error(const char* __what);
|
|
|
|
namespace __format
|
|
{
|
|
#ifdef _GLIBCXX_USE_WCHAR_T
|
|
template<typename _CharT>
|
|
concept __char = same_as<_CharT, char> || same_as<_CharT, wchar_t>;
|
|
#else
|
|
template<typename _CharT>
|
|
concept __char = same_as<_CharT, char>;
|
|
#endif
|
|
|
|
enum class _Align : unsigned char {
|
|
_Align_default,
|
|
_Align_left,
|
|
_Align_right,
|
|
_Align_centre,
|
|
};
|
|
using enum _Align;
|
|
|
|
template<typename _CharT> struct _Spec;
|
|
|
|
template<__char _CharT> struct __formatter_str;
|
|
template<__char _CharT> struct __formatter_int;
|
|
template<__char _CharT> struct __formatter_ptr;
|
|
|
|
template<typename _Tp, typename _Context,
|
|
typename _Formatter
|
|
= typename _Context::template formatter_type<remove_const_t<_Tp>>,
|
|
typename _ParseContext
|
|
= basic_format_parse_context<typename _Context::char_type>>
|
|
concept __parsable_with
|
|
= semiregular<_Formatter>
|
|
&& requires (_Formatter __f, _ParseContext __pc)
|
|
{
|
|
{ __f.parse(__pc) } -> same_as<typename _ParseContext::iterator>;
|
|
};
|
|
|
|
template<typename _Tp, typename _Context,
|
|
typename _Formatter
|
|
= typename _Context::template formatter_type<remove_const_t<_Tp>>,
|
|
typename _ParseContext
|
|
= basic_format_parse_context<typename _Context::char_type>>
|
|
concept __formattable_with
|
|
= semiregular<_Formatter>
|
|
&& requires (const _Formatter __cf, _Tp&& __t, _Context __fc)
|
|
{
|
|
{ __cf.format(__t, __fc) } -> same_as<typename _Context::iterator>;
|
|
};
|
|
|
|
// An unspecified output iterator type used in the `formattable` concept.
|
|
template<typename _CharT>
|
|
struct _Iter_for;
|
|
template<typename _CharT>
|
|
using _Iter_for_t = typename _Iter_for<_CharT>::type;
|
|
|
|
template<typename _Tp, typename _CharT,
|
|
typename _Context = basic_format_context<_Iter_for_t<_CharT>, _CharT>>
|
|
concept __formattable_impl
|
|
= __parsable_with<_Tp, _Context> && __formattable_with<_Tp, _Context>;
|
|
|
|
template<typename _Formatter>
|
|
concept __has_debug_format = requires(_Formatter __f)
|
|
{
|
|
__f.set_debug_format();
|
|
};
|
|
} // namespace __format
|
|
/// @endcond
|
|
|
|
#if __glibcxx_format_ranges // C++ >= 23 && HOSTED
|
|
// [format.formattable], concept formattable
|
|
template<typename _Tp, typename _CharT>
|
|
concept formattable
|
|
= __format::__formattable_impl<remove_reference_t<_Tp>, _CharT>;
|
|
|
|
template<typename _Tp, __format::__char _CharT = char>
|
|
requires same_as<remove_cvref_t<_Tp>, _Tp> && formattable<_Tp, _CharT>
|
|
class range_formatter;
|
|
|
|
/// @cond undocumented
|
|
namespace __format
|
|
{
|
|
template<typename _Rg, typename _CharT>
|
|
concept __const_formattable_range
|
|
= ranges::input_range<const _Rg>
|
|
&& formattable<ranges::range_reference_t<const _Rg>, _CharT>;
|
|
|
|
// _Rg& and const _Rg& are both formattable and use same formatter
|
|
// specialization for their references.
|
|
template<typename _Rg, typename _CharT>
|
|
concept __simply_formattable_range
|
|
= __const_formattable_range<_Rg, _CharT>
|
|
&& same_as<remove_cvref_t<ranges::range_reference_t<_Rg>>,
|
|
remove_cvref_t<ranges::range_reference_t<const _Rg>>>;
|
|
|
|
template<typename _Rg, typename _CharT>
|
|
using __maybe_const_range
|
|
= __conditional_t<__const_formattable_range<_Rg, _CharT>, const _Rg, _Rg>;
|
|
|
|
template<typename _Tp, typename _CharT>
|
|
using __maybe_const
|
|
= __conditional_t<formattable<const _Tp, _CharT>, const _Tp, _Tp>;
|
|
}
|
|
|
|
// [format.range], formatting of ranges
|
|
// [format.range.fmtkind], variable template format_kind
|
|
enum class range_format {
|
|
disabled,
|
|
map,
|
|
set,
|
|
sequence,
|
|
string,
|
|
debug_string
|
|
};
|
|
|
|
/** @brief A constant determining how a range should be formatted.
|
|
*
|
|
* The primary template of `std::format_kind` cannot be instantiated.
|
|
* There is a partial specialization for input ranges and you can
|
|
* specialize the variable template for your own cv-unqualified types
|
|
* that satisfy the `ranges::input_range` concept.
|
|
*
|
|
* @since C++23
|
|
*/
|
|
template<typename _Rg>
|
|
constexpr auto format_kind = []{
|
|
static_assert(false, "cannot use primary template of 'std::format_kind'");
|
|
return type_identity<_Rg>{};
|
|
}();
|
|
#endif // format_ranges
|
|
|
|
#if __glibcxx_print >= 202403L
|
|
template<typename>
|
|
constexpr bool enable_nonlocking_formatter_optimization = false;
|
|
#endif
|
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
} // namespace std
|
|
#endif // __glibcxx_format
|
|
#endif // _GLIBCXX_FORMAT_FWD_H
|