tests: reduce iterations for the atomic and semaphore tests, to speed up test-fixed

pull/5888/head
Delyan Angelov 2020-07-20 11:14:55 +03:00
parent 9f6aacb739
commit 587b9dd8aa
3 changed files with 37 additions and 29 deletions

View File

@ -1,34 +1,42 @@
import atomic2 import atomic2
import sync import sync
const (
iterations_per_cycle = 100_000
)
struct Counter { struct Counter {
mut: mut:
counter u64 = 0 counter u64 = 0
} }
// without proper syncronization this would fail // without proper syncronization this would fail
fn test_count_100_milion_should_result_100_million() { fn test_count_10_times_1_cycle_should_result_10_cycles_with_sync() {
desired_iterations := 10 * iterations_per_cycle
mut wg := sync.new_waitgroup() mut wg := sync.new_waitgroup()
mut counter := &Counter{} mut counter := &Counter{}
wg.add(10) wg.add(10)
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
go count_ten_million(mut counter, mut wg) go count_one_cycle(mut counter, mut wg)
} }
wg.wait() wg.wait()
assert counter.counter == 10000000 assert counter.counter == desired_iterations
eprintln(' with synchronization the counter is: ${counter.counter:10} , expectedly == ${desired_iterations:10}')
} }
// This test just to make sure that we have an anti-test to prove it works // This test just to make sure that we have an anti-test to prove it works
// fn test_count_100_milion_should_fail_100_million_without_sync() { fn test_count_10_times_1_cycle_should_not_be_10_cycles_without_sync() {
// mut wg := sync.new_waitgroup() desired_iterations := 10 * iterations_per_cycle
// mut counter := &Counter{} mut wg := sync.new_waitgroup()
// wg.add(10) mut counter := &Counter{}
// for i := 0; i < 10; i++ { wg.add(10)
// go count_ten_million_without_sync(mut counter, mut wg) for i := 0; i < 10; i++ {
// } go count_one_cycle_without_sync(mut counter, mut wg)
// wg.wait() }
// assert counter.counter != 10000000 wg.wait()
// } // NB: we do not assert here, just print, because sometimes by chance counter.counter may be == desired_iterations
eprintln('without synchronization the counter is: ${counter.counter:10} , expectedly != ${desired_iterations:10}')
}
fn test_count_plus_one_u64() { fn test_count_plus_one_u64() {
mut c := u64(0) mut c := u64(0)
@ -78,18 +86,18 @@ fn test_count_minus_greater_than_one_i64() {
assert c == -10 assert c == -10
} }
// count_ten_million counts the common counter 10 million times in thread-safe way // count_one_cycle counts the common counter iterations_per_cycle times in thread-safe way
fn count_ten_million(mut counter Counter, mut group sync.WaitGroup) { fn count_one_cycle(mut counter Counter, mut group sync.WaitGroup) {
for i := 0; i < 1000000; i++ { for i := 0; i < iterations_per_cycle; i++ {
atomic2.add_u64(&counter.counter, 1) atomic2.add_u64(&counter.counter, 1)
} }
group.done() group.done()
} }
// // count_ten_million_without_sync counts the common counter 10 million times in none thread-safe way // count_one_cycle_without_sync counts the common counter iterations_per_cycle times in none thread-safe way
// fn count_ten_million_without_sync(mut counter Counter, mut group sync.WaitGroup) { fn count_one_cycle_without_sync(mut counter Counter, mut group sync.WaitGroup) {
// for i := 0; i < 1000000; i++ { for i := 0; i < iterations_per_cycle; i++ {
// counter.counter++ counter.counter++
// } }
// group.done() group.done()
// } }

View File

@ -1,7 +1,7 @@
import sync import sync
const ( const (
signals_per_thread = 10000000 signals_per_thread = 100_000
) )
fn send_signals(sem, sem_end sync.Semaphore) { fn send_signals(sem, sem_end sync.Semaphore) {

View File

@ -5,23 +5,23 @@ fn run_forever(shared foo []int, sem sync.Semaphore) {
for { for {
foo[0]++ foo[0]++
} }
sem.post() // indicat that thread is finished - never happens sem.post() // indicate that thread is finished - never happens
} }
fn test_semaphore() { fn test_semaphore() {
shared abc := &[0] shared abc := &[0]
sem := sync.new_semaphore() sem := sync.new_semaphore()
go run_forever(shared abc, sem) go run_forever(shared abc, sem)
for _ in 0 .. 100000 { for _ in 0 .. 1000 {
abc[0]-- abc[0]--
} }
// wait for the 2 coroutines to finish using the semaphore // wait for the 2 coroutines to finish using the semaphore
stopwatch := time.new_stopwatch({}) stopwatch := time.new_stopwatch({})
mut elapsed := stopwatch.elapsed() mut elapsed := stopwatch.elapsed()
if !sem.timed_wait(500 * time.millisecond) { if !sem.timed_wait(50 * time.millisecond) {
// we should come here due to timeout // we should come here due to timeout
elapsed = stopwatch.elapsed() elapsed = stopwatch.elapsed()
} }
println('elapsed: ${f64(elapsed)/time.second}s') println('elapsed: ${f64(elapsed)/time.second}s')
assert elapsed >= 495 * time.millisecond assert elapsed >= 48* time.millisecond
} }