Commit fbf5fd5f authored by Dmitriy Vyukov's avatar Dmitriy Vyukov

runtime/race: update runtime to rev 188542

Fixes #6107.
race: output goroutine 1 as main goroutine

Fixes #6130.
race: option to abort program on first detected error

R=golang-dev, mikioh.mikioh
CC=golang-dev
https://golang.org/cl/12968044
parent 727dd08c
...@@ -9,3 +9,4 @@ $ ./buildgo.sh ...@@ -9,3 +9,4 @@ $ ./buildgo.sh
Tested with gcc 4.6.1 and 4.7.0. On Windows it's built with 64-bit MinGW. Tested with gcc 4.6.1 and 4.7.0. On Windows it's built with 64-bit MinGW.
Current runtime is built on rev 188542.
...@@ -61,6 +61,7 @@ var tests = []struct { ...@@ -61,6 +61,7 @@ var tests = []struct {
}{ }{
{"simple", ` {"simple", `
package main package main
import "time"
func main() { func main() {
done := make(chan bool) done := make(chan bool)
x := 0 x := 0
...@@ -75,6 +76,7 @@ func startRacer(x *int, done chan bool) { ...@@ -75,6 +76,7 @@ func startRacer(x *int, done chan bool) {
go racer(x, done) go racer(x, done)
} }
func racer(x *int, done chan bool) { func racer(x *int, done chan bool) {
time.Sleep(10*time.Millisecond)
store(x, 42) store(x, 42)
done <- true done <- true
} }
...@@ -82,26 +84,21 @@ func racer(x *int, done chan bool) { ...@@ -82,26 +84,21 @@ func racer(x *int, done chan bool) {
WARNING: DATA RACE WARNING: DATA RACE
Write by goroutine [0-9]: Write by goroutine [0-9]:
main\.store\(\) main\.store\(\)
.*/main\.go:11 \+0x[0-9,a-f]+ .*/main\.go:12 \+0x[0-9,a-f]+
main\.racer\(\) main\.racer\(\)
.*/main\.go:17 \+0x[0-9,a-f]+ .*/main\.go:19 \+0x[0-9,a-f]+
Previous write by goroutine 1: Previous write by main goroutine:
main\.store\(\) main\.store\(\)
.*/main\.go:11 \+0x[0-9,a-f]+ .*/main\.go:12 \+0x[0-9,a-f]+
main\.main\(\) main\.main\(\)
.*/main\.go:7 \+0x[0-9,a-f]+ .*/main\.go:8 \+0x[0-9,a-f]+
Goroutine 3 \(running\) created at: Goroutine [0-9] \(running\) created at:
main\.startRacer\(\) main\.startRacer\(\)
.*/main\.go:14 \+0x[0-9,a-f]+ .*/main\.go:15 \+0x[0-9,a-f]+
main\.main\(\) main\.main\(\)
.*/main\.go:6 \+0x[0-9,a-f]+ .*/main\.go:7 \+0x[0-9,a-f]+
Goroutine 1 \(running\) created at:
_rt0_go\(\)
.*/src/pkg/runtime/asm_amd64\.s:[0-9]+ \+0x[0-9,a-f]+
================== ==================
Found 1 data race\(s\) Found 1 data race\(s\)
exit status 66 exit status 66
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment