diff options
| author | Keith Randall <khr@google.com> | 2019-04-01 12:22:22 -0700 |
|---|---|---|
| committer | Keith Randall <khr@golang.org> | 2019-04-23 17:58:12 +0000 |
| commit | 8515d9cf656dedce3dbcb09ac7dc00f036e454d3 (patch) | |
| tree | 2c48bcb9689c5e3f7656c7edaa24ba8dc85a26ef | |
| parent | fd788a86b6427ef7ec1f25d4d4f0412bc883ccaf (diff) | |
| download | go-8515d9cf656dedce3dbcb09ac7dc00f036e454d3.tar.xz | |
runtime: randomize package initialization order in race mode
This is one small step to force people to not depend on the order of
initialization of packages which are not explicitly ordered by import
directives. Similar to randomizing map iteration order, this makes
sure people aren't depending on the behavior of the current release,
so that we can change the order in future releases without breaking
everyone.
Maybe one day we can randomize always, but for now we do it just in
race mode. (We would need to measure the impact on startup time before
we enabled it always.)
RELNOTE=yes
Change-Id: I99026394796125974c5f2c3660a88becb92c9df3
Reviewed-on: https://go-review.googlesource.com/c/go/+/170318
Run-TryBot: Keith Randall <khr@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>
| -rw-r--r-- | src/runtime/proc.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/runtime/proc.go b/src/runtime/proc.go index e94de3a43a..83f3d5226f 100644 --- a/src/runtime/proc.go +++ b/src/runtime/proc.go @@ -5209,6 +5209,15 @@ func doInit(t *initTask) { throw("recursive call during initialization - linker skew") default: // not initialized yet t.state = 1 // initialization in progress + if raceenabled { + // Randomize initialization order of packages t depends on. + // TODO: enable always instead of just for race? + s := *(*[]uintptr)(unsafe.Pointer(&slice{array: add(unsafe.Pointer(t), 3*sys.PtrSize), len: int(t.ndeps), cap: int(t.ndeps)})) + for i := len(s) - 1; i > 0; i-- { + j := int(fastrandn(uint32(i + 1))) + s[i], s[j] = s[j], s[i] + } + } for i := uintptr(0); i < t.ndeps; i++ { p := add(unsafe.Pointer(t), (3+i)*sys.PtrSize) t2 := *(**initTask)(p) |