Skip to content

Sparse-term safety locks pass a stage where a world is required #302

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
andrewgazelka wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Sparse-term safety locks pass a stage where a world is required #302

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
16 changes: 12 additions & 4 deletions flecs_ecs/src/core/safety_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,14 @@ fn __internal_do_read_write_locks<
stage: i32,
table_records: &[super::TableColumnSafety],
) {
// Inside a multithreaded system this `WorldRef` is a stage, and
// `flecs_components_get` asserts on `ecs_world_t_magic`, so every sparse
// term in a threaded system aborted the process.
let real_world = unsafe {
sys::ecs_get_world(world.raw_world.as_ptr().cast_const().cast()).cast_mut()
}
.cast::<sys::ecs_world_t>();

let count_immutable: usize = const { T::COUNT_IMMUTABLE };
let start_index_mutable: usize = const { T::COUNT_IMMUTABLE };
let start_index_optional_immutable: usize = const { T::COUNT_IMMUTABLE + T::COUNT_MUTABLE };
Expand All @@ -427,7 +435,7 @@ fn __internal_do_read_write_locks<

//if component_id is set, that means this term is a row term
if ANY_SPARSE_TERMS && info.component_id != 0 {
let idr = sys::flecs_components_get(world.raw_world.as_ptr(), info.component_id);
let idr = sys::flecs_components_get(real_world, info.component_id);
lock_sparse::<INCREMENT, true, MULTITHREADED>(world, idr);
continue;
}
Expand All @@ -442,7 +450,7 @@ fn __internal_do_read_write_locks<

//if component_id is set, that means this term is a row term
if ANY_SPARSE_TERMS && info.component_id != 0 {
let idr = sys::flecs_components_get(world.raw_world.as_ptr(), info.component_id);
let idr = sys::flecs_components_get(real_world, info.component_id);
lock_sparse::<INCREMENT, false, MULTITHREADED>(world, idr);
continue;
}
Expand All @@ -460,7 +468,7 @@ fn __internal_do_read_write_locks<
let info = table_records.get_unchecked(i);

if ANY_SPARSE_TERMS && info.component_id != 0 {
let idr = sys::flecs_components_get(world.raw_world.as_ptr(), info.component_id);
let idr = sys::flecs_components_get(real_world, info.component_id);
lock_sparse::<INCREMENT, true, MULTITHREADED>(world, idr);
continue;
}
Expand All @@ -478,7 +486,7 @@ fn __internal_do_read_write_locks<
let info = table_records.get_unchecked(i);

if ANY_SPARSE_TERMS && info.component_id != 0 {
let idr = sys::flecs_components_get(world.raw_world.as_ptr(), info.component_id);
let idr = sys::flecs_components_get(real_world, info.component_id);
lock_sparse::<INCREMENT, false, MULTITHREADED>(world, idr);
continue;
}
Expand Down
Loading