From 00a60905382d071063e08bf5d0350a8de7edb51c Mon Sep 17 00:00:00 2001 From: Owen Date: Wed, 30 Aug 2023 20:09:02 +0100 Subject: [PATCH] Added benchmark + improved Calc performance. --- communityid_v1.go | 41 ++++++++++++++++++++++++++++------------- communityid_v1_test.go | 37 +++++++++++++++++++++++++++++++++++++ go.mod | 18 ++++++++++++------ go.sum | 27 ++++++++++++++++----------- 4 files changed, 93 insertions(+), 30 deletions(-) diff --git a/communityid_v1.go b/communityid_v1.go index 91c7f23..8e1a6bc 100644 --- a/communityid_v1.go +++ b/communityid_v1.go @@ -6,6 +6,8 @@ import ( "encoding/binary" "fmt" "hash" + + "github.com/samber/lo" ) // CommunityIDv1 encapsulates the calculation code for version 1 of the @@ -38,21 +40,34 @@ func (cid CommunityIDv1) CalcBase64(ft FlowTuple) string { // Hash returns a hash.Hash instance (SHA1) in a state corresponding to all // input value already dealt with in the hash. func (cid CommunityIDv1) Hash(ft FlowTuple) hash.Hash { - h := sha1.New() - binary.Write(h, binary.BigEndian, cid.Seed) - if ft.Srcip.To4() != nil { - binary.Write(h, binary.BigEndian, ft.Srcip.To4()) - } else if ft.Srcip.To16() != nil { - binary.Write(h, binary.BigEndian, ft.Srcip.To16()) + const ( + maxParameterSizeIPv6 = 40 + maxParameterSizeIPv4 = 16 + ) + buffer := lo.TernaryF(ft.Srcip.To4() != nil && ft.Dstip.To4() != nil, func() []byte { + return make([]byte, 2, maxParameterSizeIPv4) + }, func() []byte { + return make([]byte, 2, maxParameterSizeIPv6) + }) + + binary.BigEndian.PutUint16(buffer, cid.Seed) + + if v4SrcAddress := ft.Srcip.To4(); v4SrcAddress != nil { + buffer = append(buffer, v4SrcAddress...) + } else if v6SrcAddress := ft.Srcip.To16(); v6SrcAddress != nil { + buffer = append(buffer, v6SrcAddress...) } - if ft.Dstip.To4() != nil { - binary.Write(h, binary.BigEndian, ft.Dstip.To4()) - } else if ft.Dstip.To16() != nil { - binary.Write(h, binary.BigEndian, ft.Dstip.To16()) + if v4DstAddress := ft.Dstip.To4(); v4DstAddress != nil { + buffer = append(buffer, v4DstAddress...) + } else if v6DstAddress := ft.Dstip.To16(); v6DstAddress != nil { + buffer = append(buffer, v6DstAddress...) } - h.Write([]byte{ft.Proto, 0}) - binary.Write(h, binary.BigEndian, ft.Srcport) - binary.Write(h, binary.BigEndian, ft.Dstport) + buffer = append(buffer, ft.Proto, 0) + buffer = binary.BigEndian.AppendUint16(buffer, ft.Srcport) + buffer = binary.BigEndian.AppendUint16(buffer, ft.Dstport) + + h := sha1.New() + h.Write(buffer) return h } diff --git a/communityid_v1_test.go b/communityid_v1_test.go index fe1ba32..7afedc7 100644 --- a/communityid_v1_test.go +++ b/communityid_v1_test.go @@ -200,3 +200,40 @@ func TestCommunityIDv1UDP(t *testing.T) { }, MakeFlowTupleUDP) } + +func BenchmarkCalc(b *testing.B) { + v4Tpl := FlowTuple{ + Dstip: net.ParseIP("1.2.3.4"), + Srcip: net.ParseIP("4.5.6.7"), + Srcport: 2, + Dstport: 1, + Proto: 6, + } + v6Tpl := FlowTuple{ + Dstip: net.ParseIP("fe80::200:86ff:fe05:80da"), + Srcip: net.ParseIP("fe80::260:97ff:fe07:69ea"), + Srcport: 2, + Dstport: 1, + Proto: 6, + } + + cid := CommunityIDv1{ + Seed: 0, + } + + b.Run("IPv4", func(b *testing.B) { + b.ResetTimer() + b.ReportAllocs() + for n := 0; n < b.N; n++ { + cid.Calc(v4Tpl) + } + }) + + b.Run("IPv6", func(b *testing.B) { + b.ResetTimer() + b.ReportAllocs() + for n := 0; n < b.N; n++ { + cid.Calc(v6Tpl) + } + }) +} diff --git a/go.mod b/go.mod index facc81c..0262fdc 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,18 @@ module github.com/satta/gommunityid -go 1.14 +go 1.18 require ( - github.com/davecgh/go-spew v1.1.1 // indirect github.com/google/gopacket v1.1.19 - github.com/stretchr/testify v1.7.0 - golang.org/x/net v0.0.0-20210315170653-34ac3e1c2000 // indirect - golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + github.com/samber/lo v1.38.1 + github.com/stretchr/testify v1.8.4 +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect + golang.org/x/net v0.15.0 // indirect + golang.org/x/sys v0.12.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 79114cf..781b5c0 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -6,34 +5,40 @@ github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM= +github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM= +golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210315170653-34ac3e1c2000 h1:6mqyFav9MzRNys8OnKlbKYSJxsoVvhb773Si3bu5fYE= -golang.org/x/net v0.0.0-20210315170653-34ac3e1c2000/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005 h1:pDMpM2zh2MT0kHy037cKlSby2nEhD50SYqwQk76Nm40= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=