Fix bug with TLV and scopes

Zoxc · Zoxc · commit 42f3f9e76029 · 2019-04-13T09:53:03.000+02:00
diff --git a/rayon-core/Cargo.toml b/rayon-core/Cargo.toml
@@ -12,10 +12,6 @@ readme = "README.md"
 keywords = ["parallel", "thread", "concurrency", "join", "performance"]
 categories = ["concurrency"]
 
-[features]
-default = ["tlv"]
-tlv = []
-
 [dependencies]
 num_cpus = "1.2"
 libc = "0.2.16"
diff --git a/rayon-core/src/job.rs b/rayon-core/src/job.rs
@@ -3,7 +3,6 @@ use std::any::Any;
 use std::cell::UnsafeCell;
 use std::mem;
 use unwind;
-#[cfg(feature = "tlv")]
 use tlv;
 
 pub enum JobResult<T> {
@@ -77,7 +76,6 @@ where
     pub latch: L,
     func: UnsafeCell<Option<F>>,
     result: UnsafeCell<JobResult<R>>,
-    #[cfg(feature = "tlv")]
     tlv: usize,
 }
 
@@ -92,7 +90,6 @@ where
             latch: latch,
             func: UnsafeCell::new(Some(func)),
             result: UnsafeCell::new(JobResult::None),
-            #[cfg(feature = "tlv")]
             tlv: tlv::get(),
         }
     }
