qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-25 01:20:13 -06:00
Code Releases Activity

runtime: use readrange instead of read to check for races

Browse Source 
on map keys and values which are now passed by reference.

R=dvyukov, khr
CC=golang-codereviews
https://golang.org/cl/43490044
This commit is contained in:
Keith Randall 2013-12-30 12:03:56 -08:00
parent 7ff57e2fa1
commit 1cc2ff8fc7
2 changed files with 99 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/pkg/runtime/hashmap.c
View File

@ -7,6 +7,7 @@
#include "malloc.h"
#include "type.h"
#include "race.h"
#include "typekind.h"
#include "../../cmd/ld/textflag.h"
// This file contains the implementation of Go's map type.
@ -997,7 +998,10 @@ runtime·mapaccess1(MapType *t, Hmap *h, byte *ak, byte *av)
{
if(raceenabled && h != nil) {
runtime·racereadpc(h, runtime·getcallerpc(&t), runtime·mapaccess1);
runtime·racereadpc(ak, runtime·getcallerpc(&t), runtime·mapaccess1);
if(t->key->kind == KindArray || t->key->kind == KindStruct)
runtime·racereadrangepc(ak, t->key->size, runtime·getcallerpc(&t), runtime·mapaccess1);
else
runtime·racereadpc(ak, runtime·getcallerpc(&t), runtime·mapaccess1);
}
if(h == nil || h->count == 0) {
av = t->elem->zero;
@ -1028,7 +1032,10 @@ runtime·mapaccess2(MapType *t, Hmap *h, byte *ak, byte *av, bool pres)
{
if(raceenabled && h != nil) {
runtime·racereadpc(h, runtime·getcallerpc(&t), runtime·mapaccess2);
runtime·racereadpc(ak, runtime·getcallerpc(&t), runtime·mapaccess2);
if(t->key->kind == KindArray || t->key->kind == KindStruct)
runtime·racereadrangepc(ak, t->key->size, runtime·getcallerpc(&t), runtime·mapaccess2);
else
runtime·racereadpc(ak, runtime·getcallerpc(&t), runtime·mapaccess2);
}
if(h == nil || h->count == 0) {
@ -1066,7 +1073,10 @@ reflect·mapaccess(MapType *t, Hmap *h, byte *key, byte *val)
{
if(raceenabled && h != nil) {
runtime·racereadpc(h, runtime·getcallerpc(&t), reflect·mapaccess);
runtime·racereadrangepc(key, t->key->size, runtime·getcallerpc(&t), reflect·mapaccess);
if(t->key->kind == KindArray || t->key->kind == KindStruct)
runtime·racereadrangepc(key, t->key->size, runtime·getcallerpc(&t), reflect·mapaccess);
else
runtime·racereadpc(key, runtime·getcallerpc(&t), reflect·mapaccess);
}
val = hash_lookup(t, h, &key);
FLUSH(&val);
@ -1082,8 +1092,14 @@ runtime·mapassign1(MapType *t, Hmap *h, byte *ak, byte *av)
if(raceenabled) {
runtime·racewritepc(h, runtime·getcallerpc(&t), runtime·mapassign1);
runtime·racereadpc(ak, runtime·getcallerpc(&t), runtime·mapassign1);
runtime·racereadpc(av, runtime·getcallerpc(&t), runtime·mapassign1);
if(t->key->kind == KindArray || t->key->kind == KindStruct)
runtime·racereadrangepc(ak, t->key->size, runtime·getcallerpc(&t), runtime·mapassign1);
else
runtime·racereadpc(ak, runtime·getcallerpc(&t), runtime·mapassign1);
if(t->elem->kind == KindArray || t->elem->kind == KindStruct)
runtime·racereadrangepc(av, t->elem->size, runtime·getcallerpc(&t), runtime·mapassign1);
else
runtime·racereadpc(av, runtime·getcallerpc(&t), runtime·mapassign1);
}
hash_insert(t, h, ak, av);
@ -1109,7 +1125,10 @@ runtime·mapdelete(MapType *t, Hmap *h, byte *ak)
if(raceenabled) {
runtime·racewritepc(h, runtime·getcallerpc(&t), runtime·mapdelete);
runtime·racereadpc(ak, runtime·getcallerpc(&t), runtime·mapdelete);
if(t->key->kind == KindArray || t->key->kind == KindStruct)
runtime·racereadrangepc(ak, t->key->size, runtime·getcallerpc(&t), runtime·mapdelete);
else
runtime·racereadpc(ak, runtime·getcallerpc(&t), runtime·mapdelete);
}
hash_remove(t, h, ak);
@ -1132,8 +1151,14 @@ reflect·mapassign(MapType *t, Hmap *h, byte *key, byte *val)
runtime·panicstring("assignment to entry in nil map");
if(raceenabled) {
runtime·racewritepc(h, runtime·getcallerpc(&t), reflect·mapassign);
runtime·racereadrangepc(key, t->key->size, runtime·getcallerpc(&t), reflect·mapassign);
runtime·racereadrangepc(val, t->elem->size, runtime·getcallerpc(&t), reflect·mapassign);
if(t->key->kind == KindArray || t->key->kind == KindStruct)
runtime·racereadrangepc(key, t->key->size, runtime·getcallerpc(&t), reflect·mapassign);
else
runtime·racereadpc(key, runtime·getcallerpc(&t), reflect·mapassign);
if(t->elem->kind == KindArray || t->elem->kind == KindStruct)
runtime·racereadrangepc(val, t->elem->size, runtime·getcallerpc(&t), reflect·mapassign);
else
runtime·racereadpc(val, runtime·getcallerpc(&t), reflect·mapassign);
}
hash_insert(t, h, key, val);
@ -1157,8 +1182,11 @@ reflect·mapdelete(MapType *t, Hmap *h, byte *key)
if(h == nil)
runtime·panicstring("delete from nil map");
if(raceenabled) {
runtime·racewritepc(h, runtime·getcallerpc(&t), reflect·mapassign);
runtime·racereadrangepc(key, t->key->size, runtime·getcallerpc(&t), reflect·mapassign);
runtime·racewritepc(h, runtime·getcallerpc(&t), reflect·mapdelete);
if(t->key->kind == KindArray || t->key->kind == KindStruct)
runtime·racereadrangepc(key, t->key->size, runtime·getcallerpc(&t), reflect·mapdelete);
else
runtime·racereadpc(key, runtime·getcallerpc(&t), reflect·mapdelete);
}
hash_remove(t, h, key);

61
src/pkg/runtime/race/testdata/map_test.go vendored
View File

@ -159,3 +159,64 @@ func TestRaceMapVariable3(t *testing.T) {
m = make(map[int]int)
<-ch
}
type Big struct {
x [17]int32
}
func TestRaceMapLookupPartKey(t *testing.T) {
k := &Big{}
m := make(map[Big]bool)
ch := make(chan bool, 1)
go func() {
k.x[8] = 1
ch <- true
}()
_ = m[*k]
<-ch
}
func TestRaceMapLookupPartKey2(t *testing.T) {
k := &Big{}
m := make(map[Big]bool)
ch := make(chan bool, 1)
go func() {
k.x[8] = 1
ch <- true
}()
_, _ = m[*k]
<-ch
}
func TestRaceMapDeletePartKey(t *testing.T) {
k := &Big{}
m := make(map[Big]bool)
ch := make(chan bool, 1)
go func() {
k.x[8] = 1
ch <- true
}()
delete(m, *k)
<-ch
}
func TestRaceMapInsertPartKey(t *testing.T) {
k := &Big{}
m := make(map[Big]bool)
ch := make(chan bool, 1)
go func() {
k.x[8] = 1
ch <- true
}()
m[*k] = true
<-ch
}
func TestRaceMapInsertPartVal(t *testing.T) {
v := &Big{}
m := make(map[int]Big)
ch := make(chan bool, 1)
go func() {
v.x[8] = 1
ch <- true
}()
m[1] = *v
<-ch
}