Merge pull request #1720 from weaveworks/reduce-gc

Improve performance of immutable maps

common/xfer/plugin_spec.go

@@ -7,8 +7,8 @@ import (
 	"sort"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/mndrix/ps"
 	"github.com/ugorji/go/codec"
+	"github.com/weaveworks/ps"
 
 	"github.com/weaveworks/scope/test/reflect"
 )

report/counters.go

@@ -7,8 +7,8 @@ import (
 	"reflect"
 	"sort"
 
-	"github.com/mndrix/ps"
 	"github.com/ugorji/go/codec"
+	"github.com/weaveworks/ps"
 )
 
 // Counters is a string->int map.

report/edge_metadatas.go

@@ -8,8 +8,8 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/mndrix/ps"
 	"github.com/ugorji/go/codec"
+	"github.com/weaveworks/ps"
 )
 
 // EdgeMetadatas collect metadata about each edge in a topology. Keys are the

report/latest_map.go

@@ -2,13 +2,12 @@ package report
 
 import (
 	"bytes"
-	"encoding/gob"
 	"fmt"
 	"sort"
 	"time"
 
-	"github.com/mndrix/ps"
 	"github.com/ugorji/go/codec"
+	"github.com/weaveworks/ps"
 )
 
 // LatestMap is a persitent map which support latest-win merges. We have to
@@ -169,7 +168,7 @@ func (m LatestMap) DeepEqual(n LatestMap) bool {
 }
 
 func (m LatestMap) toIntermediate() map[string]LatestEntry {
-	intermediate := map[string]LatestEntry{}
+	intermediate := make(map[string]LatestEntry, m.Size())
 	if m.Map != nil {
 		m.Map.ForEach(func(key string, val interface{}) {
 			intermediate[key] = val.(LatestEntry)
@@ -178,14 +177,6 @@ func (m LatestMap) toIntermediate() map[string]LatestEntry {
 	return intermediate
 }
 
-func (m LatestMap) fromIntermediate(in map[string]LatestEntry) LatestMap {
-	out := ps.NewMap()
-	for k, v := range in {
-		out = out.Set(k, v)
-	}
-	return LatestMap{out}
-}
-
 // CodecEncodeSelf implements codec.Selfer
 func (m *LatestMap) CodecEncodeSelf(encoder *codec.Encoder) {
 	if m.Map != nil {
@@ -233,7 +224,7 @@ func (m *LatestMap) CodecDecodeSelf(decoder *codec.Decoder) {
 			decoder.Decode(&value)
 		}
 
-		out = out.Set(key, value)
+		out = out.UnsafeMutableSet(key, value)
 	}
 	z.DecSendContainerState(containerMapEnd)
 	*m = LatestMap{out}
@@ -248,20 +239,3 @@ func (LatestMap) MarshalJSON() ([]byte, error) {
 func (*LatestMap) UnmarshalJSON(b []byte) error {
 	panic("UnmarshalJSON shouldn't be used, use CodecDecodeSelf instead")
 }
-
-// GobEncode implements gob.Marshaller
-func (m LatestMap) GobEncode() ([]byte, error) {
-	buf := bytes.Buffer{}
-	err := gob.NewEncoder(&buf).Encode(m.toIntermediate())
-	return buf.Bytes(), err
-}
-
-// GobDecode implements gob.Unmarshaller
-func (m *LatestMap) GobDecode(input []byte) error {
-	in := map[string]LatestEntry{}
-	if err := gob.NewDecoder(bytes.NewBuffer(input)).Decode(&in); err != nil {
-		return err
-	}
-	*m = LatestMap{}.fromIntermediate(in)
-	return nil
-}

report/latest_map_internal_test.go

@@ -163,67 +163,39 @@ func TestLatestMapEncoding(t *testing.T) {
 		Set("foo", now, "bar").
 		Set("bar", now, "baz")
 
-	{
-		gobs, err := want.GobEncode()
-		if err != nil {
-			t.Fatal(err)
-		}
+	for _, h := range []codec.Handle{
+		codec.Handle(&codec.MsgpackHandle{}),
+		codec.Handle(&codec.JsonHandle{}),
+	} {
+		buf := &bytes.Buffer{}
+		encoder := codec.NewEncoder(buf, h)
+		want.CodecEncodeSelf(encoder)
+		decoder := codec.NewDecoder(buf, h)
 		have := EmptyLatestMap
-		have.GobDecode(gobs)
+		have.CodecDecodeSelf(decoder)
 		if !reflect.DeepEqual(want, have) {
 			t.Error(test.Diff(want, have))
 		}
 	}
 
-	{
-
-		for _, h := range []codec.Handle{
-			codec.Handle(&codec.MsgpackHandle{}),
-			codec.Handle(&codec.JsonHandle{}),
-		} {
-			buf := &bytes.Buffer{}
-			encoder := codec.NewEncoder(buf, h)
-			want.CodecEncodeSelf(encoder)
-			decoder := codec.NewDecoder(buf, h)
-			have := EmptyLatestMap
-			have.CodecDecodeSelf(decoder)
-			if !reflect.DeepEqual(want, have) {
-				t.Error(test.Diff(want, have))
-			}
-		}
-	}
 }
 
 func TestLatestMapEncodingNil(t *testing.T) {
 	want := LatestMap{}
 
-	{
-		gobs, err := want.GobEncode()
-		if err != nil {
-			t.Fatal(err)
-		}
+	for _, h := range []codec.Handle{
+		codec.Handle(&codec.MsgpackHandle{}),
+		codec.Handle(&codec.JsonHandle{}),
+	} {
+		buf := &bytes.Buffer{}
+		encoder := codec.NewEncoder(buf, h)
+		want.CodecEncodeSelf(encoder)
+		decoder := codec.NewDecoder(buf, h)
 		have := EmptyLatestMap
-		have.GobDecode(gobs)
-		if have.Map == nil {
-			t.Error("Decoded LatestMap.psMap should not be nil")
+		have.CodecDecodeSelf(decoder)
+		if !reflect.DeepEqual(want, have) {
+			t.Error(test.Diff(want, have))
 		}
 	}
 
-	{
-
-		for _, h := range []codec.Handle{
-			codec.Handle(&codec.MsgpackHandle{}),
-			codec.Handle(&codec.JsonHandle{}),
-		} {
-			buf := &bytes.Buffer{}
-			encoder := codec.NewEncoder(buf, h)
-			want.CodecEncodeSelf(encoder)
-			decoder := codec.NewDecoder(buf, h)
-			have := EmptyLatestMap
-			have.CodecDecodeSelf(decoder)
-			if !reflect.DeepEqual(want, have) {
-				t.Error(test.Diff(want, have))
-			}
-		}
-	}
 }

report/metrics.go

@@ -6,8 +6,8 @@ import (
 	"math"
 	"time"
 
-	"github.com/mndrix/ps"
 	"github.com/ugorji/go/codec"
+	"github.com/weaveworks/ps"
 )
 
 // Metrics is a string->metric map.

report/node_set.go

@@ -7,8 +7,8 @@ import (
 	"sort"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/mndrix/ps"
 	"github.com/ugorji/go/codec"
+	"github.com/weaveworks/ps"
 
 	"github.com/weaveworks/scope/test/reflect"
 )

report/sets.go

@@ -7,8 +7,8 @@ import (
 	"reflect"
 	"sort"
 
-	"github.com/mndrix/ps"
 	"github.com/ugorji/go/codec"
+	"github.com/weaveworks/ps"
 )
 
 // Sets is a string->set-of-strings map.