@@ -118,7 +115,6 @@ where
 {
     unsafe fn execute(this: *const Self) {
         let this = &*this;
-        #[cfg(feature = "tlv")]
         tlv::set(this.tlv);
         let abort = unwind::AbortIfPanic;
         let func = (*this.func.get()).take().unwrap();
@@ -142,19 +138,17 @@ where
     BODY: FnOnce() + Send,
 {
     job: UnsafeCell<Option<BODY>>,
-    #[cfg(feature = "tlv")]
     tlv: usize,
 }
 
 impl<BODY> HeapJob<BODY>
 where
     BODY: FnOnce() + Send,
 {
-    pub fn new(func: BODY) -> Self {
+    pub fn new(tlv: usize, func: BODY) -> Self {
         HeapJob {
             job: UnsafeCell::new(Some(func)),
-            #[cfg(feature = "tlv")]
-            tlv: tlv::get(),
+            tlv,
         }
     }
 
@@ -173,7 +167,6 @@ where
 {
     unsafe fn execute(this: *const Self) {
         let this: Box<Self> = mem::transmute(this);
-        #[cfg(feature = "tlv")]
         tlv::set(this.tlv);
         let job = (*this.job.get()).take().unwrap();
         job();
diff --git a/rayon-core/src/lib.rs b/rayon-core/src/lib.rs
@@ -56,7 +56,6 @@ mod util;
 mod compile_fail;
 mod test;
 
-#[cfg(feature = "tlv")]
 pub mod tlv;
 
 #[cfg(rayon_unstable)]
diff --git a/rayon-core/src/scope/mod.rs b/rayon-core/src/scope/mod.rs
@@ -16,6 +16,7 @@ use std::ptr;
 use std::sync::atomic::{AtomicPtr, Ordering};
 use std::sync::Arc;
 use unwind;
+use tlv;
 
 mod internal;
 #[cfg(test)]
@@ -43,6 +44,7 @@ impl<'scope> ScopeBuilder<'scope> {
                 panic: AtomicPtr::new(ptr::null_mut()),
                 job_completed_latch: CountLatch::new(),
                 marker: PhantomData,
+                tlv: tlv::get(),
             });
             let scope = self.scope.as_ref().unwrap();
             let result = scope.execute_job_closure(move |_| op(scope));
@@ -78,6 +80,9 @@ pub struct Scope<'scope> {
     /// `Sync`, but it's still safe to let the `Scope` implement `Sync` because
     /// the closures are only *moved* across threads to be executed.
     marker: PhantomData<&'scope ()>,
+
+    /// The TLV at the scope's creation. Used to set the TLV for spawned jobs.
+    tlv: usize,
 }
 
 /// Create a "fork-join" scope `s` and invokes the closure with a
@@ -302,6 +307,7 @@ where
                 panic: AtomicPtr::new(ptr::null_mut()),
                 job_completed_latch: CountLatch::new(),
                 marker: PhantomData,
+                tlv: tlv::get(),
             };
             let result = scope.execute_job_closure(op);
             scope.steal_till_jobs_complete(owner_thread);
@@ -369,7 +375,10 @@ impl<'scope> Scope<'scope> {
     {
         unsafe {
             self.job_completed_latch.increment();
-            let job_ref = Box::new(HeapJob::new(move || self.execute_job(body))).as_job_ref();
+            let job_ref = Box::new(HeapJob::new(
+                self.tlv,
+                move || self.execute_job(body),
+            )).as_job_ref();
 
             // Since `Scope` implements `Sync`, we can't be sure
             // that we're still in a thread of this pool, so we
diff --git a/rayon-core/src/spawn/mod.rs b/rayon-core/src/spawn/mod.rs
@@ -68,7 +68,7 @@ where
     // executed. This ref is decremented at the (*) below.
     registry.increment_terminate_count();
 
-    let async_job = Box::new(HeapJob::new({
+    let async_job = Box::new(HeapJob::new(0, {
         let registry = registry.clone();
         move || {
             match unwind::halt_unwinding(func) {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ use std::any::Any;`
`3`	`3`	`use std::cell::UnsafeCell;`
`4`	`4`	`use std::mem;`
`5`	`5`	`use unwind;`
`6`		`-#[cfg(feature = "tlv")]`
`7`	`6`	`use tlv;`
`8`	`7`
`9`	`8`	`pub enum JobResult<T> {`
`@@ -77,7 +76,6 @@ where`
`77`	`76`	`pub latch: L,`
`78`	`77`	`func: UnsafeCell<Option<F>>,`
`79`	`78`	`result: UnsafeCell<JobResult<R>>,`
`80`		`- #[cfg(feature = "tlv")]`
`81`	`79`	`tlv: usize,`
`82`	`80`	`}`
`83`	`81`
`@@ -92,7 +90,6 @@ where`
`92`	`90`	`latch: latch,`
`93`	`91`	`func: UnsafeCell::new(Some(func)),`
`94`	`92`	`result: UnsafeCell::new(JobResult::None),`
`95`		`- #[cfg(feature = "tlv")]`
`96`	`93`	`tlv: tlv::get(),`
`97`	`94`	`}`
`98`	`95`	`}`
`@@ -118,7 +115,6 @@ where`
`118`	`115`	`{`
`119`	`116`	`unsafe fn execute(this: *const Self) {`
`120`	`117`	`let this = &*this;`
`121`		`- #[cfg(feature = "tlv")]`
`122`	`118`	`tlv::set(this.tlv);`
`123`	`119`	`let abort = unwind::AbortIfPanic;`
`124`	`120`	`let func = (*this.func.get()).take().unwrap();`
`@@ -142,19 +138,17 @@ where`
`142`	`138`	`BODY: FnOnce() + Send,`
`143`	`139`	`{`
`144`	`140`	`job: UnsafeCell<Option<BODY>>,`
`145`		`- #[cfg(feature = "tlv")]`
`146`	`141`	`tlv: usize,`
`147`	`142`	`}`
`148`	`143`
`149`	`144`	`impl<BODY> HeapJob<BODY>`
`150`	`145`	`where`
`151`	`146`	`BODY: FnOnce() + Send,`
`152`	`147`	`{`
`153`		`- pub fn new(func: BODY) -> Self {`
	`148`	`+ pub fn new(tlv: usize, func: BODY) -> Self {`
`154`	`149`	`HeapJob {`
`155`	`150`	`job: UnsafeCell::new(Some(func)),`
`156`		`- #[cfg(feature = "tlv")]`
`157`		`- tlv: tlv::get(),`
	`151`	`+ tlv,`
`158`	`152`	`}`
`159`	`153`	`}`
`160`	`154`
`@@ -173,7 +167,6 @@ where`
`173`	`167`	`{`
`174`	`168`	`unsafe fn execute(this: *const Self) {`
`175`	`169`	`let this: Box<Self> = mem::transmute(this);`
`176`		`- #[cfg(feature = "tlv")]`
`177`	`170`	`tlv::set(this.tlv);`
`178`	`171`	`let job = (*this.job.get()).take().unwrap();`
`179`	`172`	`job();`