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

Jump to bottom

Do not store synchronization primitive IDs in adressable memory #3966

Merged
merged 8 commits into from
Oct 14, 2024
Merged

Do not store synchronization primitive IDs in adressable memory #3966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d37974c
pthread_mutex: store mutex ID outside adressable memory, so it can be…
RalfJung Oct 12, 2024
45e3153
pthread_rwlock: also store ID outside addressable memory
RalfJung Oct 12, 2024
134ede3
pthread_cond: also store ID outside addressable memory
RalfJung Oct 12, 2024
547f831
macOS os_unfair_lock: also store ID outside addressable memory
RalfJung Oct 12, 2024
831f391
Windows InitOnce: also store ID outside addressable memory
RalfJung Oct 12, 2024
8bcacb2
make lazy_sync_get_data also take a closure to initialize if needed
RalfJung Oct 12, 2024
44c9cdf
turns out relaxed accesses suffice here
RalfJung Oct 12, 2024
323ab1c
pick more clear names for the types
RalfJung Oct 12, 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
17 changes: 0 additions & 17 deletions src/concurrency/init_once.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use std::collections::VecDeque;

use rustc_index::Idx;

use super::sync::EvalContextExtPriv as _;
use super::vector_clock::VClock;
use crate::*;

Expand All @@ -27,22 +26,6 @@ pub(super) struct InitOnce {

impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
fn init_once_get_or_create_id(
&mut self,
lock: &MPlaceTy<'tcx>,
offset: u64,
) -> InterpResult<'tcx, InitOnceId> {
let this = self.eval_context_mut();
this.get_or_create_id(
lock,
offset,
|ecx| &mut ecx.machine.sync.init_onces,
|_| interp_ok(Default::default()),
)?
.ok_or_else(|| err_ub_format!("init_once has invalid ID"))
.into()
}

#[inline]
fn init_once_status(&mut self, id: InitOnceId) -> InitOnceStatus {
let this = self.eval_context_ref();
Expand Down
Loading