janis/executor
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

clear up some box stuff

Browse source
This commit is contained in:
Janis 2025-06-21 11:13:05 +02:00
parent 3d32569e2f
commit edaa32591e
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/praetor/mod.rs
View file

@ -935,6 +935,9 @@ mod job {
// turn `this`, which was allocated at (2), into box. // turn `this`, which was allocated at (2), into box.
// miri complains this is a use-after-free, but it isn't? silly miri... // miri complains this is a use-after-free, but it isn't? silly miri...
// Turns out this is actually correct on miri's end, but because
// we ensure that the scope lives as long as any jobs, this is
// actually fine, as far as I can tell.
let this = unsafe { Box::from_raw(this.cast::<HeapJob<F>>().cast_mut()) }; let this = unsafe { Box::from_raw(this.cast::<HeapJob<F>>().cast_mut()) };
let f = this.into_inner(); let f = this.into_inner();
@ -948,9 +951,9 @@ mod job {
} }
// (1) allocate box for job // (1) allocate box for job
Box::into_raw(Box::new(Job::new(harness::<F, T>, unsafe { Box::into_raw(Box::new(Job::new(harness::<F, T>, {
// (2) convert self into a pointer // (2) convert self into a pointer
NonNull::new_unchecked(Box::into_raw(self)).cast() Box::into_non_null(self).cast()
}))) })))
} }
} }
@ -1436,7 +1439,10 @@ impl<'scope> Scope<'scope> {
R: Send, R: Send,
{ {
run_in_worker(|worker| { run_in_worker(|worker| {
let this = Self::from_context(worker.context.clone()); // SAFETY: we call complete() after creating this scope, which
// ensures that any jobs spawned from the scope exit before the
// scope closes.
let this = unsafe { Self::from_context(worker.context.clone()) };
this.complete(worker, || f(&this)) this.complete(worker, || f(&this))
}) })
} }
@ -1447,7 +1453,10 @@ impl<'scope> Scope<'scope> {
R: Send, R: Send,
{ {
context.run_in_worker(|worker| { context.run_in_worker(|worker| {
let this = Self::from_context(context.clone()); // SAFETY: we call complete() after creating this scope, which
// ensures that any jobs spawned from the scope exit before the
// scope closes.
let this = unsafe { Self::from_context(context.clone()) };
this.complete(worker, || f(&this)) this.complete(worker, || f(&this))
}) })
} }
@ -1628,7 +1637,7 @@ impl<'scope> Scope<'scope> {
) )
} }
fn from_context(ctx: Arc<Context>) -> Self { unsafe fn from_context(ctx: Arc<Context>) -> Self {
Self { Self {
context: ctx, context: ctx,
job_counter: JobCounter::default(), job_counter: JobCounter::default(),