From 5d0095b1c2e60ecfb492c1910df70021128d663c Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Fri, 25 Jun 2021 21:08:35 +0200 Subject: [PATCH] QProperty: micro optimizations - Ensure that the allocateDependencyObserver fast path is inlined. - Use addObserver instead of observerProperty; we know that a freshly allocated observer does not have its prev pointer set. If prev weren't a private member, we could simply use Q_ASSUME(ptr->prev == nullptr), but making it public or befriending the class seems like a bad idea, as it grants too much access to the internals. Pick-to: 6.2 Change-Id: Ia845f2807c70512563f7b9e1ecb85fe82b66208c Reviewed-by: Lars Knoll --- src/corelib/kernel/qproperty.cpp | 2 +- src/corelib/kernel/qproperty_p.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp index 8fdd261e08..09c74f1ed2 100644 --- a/src/corelib/kernel/qproperty.cpp +++ b/src/corelib/kernel/qproperty.cpp @@ -540,7 +540,7 @@ void QPropertyBindingData::registerWithCurrentlyEvaluatingBinding_helper(Binding QPropertyObserverPointer dependencyObserver = currentState->binding->allocateDependencyObserver(); dependencyObserver.setBindingToNotify(currentState->binding); - dependencyObserver.observeProperty(d); + d.addObserver(dependencyObserver.ptr); } void QPropertyBindingData::notifyObservers(QUntypedPropertyData *propertyDataPtr) const diff --git a/src/corelib/kernel/qproperty_p.h b/src/corelib/kernel/qproperty_p.h index 07f9099ee3..14dfd513f9 100644 --- a/src/corelib/kernel/qproperty_p.h +++ b/src/corelib/kernel/qproperty_p.h @@ -293,12 +293,17 @@ public: heapObservers->clear(); dependencyObserverCount = 0; } - QPropertyObserverPointer allocateDependencyObserver() - { + + Q_ALWAYS_INLINE QPropertyObserverPointer allocateDependencyObserver() { if (dependencyObserverCount < inlineDependencyObservers.size()) { ++dependencyObserverCount; return {&inlineDependencyObservers[dependencyObserverCount - 1]}; } + return allocateDependencyObserver_slow(); + } + + Q_NEVER_INLINE QPropertyObserverPointer allocateDependencyObserver_slow() + { ++dependencyObserverCount; if (!heapObservers) heapObservers.reset(new std::vector());