Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mybee
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
mybee
Commits
0ce90358
Unverified
Commit
0ce90358
authored
May 28, 2021
by
Esad Akar
Committed by
GitHub
May 28, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: pslice variadic add index panic (#1899)
parent
f2944470
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
pslice.go
pkg/topology/pslice/pslice.go
+12
-3
No files found.
pkg/topology/pslice/pslice.go
View file @
0ce90358
...
@@ -19,7 +19,6 @@ type PSlice struct {
...
@@ -19,7 +19,6 @@ type PSlice struct {
peers
[]
swarm
.
Address
// the slice of peers
peers
[]
swarm
.
Address
// the slice of peers
bins
[]
uint
// the indexes of every proximity order in the peers slice, index is po, value is index of peers slice
bins
[]
uint
// the indexes of every proximity order in the peers slice, index is po, value is index of peers slice
baseBytes
[]
byte
baseBytes
[]
byte
sync
.
RWMutex
sync
.
RWMutex
}
}
...
@@ -179,7 +178,7 @@ func (s *PSlice) Add(addrs ...swarm.Address) {
...
@@ -179,7 +178,7 @@ func (s *PSlice) Add(addrs ...swarm.Address) {
return
return
}
}
po
:=
s
warm
.
Proximity
(
s
.
baseBytes
,
addr
.
Bytes
())
po
:=
s
.
po
(
addr
.
Bytes
())
peers
=
insertAddresses
(
peers
,
int
(
s
.
bins
[
po
]),
addr
)
peers
=
insertAddresses
(
peers
,
int
(
s
.
bins
[
po
]),
addr
)
s
.
peers
=
peers
s
.
peers
=
peers
...
@@ -204,10 +203,20 @@ func (s *PSlice) Remove(addr swarm.Address) {
...
@@ -204,10 +203,20 @@ func (s *PSlice) Remove(addr swarm.Address) {
peers
=
append
(
peers
[
:
i
],
peers
[
i
+
1
:
]
...
)
peers
=
append
(
peers
[
:
i
],
peers
[
i
+
1
:
]
...
)
s
.
peers
=
peers
s
.
peers
=
peers
decDeeper
(
bins
,
s
warm
.
Proximity
(
s
.
baseBytes
,
addr
.
Bytes
()))
decDeeper
(
bins
,
s
.
po
(
addr
.
Bytes
()))
s
.
bins
=
bins
s
.
bins
=
bins
}
}
func
(
s
*
PSlice
)
po
(
peer
[]
byte
)
uint8
{
po
:=
swarm
.
Proximity
(
s
.
baseBytes
,
peer
)
if
int
(
po
)
>=
len
(
s
.
bins
)
{
return
uint8
(
len
(
s
.
bins
))
-
1
}
return
po
}
// incDeeper increments the peers slice bin index for proximity order > po for non-empty bins only.
// incDeeper increments the peers slice bin index for proximity order > po for non-empty bins only.
// Must be called under lock.
// Must be called under lock.
func
incDeeper
(
bins
[]
uint
,
po
uint8
)
{
func
incDeeper
(
bins
[]
uint
,
po
uint8
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment