From 724fcace0a9623ca1051f04be47aafe7e5eeb93a Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Tue, 4 Jul 2023 17:42:31 -0400 Subject: [libc++][NFC] clang-format __thread/id.h since it just got moved --- libcxx/include/__thread/id.h | 106 +++++++++++++++--------------------- libcxx/utils/data/ignore_format.txt | 1 - 2 files changed, 44 insertions(+), 63 deletions(-) (limited to 'libcxx') diff --git a/libcxx/include/__thread/id.h b/libcxx/include/__thread/id.h index 533f850..d6a09d9 100644 --- a/libcxx/include/__thread/id.h +++ b/libcxx/include/__thread/id.h @@ -27,63 +27,57 @@ _LIBCPP_BEGIN_NAMESPACE_STD class _LIBCPP_EXPORTED_FROM_ABI thread; class _LIBCPP_EXPORTED_FROM_ABI __thread_id; -namespace this_thread -{ +namespace this_thread { -_LIBCPP_INLINE_VISIBILITY __thread_id get_id() _NOEXCEPT; +_LIBCPP_HIDE_FROM_ABI __thread_id get_id() _NOEXCEPT; } // namespace this_thread -template<> struct hash<__thread_id>; +template <> +struct hash<__thread_id>; -class _LIBCPP_TEMPLATE_VIS __thread_id -{ - // FIXME: pthread_t is a pointer on Darwin but a long on Linux. - // NULL is the no-thread value on Darwin. Someone needs to check - // on other platforms. We assume 0 works everywhere for now. - __libcpp_thread_id __id_; +class _LIBCPP_TEMPLATE_VIS __thread_id { + // FIXME: pthread_t is a pointer on Darwin but a long on Linux. + // NULL is the no-thread value on Darwin. Someone needs to check + // on other platforms. We assume 0 works everywhere for now. + __libcpp_thread_id __id_; - static _LIBCPP_HIDE_FROM_ABI - bool __lt_impl(__thread_id __x, __thread_id __y) _NOEXCEPT - { // id==0 is always less than any other thread_id - if (__x.__id_ == 0) return __y.__id_ != 0; - if (__y.__id_ == 0) return false; - return __libcpp_thread_id_less(__x.__id_, __y.__id_); - } + static _LIBCPP_HIDE_FROM_ABI bool + __lt_impl(__thread_id __x, __thread_id __y) _NOEXCEPT { // id==0 is always less than any other thread_id + if (__x.__id_ == 0) + return __y.__id_ != 0; + if (__y.__id_ == 0) + return false; + return __libcpp_thread_id_less(__x.__id_, __y.__id_); + } public: - _LIBCPP_INLINE_VISIBILITY - __thread_id() _NOEXCEPT : __id_(0) {} + _LIBCPP_HIDE_FROM_ABI __thread_id() _NOEXCEPT : __id_(0) {} - _LIBCPP_INLINE_VISIBILITY - void __reset() { __id_ = 0; } + _LIBCPP_HIDE_FROM_ABI void __reset() { __id_ = 0; } - friend _LIBCPP_HIDE_FROM_ABI bool operator==(__thread_id __x, __thread_id __y) _NOEXCEPT; -#if _LIBCPP_STD_VER <= 17 - friend _LIBCPP_HIDE_FROM_ABI bool operator<(__thread_id __x, __thread_id __y) _NOEXCEPT; -#else // _LIBCPP_STD_VER <= 17 - friend _LIBCPP_HIDE_FROM_ABI strong_ordering operator<=>(__thread_id __x, __thread_id __y) noexcept; -#endif // _LIBCPP_STD_VER <= 17 + friend _LIBCPP_HIDE_FROM_ABI bool operator==(__thread_id __x, __thread_id __y) _NOEXCEPT; +# if _LIBCPP_STD_VER <= 17 + friend _LIBCPP_HIDE_FROM_ABI bool operator<(__thread_id __x, __thread_id __y) _NOEXCEPT; +# else // _LIBCPP_STD_VER <= 17 + friend _LIBCPP_HIDE_FROM_ABI strong_ordering operator<=>(__thread_id __x, __thread_id __y) noexcept; +# endif // _LIBCPP_STD_VER <= 17 - template - friend - _LIBCPP_INLINE_VISIBILITY - basic_ostream<_CharT, _Traits>& - operator<<(basic_ostream<_CharT, _Traits>& __os, __thread_id __id); + template + friend _LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>& + operator<<(basic_ostream<_CharT, _Traits>& __os, __thread_id __id); private: - _LIBCPP_INLINE_VISIBILITY - __thread_id(__libcpp_thread_id __id) : __id_(__id) {} + _LIBCPP_HIDE_FROM_ABI __thread_id(__libcpp_thread_id __id) : __id_(__id) {} - _LIBCPP_HIDE_FROM_ABI friend __libcpp_thread_id __get_underlying_id(const __thread_id __id) { return __id.__id_; } + _LIBCPP_HIDE_FROM_ABI friend __libcpp_thread_id __get_underlying_id(const __thread_id __id) { return __id.__id_; } - friend __thread_id this_thread::get_id() _NOEXCEPT; - friend class _LIBCPP_EXPORTED_FROM_ABI thread; - friend struct _LIBCPP_TEMPLATE_VIS hash<__thread_id>; + friend __thread_id this_thread::get_id() _NOEXCEPT; + friend class _LIBCPP_EXPORTED_FROM_ABI thread; + friend struct _LIBCPP_TEMPLATE_VIS hash<__thread_id>; }; -inline _LIBCPP_HIDE_FROM_ABI -bool operator==(__thread_id __x, __thread_id __y) _NOEXCEPT { +inline _LIBCPP_HIDE_FROM_ABI bool operator==(__thread_id __x, __thread_id __y) _NOEXCEPT { // Don't pass id==0 to underlying routines if (__x.__id_ == 0) return __y.__id_ == 0; @@ -92,15 +86,11 @@ bool operator==(__thread_id __x, __thread_id __y) _NOEXCEPT { return __libcpp_thread_id_equal(__x.__id_, __y.__id_); } -#if _LIBCPP_STD_VER <= 17 +# if _LIBCPP_STD_VER <= 17 -inline _LIBCPP_HIDE_FROM_ABI -bool operator!=(__thread_id __x, __thread_id __y) _NOEXCEPT { - return !(__x == __y); -} +inline _LIBCPP_HIDE_FROM_ABI bool operator!=(__thread_id __x, __thread_id __y) _NOEXCEPT { return !(__x == __y); } -inline _LIBCPP_HIDE_FROM_ABI -bool operator<(__thread_id __x, __thread_id __y) _NOEXCEPT { +inline _LIBCPP_HIDE_FROM_ABI bool operator<(__thread_id __x, __thread_id __y) _NOEXCEPT { return __thread_id::__lt_impl(__x.__id_, __y.__id_); } @@ -108,10 +98,9 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator<=(__thread_id __x, __thread_id __y) _ inline _LIBCPP_HIDE_FROM_ABI bool operator>(__thread_id __x, __thread_id __y) _NOEXCEPT { return __y < __x; } inline _LIBCPP_HIDE_FROM_ABI bool operator>=(__thread_id __x, __thread_id __y) _NOEXCEPT { return !(__x < __y); } -#else // _LIBCPP_STD_VER <= 17 +# else // _LIBCPP_STD_VER <= 17 -inline _LIBCPP_HIDE_FROM_ABI -strong_ordering operator<=>(__thread_id __x, __thread_id __y) noexcept { +inline _LIBCPP_HIDE_FROM_ABI strong_ordering operator<=>(__thread_id __x, __thread_id __y) noexcept { if (__x == __y) return strong_ordering::equal; if (__thread_id::__lt_impl(__x, __y)) @@ -119,24 +108,17 @@ strong_ordering operator<=>(__thread_id __x, __thread_id __y) noexcept { return strong_ordering::greater; } -#endif // _LIBCPP_STD_VER <= 17 +# endif // _LIBCPP_STD_VER <= 17 -namespace this_thread -{ +namespace this_thread { -_LIBCPP_INLINE_VISIBILITY __thread_id get_id() _NOEXCEPT; +_LIBCPP_HIDE_FROM_ABI __thread_id get_id() _NOEXCEPT; } // namespace this_thread -namespace this_thread -{ +namespace this_thread { -inline _LIBCPP_INLINE_VISIBILITY -__thread_id -get_id() _NOEXCEPT -{ - return __libcpp_thread_get_current_id(); -} +inline _LIBCPP_HIDE_FROM_ABI __thread_id get_id() _NOEXCEPT { return __libcpp_thread_get_current_id(); } } // namespace this_thread diff --git a/libcxx/utils/data/ignore_format.txt b/libcxx/utils/data/ignore_format.txt index 1353bc9..ba9ca14 100644 --- a/libcxx/utils/data/ignore_format.txt +++ b/libcxx/utils/data/ignore_format.txt @@ -474,7 +474,6 @@ libcxx/include/__support/xlocale/__nop_locale_mgmt.h libcxx/include/__system_error/errc.h libcxx/include/thread libcxx/include/__thread/formatter.h -libcxx/include/__thread/id.h libcxx/include/__threading_support libcxx/include/__thread/poll_with_backoff.h libcxx/include/__thread/this_thread.h -- cgit v1.1