Skip to content

fix: capability safeties #156

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

Merged
merged 3 commits into from
Nov 7, 2024
Merged

fix: capability safeties #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa686c7
feat: Allow readonly of stream components even when toggled
Kelwan Oct 31, 2024
157c3bb
fix: Unintended parallel system executions
Kelwan Nov 1, 2024
2675892
fix: safe_ro_comps for past components in parallel check
Kelwan Nov 1, 2024
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
4 changes: 4 additions & 0 deletions rt_entt_codegen/core/print_sys_exec.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,10 @@ static auto add_stream_component_if_needed(
continue;
}

if(capability == ECSACT_SYS_CAP_READONLY) {
continue;
}

auto comp_ident = cpp_identifier(decl_full_name(comp_id));
auto run_on_stream_str =
std::format("::ecsact::entt::detail::run_on_stream<{}>", comp_ident);
Expand Down
40 changes: 28 additions & 12 deletions rt_entt_codegen/shared/parallel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ static auto loop_iterator(
) -> void {
std::vector<system_like_id_variant> parallel_system_list;
auto unsafe_comps = std::set<ecsact_component_like_id>{};
auto safe_ro_comps = std::set<ecsact_component_like_id>{};

using ecsact::meta::decl_full_name;

Expand All @@ -227,7 +228,9 @@ static auto loop_iterator(
}

auto capabilities = ecsact::meta::system_capabilities(sys_like_id);

auto child_unsafe_comps = std::set<ecsact_component_like_id>{};
auto child_safe_ro_comps = std::set<ecsact_component_like_id>{};
auto child_systems = ecsact::meta::get_child_system_ids(sys_like_id);

for(auto child_sys_id : child_systems) {
Expand All @@ -251,22 +254,18 @@ static auto loop_iterator(
} else {
child_unsafe_comps.insert(child_comp_id);
}
} else {
if(child_capability == ECSACT_SYS_CAP_READONLY ||
child_capability == ECSACT_SYS_CAP_OPTIONAL_READONLY) {
child_safe_ro_comps.insert(child_comp_id);
}
}
}
}

for(const auto [comp_id, capability] : capabilities) {
auto cpp_name = decl_full_name(comp_id);

if(unsafe_comps.contains(comp_id)) {
if(capability == ECSACT_SYS_CAP_READONLY ||
capability == ECSACT_SYS_CAP_OPTIONAL_READONLY) {
parallel_system_cluster.push_back(parallel_system_list);
loop_iterator(system_list, iterator, parallel_system_cluster);
return;
}
}

if(!is_capability_safe(capability)) {
if(!unsafe_comps.contains(comp_id)) {
unsafe_comps.insert(comp_id);
Expand All @@ -275,12 +274,29 @@ static auto loop_iterator(
loop_iterator(system_list, iterator, parallel_system_cluster);
return;
}
} else {
if(capability == ECSACT_SYS_CAP_READONLY ||
capability == ECSACT_SYS_CAP_OPTIONAL_READONLY) {
safe_ro_comps.insert(comp_id);
}
}

if(unsafe_comps.contains(comp_id) && safe_ro_comps.contains(comp_id)) {
parallel_system_cluster.push_back(parallel_system_list);
loop_iterator(system_list, iterator, parallel_system_cluster);
return;
}
}

for(auto child_safe_ro_comp : child_safe_ro_comps) {
if(!safe_ro_comps.contains(child_safe_ro_comp)) {
safe_ro_comps.insert(child_safe_ro_comp);
}
}

for(auto unsafe_comp : child_unsafe_comps) {
if(!unsafe_comps.contains(unsafe_comp)) {
unsafe_comps.insert(unsafe_comp);
for(auto child_unsafe_comp : child_unsafe_comps) {
if(!unsafe_comps.contains(child_unsafe_comp)) {
unsafe_comps.insert(child_unsafe_comp);
}
}

Expand Down