summaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>2016-01-13 12:14:45 +0900
committerISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>2016-01-16 18:22:13 +0900
commit40ce51137a1bc3733d36ea045daae067eef735f0 (patch)
tree0fdb1519f42b4fea6f8793b31dc0202326fe872b /server
parentb344eb3777e5088f0a97d585e81e546363ea4101 (diff)
table: remove unnecessary copy of path attributes
the result of memory profile (500 route-server-clients each of them advertises 100 routes) before: (pprof) top5 9330.48MB of 9367.53MB total (99.60%) Dropped 157 nodes (cum <= 46.84MB) Showing top 10 nodes out of 17 (cum >= 9334.17MB) flat flat% sum% cum cum% 6163.04MB 65.79% 65.79% 6163.04MB 65.79% github.com/osrg/gobgp/table.NewPath 1155.05MB 12.33% 78.12% 7302.59MB 77.96% github.com/osrg/gobgp/table.(*Path).Clone 986.31MB 10.53% 88.65% 1388.81MB 14.83% github.com/osrg/gobgp/table.(*AdjRib).Update 402.51MB 4.30% 92.95% 402.51MB 4.30% fmt.Sprintf 402.51MB 4.30% 97.24% 402.51MB 4.30% net.parseIPv4 after: (pprof) top 3913.02MB of 3978.69MB total (98.35%) Dropped 148 nodes (cum <= 19.89MB) Showing top 10 nodes out of 11 (cum >= 21MB) flat flat% sum% cum cum% 2970.30MB 74.66% 74.66% 2975.80MB 74.79% github.com/osrg/gobgp/server.filterpath 810.09MB 20.36% 95.02% 810.59MB 20.37% github.com/osrg/gobgp/table.(*AdjRib).Update 115.60MB 2.91% 97.92% 119.10MB 2.99% github.com/osrg/gobgp/table.createUpdateMsgFromPath 10MB 0.25% 98.17% 1878.02MB 47.20% github.com/osrg/gobgp/server.(*BgpServer).propagateUpdate 4.50MB 0.11% 98.29% 144.60MB 3.63% github.com/osrg/gobgp/table.CreateUpdateMsgFromPaths Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Diffstat (limited to 'server')
-rw-r--r--server/rpki.go6
-rw-r--r--server/server.go8
-rw-r--r--server/zclient.go2
-rw-r--r--server/zclient_test.go8
4 files changed, 12 insertions, 12 deletions
diff --git a/server/rpki.go b/server/rpki.go
index e6097d00..ed4af2ea 100644
--- a/server/rpki.go
+++ b/server/rpki.go
@@ -453,7 +453,7 @@ func (c *roaManager) validate(pathList []*table.Path, isMonitor bool) []*api.ROA
}
if tree, ok := c.roas[path.GetRouteFamily()]; ok {
r, roaList := validatePath(c.AS, tree, path.GetNlri().String(), path.GetAsPath())
- if isMonitor && path.Validation != config.RpkiValidationResultType(r) {
+ if isMonitor && path.Validation() != config.RpkiValidationResultType(r) {
apiRoaList := func() []*api.ROA {
apiRoaList := make([]*api.ROA, 0)
for _, r := range roaList {
@@ -464,13 +464,13 @@ func (c *roaManager) validate(pathList []*table.Path, isMonitor bool) []*api.ROA
rr := &api.ROAResult{
OriginAs: path.GetSourceAs(),
Prefix: path.GetNlri().String(),
- OldResult: api.ROAResult_ValidationResult(path.Validation.ToInt()),
+ OldResult: api.ROAResult_ValidationResult(path.Validation().ToInt()),
NewResult: api.ROAResult_ValidationResult(r.ToInt()),
Roas: apiRoaList,
}
results = append(results, rr)
}
- path.Validation = config.RpkiValidationResultType(r)
+ path.SetValidation(config.RpkiValidationResultType(r))
}
}
return results
diff --git a/server/server.go b/server/server.go
index 817c7d05..4a198e49 100644
--- a/server/server.go
+++ b/server/server.go
@@ -556,7 +556,7 @@ func filterpath(peer *Peer, path *table.Path) *table.Path {
if !peer.isRouteServerClient() && isASLoop(peer, path) {
return nil
}
- return path.Clone(net.ParseIP(remoteAddr), path.IsWithdraw)
+ return path.Clone(peer.fsm.peerInfo.Address, path.IsWithdraw)
}
func (server *BgpServer) dropPeerAllRoutes(peer *Peer) []*SenderMsg {
@@ -643,7 +643,7 @@ func (server *BgpServer) broadcastValidationResults(results []*api.ROAResult) {
func (server *BgpServer) broadcastBests(bests []*table.Path) {
for _, path := range bests {
- if !path.IsFromZebra {
+ if !path.IsFromZebra() {
z := newBroadcastZapiBestMsg(server.zclient, path)
if z != nil {
server.broadcastMsgs = append(server.broadcastMsgs, z)
@@ -1268,7 +1268,7 @@ func (server *BgpServer) handleModPathRequest(grpcReq *GrpcRequest) []*table.Pat
path := func() *table.Path {
for _, rf := range server.globalRib.GetRFlist() {
for _, path := range server.globalRib.GetPathList(table.GLOBAL_RIB_NAME, rf) {
- if len(path.Uuid) > 0 && bytes.Equal(path.Uuid, arg.Uuid) {
+ if len(path.UUID()) > 0 && bytes.Equal(path.UUID(), arg.Uuid) {
return path
}
}
@@ -1289,7 +1289,7 @@ func (server *BgpServer) handleModPathRequest(grpcReq *GrpcRequest) []*table.Pat
if err == nil {
u := uuid.NewV4()
uuidBytes = u.Bytes()
- paths[0].Uuid = uuidBytes
+ paths[0].SetUUID(uuidBytes)
}
}
}
diff --git a/server/zclient.go b/server/zclient.go
index 994f1c78..3c3d3180 100644
--- a/server/zclient.go
+++ b/server/zclient.go
@@ -128,7 +128,7 @@ func createPathFromIPRouteMessage(m *zebra.Message, peerInfo *table.PeerInfo) *t
pattr = append(pattr, med)
p := table.NewPath(peerInfo, nlri, isWithdraw, pattr, time.Now(), false)
- p.IsFromZebra = true
+ p.SetIsFromZebra(true)
return p
}
diff --git a/server/zclient_test.go b/server/zclient_test.go
index dcb3cb5c..2fbd7554 100644
--- a/server/zclient_test.go
+++ b/server/zclient_test.go
@@ -59,7 +59,7 @@ func Test_createPathFromIPRouteMessage(t *testing.T) {
assert.NotEqual(nil, p)
assert.Equal("0.0.0.0", p.GetNexthop().String())
assert.Equal("192.168.100.0/24", p.GetNlri().String())
- assert.True(p.IsFromZebra)
+ assert.True(p.IsFromZebra())
assert.False(p.IsWithdraw)
// withdraw
@@ -71,7 +71,7 @@ func Test_createPathFromIPRouteMessage(t *testing.T) {
assert.Equal("192.168.100.0/24", p.GetNlri().String())
med, _ := p.GetMed()
assert.Equal(uint32(100), med)
- assert.True(p.IsFromZebra)
+ assert.True(p.IsFromZebra())
assert.True(p.IsWithdraw)
// IPv6
@@ -88,7 +88,7 @@ func Test_createPathFromIPRouteMessage(t *testing.T) {
assert.Equal("2001:db8:0:f101::/64", p.GetNlri().String())
med, _ = p.GetMed()
assert.Equal(uint32(100), med)
- assert.True(p.IsFromZebra)
+ assert.True(p.IsFromZebra())
assert.False(p.IsWithdraw)
// withdraw
@@ -98,7 +98,7 @@ func Test_createPathFromIPRouteMessage(t *testing.T) {
assert.NotEqual(nil, p)
assert.Equal("::", p.GetNexthop().String())
assert.Equal("2001:db8:0:f101::/64", p.GetNlri().String())
- assert.True(p.IsFromZebra)
+ assert.True(p.IsFromZebra())
assert.True(p.IsWithdraw)
}