sync: add Once.do_with_param/2 method in addition to the existing Once.do/1 (workaround the absence of closures on windows)
parent
5d2995c4d5
commit
dd835acb8d
|
@ -16,7 +16,7 @@ pub fn new_once() &Once {
|
||||||
return once
|
return once
|
||||||
}
|
}
|
||||||
|
|
||||||
// do execute the function only once.
|
// do executes the function `f()` only once
|
||||||
pub fn (mut o Once) do(f fn ()) {
|
pub fn (mut o Once) do(f fn ()) {
|
||||||
if stdatomic.load_u64(&o.count) < 1 {
|
if stdatomic.load_u64(&o.count) < 1 {
|
||||||
o.do_slow(f)
|
o.do_slow(f)
|
||||||
|
@ -31,3 +31,34 @@ fn (mut o Once) do_slow(f fn ()) {
|
||||||
}
|
}
|
||||||
o.m.unlock()
|
o.m.unlock()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// do_with_param executes `f(param)` only once`
|
||||||
|
// This method can be used as a workaround for passing closures to once.do/1 on Windows
|
||||||
|
// (they are not implemented there yet) - just pass your data explicitly.
|
||||||
|
// i.e. instead of:
|
||||||
|
// ```v
|
||||||
|
// once.do(fn [mut o] () {
|
||||||
|
// o.add(5)
|
||||||
|
// })
|
||||||
|
// ```
|
||||||
|
// ... you can use:
|
||||||
|
// ```v
|
||||||
|
// once.do_with_param(fn (mut o One) {
|
||||||
|
// o.add(5)
|
||||||
|
// }, o)
|
||||||
|
// ```
|
||||||
|
|
||||||
|
pub fn (mut o Once) do_with_param(f fn (voidptr), param voidptr) {
|
||||||
|
if stdatomic.load_u64(&o.count) < 1 {
|
||||||
|
o.do_slow_with_param(f, param)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn (mut o Once) do_slow_with_param(f fn (p voidptr), param voidptr) {
|
||||||
|
o.m.@lock()
|
||||||
|
if o.count < 1 {
|
||||||
|
stdatomic.store_u64(&o.count, 1)
|
||||||
|
f(param)
|
||||||
|
}
|
||||||
|
o.m.unlock()
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,39 @@
|
||||||
|
import sync
|
||||||
|
|
||||||
|
// NB: this is the same test as `vlib/sync/once_test.v`, but
|
||||||
|
// it uses an explicit passing of the voidptr parameter in
|
||||||
|
// once.do_with_param/2, instead of passing a closure of it
|
||||||
|
// in once.do/1.
|
||||||
|
// Closures are not yet implemented on Windows.
|
||||||
|
|
||||||
|
struct One {
|
||||||
|
pub mut:
|
||||||
|
i int
|
||||||
|
}
|
||||||
|
|
||||||
|
fn (mut o One) add(i int) {
|
||||||
|
o.i = o.i + i
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run(mut once sync.Once, mut o One, c chan bool) {
|
||||||
|
once.do_with_param(fn (mut o One) {
|
||||||
|
o.add(5)
|
||||||
|
}, o)
|
||||||
|
c <- true
|
||||||
|
}
|
||||||
|
|
||||||
|
fn test_once() {
|
||||||
|
mut o := &One{}
|
||||||
|
mut once := sync.new_once()
|
||||||
|
c := chan bool{}
|
||||||
|
n := 10
|
||||||
|
|
||||||
|
// It is executed 10 times, but only once actually.
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
go run(mut once, mut o, c)
|
||||||
|
}
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
<-c
|
||||||
|
}
|
||||||
|
assert o.i == 5
|
||||||
|
}
|
Loading…
Reference in New Issue