Commit 05a2dcd

authored

Merge pull request #4154 from RalfJung/linux-futex

make linux-futex test less flaky

2 parents 584bb0d + 37030ac commit 05a2dcdCopy full SHA for 05a2dcd

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ fn concurrent_wait_wake() {`
`235`	`235`	`static mut DATA: i32 = 0;`
`236`	`236`	`static WOKEN: AtomicI32 = AtomicI32::new(0);`
`237`	`237`
`238`		`- let rounds = 50;`
	`238`	`+ let rounds = 64;`
`239`	`239`	`for _ in 0..rounds {`
`240`	`240`	`unsafe { DATA = 0 }; // Reset`
`241`	`241`	`// Suppose the main thread is holding a lock implemented using futex...`
`@@ -267,8 +267,7 @@ fn concurrent_wait_wake() {`
`267`	`267`	`}`
`268`	`268`	`});`
`269`	`269`	`// Increase the chance that the other thread actually goes to sleep.`
`270`		`- // (5 yields in a loop seem to make that happen around 40% of the time.)`
`271`		`- for _ in 0..5 {`
	`270`	`+ for _ in 0..6 {`
`272`	`271`	`thread::yield_now();`
`273`	`272`	`}`
`274`	`273`

Comments

(0)