maelstrom/openblocks
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

refactor(instance): made workspace() and dataModel() not access-heavy

Browse source
This commit is contained in:
maelstrom 2025-04-11 00:19:06 +02:00
parent dbc02e2a4f
commit 35f49b8a45
2 changed files with 43 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
core/src/objects/base/instance.cpp
View file

@ -39,6 +39,12 @@ Instance::Instance(const InstanceType* type) {
Instance::~Instance () { Instance::~Instance () {
} }
template <typename T>
bool operator ==(std::optional<std::weak_ptr<T>> a, std::optional<std::weak_ptr<T>> b) {
return (!a.has_value() || a.value().expired()) && (!b.has_value() || b.value().expired())
|| (a.has_value() && !a.value().expired()) && (b.has_value() && !b.value().expired()) && a.value().lock() == b.value().lock();
}
// TODO: Test this // TODO: Test this
bool Instance::ancestryContinuityCheck(std::optional<std::shared_ptr<Instance>> newParent) { bool Instance::ancestryContinuityCheck(std::optional<std::shared_ptr<Instance>> newParent) {
for (std::optional<std::shared_ptr<Instance>> currentParent = newParent; currentParent.has_value(); currentParent = currentParent.value()->GetParent()) { for (std::optional<std::shared_ptr<Instance>> currentParent = newParent; currentParent.has_value(); currentParent = currentParent.value()->GetParent()) {
@ -69,37 +75,47 @@ bool Instance::SetParent(std::optional<std::shared_ptr<Instance>> newParent) {
if (hierarchyPostUpdateHandler.has_value()) hierarchyPostUpdateHandler.value()(this->shared_from_this(), lastParent, newParent); if (hierarchyPostUpdateHandler.has_value()) hierarchyPostUpdateHandler.value()(this->shared_from_this(), lastParent, newParent);
this->OnParentUpdated(lastParent, newParent); this->OnParentUpdated(lastParent, newParent);
auto oldDataModel = _dataModel;
auto oldWorkspace = _workspace;
// Update parent data model and workspace, if applicable
if (newParent) {
this->_dataModel = newParent->get()->GetClass() == &DataModel::TYPE ? std::make_optional(std::dynamic_pointer_cast<DataModel>(newParent.value())) : newParent.value()->dataModel();
this->_workspace = newParent->get()->GetClass() == &Workspace::TYPE ? std::make_optional(std::dynamic_pointer_cast<Workspace>(newParent.value())) : newParent.value()->workspace();
} else {
this->_dataModel = std::nullopt;
this->_workspace = std::nullopt;
}
// Algorithm for updating descendant's dataModel and workspace fields
if (oldDataModel != _dataModel || oldWorkspace != _workspace)
updateAncestry();
return true; return true;
} }
std::optional<std::shared_ptr<DataModel>> Instance::dataModel() { void Instance::updateAncestry() {
// TODO: This algorithm will defer calculations to every time the root data model if (GetParent()) {
// is accessed from any instance. This is inefficient as this can happen many times this->_dataModel = GetParent().value()->GetClass() == &DataModel::TYPE ? std::make_optional(std::dynamic_pointer_cast<DataModel>(GetParent().value())) : GetParent().value()->dataModel();
// a tick. A better option is to cache these values and only update them if the ancestry this->_workspace = GetParent().value()->GetClass() == &Workspace::TYPE ? std::make_optional(std::dynamic_pointer_cast<Workspace>(GetParent().value())) : GetParent().value()->workspace();
// changes, as that happens way less often. } else {
this->_dataModel = std::nullopt;
std::optional<std::shared_ptr<Instance>> currentParent = GetParent(); this->_workspace = std::nullopt;
while (currentParent) {
if (currentParent.value()->GetClass() == &DataModel::TYPE)
return std::dynamic_pointer_cast<DataModel>(currentParent.value());
currentParent = currentParent.value()->GetParent();
} }
return std::nullopt; // Update ancestry in descendants
for (InstanceRef child : children) {
child->updateAncestry();
}
}
std::optional<std::shared_ptr<DataModel>> Instance::dataModel() {
return (!_dataModel || _dataModel->expired()) ? std::nullopt : std::make_optional(_dataModel.value().lock());
} }
std::optional<std::shared_ptr<Workspace>> Instance::workspace() { std::optional<std::shared_ptr<Workspace>> Instance::workspace() {
// See comment in above function return (!_workspace || _workspace->expired()) ? std::nullopt : std::make_optional(_workspace.value().lock());
std::optional<std::shared_ptr<Instance>> currentParent = GetParent();
while (currentParent) {
if (currentParent.value()->GetClass() == &DataModel::TYPE)
return std::dynamic_pointer_cast<Workspace>(currentParent.value());
currentParent = currentParent.value()->GetParent();
}
return std::nullopt;
} }
std::optional<std::shared_ptr<Instance>> Instance::GetParent() { std::optional<std::shared_ptr<Instance>> Instance::GetParent() {

4
core/src/objects/base/instance.h
View file

@ -57,7 +57,11 @@ private:
std::optional<std::vector<std::string>> cachedMemberList; std::optional<std::vector<std::string>> cachedMemberList;
std::optional<std::weak_ptr<DataModel>> _dataModel;
std::optional<std::weak_ptr<Workspace>> _workspace;
bool ancestryContinuityCheck(std::optional<std::shared_ptr<Instance>> newParent); bool ancestryContinuityCheck(std::optional<std::shared_ptr<Instance>> newParent);
void updateAncestry();
protected: protected:
bool parentLocked = false; bool parentLocked = false;
std::unique_ptr<MemberMap> memberMap; std::unique_ptr<MemberMap> memberMap;