From 37715cce695e96d3d5a8e01f5009517121241330 Mon Sep 17 00:00:00 2001 From: Cherry Zhang Date: Tue, 19 Nov 2019 16:04:32 -0500 Subject: [PATCH] runtime: relax TestAsyncPreempt In TestAsyncPreempt, the function being tested for preemption, although still asynchronously preemptible, may have only samll ranges of PCs that are preemtible. In an unlucky run, it may take quite a while to have a signal that lands on a preemptible instruction. The test case is kind of an extreme. Relax it to make it more preemptible. In the original version, the first closure has more work to do, and it is not a leaf function, and the second test case is a frameless leaf function. In the current version, the first one is also a frameless leaf function (the atomic is intrinsified). Add some calls to it. It is still not preemptible without async preemption. Fixes #35608. Change-Id: Ia4f857f2afc55501c6568d7507b517e3b4db191c Reviewed-on: https://go-review.googlesource.com/c/go/+/208221 Run-TryBot: Cherry Zhang Reviewed-by: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- src/runtime/testdata/testprog/preempt.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/runtime/testdata/testprog/preempt.go b/src/runtime/testdata/testprog/preempt.go index c08b29b65a..1454095cde 100644 --- a/src/runtime/testdata/testprog/preempt.go +++ b/src/runtime/testdata/testprog/preempt.go @@ -26,6 +26,8 @@ func AsyncPreempt() { go func() { for { atomic.StoreUint32(&ready, 1) + dummy() + dummy() } }() // Also start one with a frameless function. @@ -53,8 +55,11 @@ func AsyncPreempt() { //go:noinline func frameless() { for i := int64(0); i < 1<<62; i++ { - out += i + out += i * i * i * i * i * 12345 } } var out int64 + +//go:noinline +func dummy() {} -- 2.50.0