Skip to content

[fixed] fix pitfall when using == and != with MangedWeakReference #2

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

Open
fallchildren wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fixed] fix pitfall when using == and != with MangedWeakReference #2

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
36 changes: 33 additions & 3 deletions MMOEngine/src/engine/core/ManagedWeakReference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,12 @@ namespace engine {
return ref;
}

inline O getReferenceUnsafeNoReload() const {
O ref = WeakReference<O>::getReferenceUnsafeStaticCast();

return ref;
}

inline O getReferenceUnsafe() {
O ref = WeakReference<O>::getReferenceUnsafeStaticCast();

Expand Down Expand Up @@ -143,14 +149,38 @@ namespace engine {

inline bool operator!=(const ManagedWeakReference<O>& r) const {
auto savedObjectID = this->savedObjectID.load(std::memory_order_relaxed);

return savedObjectID != r.savedObjectID.load(std::memory_order_relaxed);
auto rSavedObjectID = r.savedObjectID.load(std::memory_order_relaxed);

// the savedObjectID may be incorrectly be 0
// if object O was given an objectID after
// creating the ManagedWeakReference - so we
// have to check for the actual objectID of O
// here
auto objectID = savedObjectID == 0 ?
getReferenceUnsafeNoReload() == nullptr ? 0 : getReferenceUnsafeNoReload()->getObjectID()
: savedObjectID;

auto rObjectID = rSavedObjectID == 0 ?
r.getReferenceUnsafeNoReload() == nullptr ? 0 : r.getReferenceUnsafeNoReload()->getObjectID()
: rSavedObjectID;

return objectID != rObjectID;
}

inline bool operator==(const ManagedWeakReference<O>& r) const {
auto savedObjectID = this->savedObjectID.load(std::memory_order_relaxed);
auto rSavedObjectID = r.savedObjectID.load(std::memory_order_relaxed);

// see comment on same logic in the operator!= code
auto objectID = savedObjectID == 0 ?
getReferenceUnsafeNoReload() == nullptr ? 0 : getReferenceUnsafeNoReload()->getObjectID()
: savedObjectID;

auto rObjectID = rSavedObjectID == 0 ?
r.getReferenceUnsafeNoReload() == nullptr ? 0 : r.getReferenceUnsafeNoReload()->getObjectID()
: rSavedObjectID;

return savedObjectID == r.savedObjectID.load(std::memory_order_relaxed);;
return objectID == rObjectID;
}

inline ManagedReference<O> get() {
Expand Down