diff --git a/src/libs/nanotrace/nanotracehr.h b/src/libs/nanotrace/nanotracehr.h index 36b4b87c68f..1a244bd5f44 100644 --- a/src/libs/nanotrace/nanotracehr.h +++ b/src/libs/nanotrace/nanotracehr.h @@ -724,101 +724,6 @@ using StringViewWithStringArgumentsCategory = Category, Tracing::IsDisabled>; -template -class ObjectToken : public BasicDisabledToken -{ -public: - using ArgumentType = typename Category::ArgumentType; - - ObjectToken() = default; - ObjectToken(const ObjectToken &) = delete; - ObjectToken &operator=(const ObjectToken &) = delete; - ObjectToken(ObjectToken &&other) noexcept = default; - ObjectToken &operator=(ObjectToken &&other) noexcept = default; - ~ObjectToken() = default; - - template - void change(ArgumentType, Arguments &&...) - {} -}; - -template -class ObjectToken : public BasicEnabledToken -{ - using CategoryFunctionPointer = typename Category::CategoryFunctionPointer; - - ObjectToken(std::string_view name, std::size_t id, CategoryFunctionPointer category) - : m_name{name} - , m_id{id} - , m_category{category} - {} - -public: - using StringType = typename Category::StringType; - using ArgumentType = typename Category::ArgumentType; - - friend Category; - - ObjectToken(const ObjectToken &other) - : m_name{other.m_name} - , m_category{other.m_category} - { - if (other.m_id) - m_id = m_category().beginObject(m_name).m_id; - } - - ObjectToken &operator=(const ObjectToken &other) - { - if (this != &other) { - ~ObjectToken(); - if (other.m_id) { - m_category = other.m_category; - m_name = other.m_name; - m_id = other.m_category->beginObject(other.m_name).m_id; - } - } - } - - ObjectToken(ObjectToken &&other) noexcept - : m_name{std::move(other.m_name)} - , m_id{std::exchange(other.m_id, 0)} - , m_category{std::exchange(other.m_category, nullptr)} - {} - - ObjectToken &operator=(ObjectToken &&other) noexcept - { - if (&other != this) { - m_name = std::move(other.m_name); - m_id = std::exchange(other.m_id, 0); - m_category = std::exchange(other.m_category, nullptr); - } - - return *this; - } - - ~ObjectToken() - { - if (m_id) - m_category().end('e', m_id, std::move(m_name)); - - m_id = 0; - } - - template - void change(ArgumentType name, Arguments &&...arguments) - { - if (m_id) { - m_category().tick( - 'n', m_id, std::move(name), 0, IsFlow::No, std::forward(arguments)...); - } - } - -private: - StringType m_name; - std::size_t m_id = 0; - CategoryFunctionPointer m_category = nullptr; -}; - template class AsynchronousToken : public BasicDisabledToken { @@ -1184,7 +1089,6 @@ public: using ArgumentType = typename TraceEvent::ArgumentType; using ArgumentsStringType = typename TraceEvent::ArgumentsStringType; using AsynchronousTokenType = AsynchronousToken; - using ObjectTokenType = ObjectToken; using FlowTokenType = FlowToken; using TracerType = Tracer; using TokenType = Token; @@ -1206,12 +1110,6 @@ public: ArgumentType, Arguments &&...) {} - template - [[nodiscard]] ObjectTokenType beginObject(ArgumentType, Arguments &&...) - { - return {}; - } - template [[nodiscard]] TracerType beginDuration(ArgumentType, Arguments &&...) { @@ -1240,14 +1138,12 @@ public: using ArgumentsStringType = typename TraceEvent::ArgumentsStringType; using StringType = typename TraceEvent::StringType; using AsynchronousTokenType = AsynchronousToken; - using ObjectTokenType = ObjectToken; using FlowTokenType = FlowToken; using TracerType = Tracer; using TokenType = Token; using CategoryFunctionPointer = Category &(*) (); friend AsynchronousTokenType; - friend ObjectTokenType; friend TokenType; friend FlowTokenType; friend TracerType; @@ -1292,16 +1188,6 @@ public: std::forward_as_tuple(PrivateTag{}, traceName, bindId, m_self)}; } - template - [[nodiscard]] ObjectTokenType beginObject(ArgumentType traceName, Arguments &&...arguments) - { - std::size_t id = createId(); - - begin('b', id, std::move(traceName), 0, IsFlow::No, std::forward(arguments)...); - - return {traceName, id, m_self}; - } - template [[nodiscard]] TracerType beginDuration(ArgumentType traceName, Arguments &&...arguments) { diff --git a/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.h b/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.h index 6d13d32b30b..49691efc0b1 100644 --- a/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.h +++ b/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.h @@ -38,7 +38,6 @@ constexpr NanotraceHR::Tracing tracingStatus() } using Category = NanotraceHR::StringViewWithStringArgumentsCategory; -using ObjectTraceToken = Category::ObjectTokenType; using AsynchronousToken = Category::AsynchronousTokenType; QMLDESIGNERCORE_EXPORT Category &category();