Commit 3a7a56cc authored by Michael Anthony Knyszek's avatar Michael Anthony Knyszek Committed by Michael Knyszek

runtime: gofmt all improperly formatted code

This change fixes incorrect formatting in mheap.go (the result of my
previous heap scavenging changes) and map_test.go.

Change-Id: I2963687504abdc4f0cdf2f0c558174b3bc0ed2df
Reviewed-on: https://go-review.googlesource.com/c/148977
Run-TryBot: Michael Knyszek <mknyszek@google.com>
Reviewed-by: default avatarAustin Clements <austin@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent 8607b2e8
...@@ -435,11 +435,11 @@ func TestEmptyKeyAndValue(t *testing.T) { ...@@ -435,11 +435,11 @@ func TestEmptyKeyAndValue(t *testing.T) {
// ("quick keys") as well as long keys. // ("quick keys") as well as long keys.
func TestSingleBucketMapStringKeys_DupLen(t *testing.T) { func TestSingleBucketMapStringKeys_DupLen(t *testing.T) {
testMapLookups(t, map[string]string{ testMapLookups(t, map[string]string{
"x": "x1val", "x": "x1val",
"xx": "x2val", "xx": "x2val",
"foo": "fooval", "foo": "fooval",
"bar": "barval", // same key length as "foo" "bar": "barval", // same key length as "foo"
"xxxx": "x4val", "xxxx": "x4val",
strings.Repeat("x", 128): "longval1", strings.Repeat("x", 128): "longval1",
strings.Repeat("y", 128): "longval2", strings.Repeat("y", 128): "longval2",
}) })
......
...@@ -903,7 +903,7 @@ HaveSpan: ...@@ -903,7 +903,7 @@ HaveSpan:
// If s was scavenged, then t may be scavenged. // If s was scavenged, then t may be scavenged.
start, end := t.physPageBounds() start, end := t.physPageBounds()
if s.scavenged && start < end { if s.scavenged && start < end {
memstats.heap_released += uint64(end-start) memstats.heap_released += uint64(end - start)
t.scavenged = true t.scavenged = true
} }
s.state = mSpanManual // prevent coalescing with s s.state = mSpanManual // prevent coalescing with s
...@@ -1146,7 +1146,7 @@ func (h *mheap) scavengeLargest(nbytes uintptr) { ...@@ -1146,7 +1146,7 @@ func (h *mheap) scavengeLargest(nbytes uintptr) {
// //
// This check also preserves the invariant that spans that have // This check also preserves the invariant that spans that have
// `scavenged` set are only ever in the `scav` treap, and // `scavenged` set are only ever in the `scav` treap, and
// those which have it unset are only in the `free` treap. // those which have it unset are only in the `free` treap.
return return
} }
prev := t.pred() prev := t.pred()
...@@ -1175,7 +1175,7 @@ func (h *mheap) scavengeAll(now, limit uint64) uintptr { ...@@ -1175,7 +1175,7 @@ func (h *mheap) scavengeAll(now, limit uint64) uintptr {
for t != nil { for t != nil {
s := t.spanKey s := t.spanKey
next := t.succ() next := t.succ()
if (now-uint64(s.unusedsince)) > limit { if (now - uint64(s.unusedsince)) > limit {
r := s.scavenge() r := s.scavenge()
if r != 0 { if r != 0 {
// If we ended up scavenging s, then remove it from unscav // If we ended up scavenging s, then remove it from unscav
......
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