Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid sorting CallableCustomMethodPointers by their actual address values #72346

Merged
merged 1 commit into from
Jul 26, 2023
Merged

Avoid sorting CallableCustomMethodPointers by their actual address values #72346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions core/object/callable_method_pointer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,10 @@ bool CallableCustomMethodPointerBase::compare_equal(const CallableCustom *p_a, c
return false;
}

for (uint32_t i = 0; i < a->comp_size; i++) {
if (a->comp_ptr[i] != b->comp_ptr[i]) {
return false;
}
}

return true;
// Avoid sorting by memory address proximity, which leads to unpredictable performance over time
// due to the reuse of old addresses for newer objects. Use byte-wise comparison to leverage the
// backwards encoding of little-endian systems as a way to decouple spatiality and time.
return memcmp(a->comp_ptr, b->comp_ptr, a->comp_size * 4) == 0;
myaaaaaaaaa marked this conversation as resolved.
Show resolved Hide resolved
}

bool CallableCustomMethodPointerBase::compare_less(const CallableCustom *p_a, const CallableCustom *p_b) {
Expand All @@ -55,15 +52,8 @@ bool CallableCustomMethodPointerBase::compare_less(const CallableCustom *p_a, co
return a->comp_size < b->comp_size;
}

for (uint32_t i = 0; i < a->comp_size; i++) {
if (a->comp_ptr[i] == b->comp_ptr[i]) {
continue;
}

return a->comp_ptr[i] < b->comp_ptr[i];
}

return false;
// See note in compare_equal().
return memcmp(a->comp_ptr, b->comp_ptr, a->comp_size * 4) < 0;
myaaaaaaaaa marked this conversation as resolved.
Show resolved Hide resolved
}

CallableCustom::CompareEqualFunc CallableCustomMethodPointerBase::get_compare_equal_func() const {
Expand Down
23 changes: 23 additions & 0 deletions tests/core/object/test_object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,29 @@ TEST_CASE("[Object] Signals") {
SIGNAL_CHECK("my_custom_signal", empty_signal_args);
SIGNAL_UNWATCH(&object, "my_custom_signal");
}

SUBCASE("Connecting and then disconnecting many signals should not leave anything behind") {
List<Object::Connection> signal_connections;
Object targets[100];

for (int i = 0; i < 10; i++) {
ERR_PRINT_OFF;
for (Object &target : targets) {
object.connect("my_custom_signal", callable_mp(&target, &Object::notify_property_list_changed));
}
ERR_PRINT_ON;
signal_connections.clear();
object.get_all_signal_connections(&signal_connections);
CHECK(signal_connections.size() == 100);
}

for (Object &target : targets) {
object.disconnect("my_custom_signal", callable_mp(&target, &Object::notify_property_list_changed));
}
signal_connections.clear();
object.get_all_signal_connections(&signal_connections);
CHECK(signal_connections.size() == 0);
}
}

} // namespace TestObject
Expand Down