dlss
/
FedP2P
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for non-pointer Bitmap corrupting state

This commit is contained in:
Matt Joiner 2018-02-08 15:08:33 +11:00
parent 15ed1bbd69
commit 5023dcaa3a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
connection.go
View File

@ -608,13 +608,13 @@ func (cn *connection) updateRequests() {
// Emits the indices in the Bitmaps bms in order, never repeating any index.
// skip is mutated during execution, and its initial values will never be
// emitted.
func iterBitmapsDistinct(skip bitmap.Bitmap, bms ...bitmap.Bitmap) iter.Func {
func iterBitmapsDistinct(skip *bitmap.Bitmap, bms ...bitmap.Bitmap) iter.Func {
return func(cb iter.Callback) {
for _, bm := range bms {
if !iter.All(func(i interface{}) bool {
skip.Add(i.(int))
return cb(i)
}, bitmap.Sub(bm, skip).Iter) {
}, bitmap.Sub(bm, *skip).Iter) {
return
}
}
@ -633,7 +633,7 @@ func (cn *connection) unbiasedPieceRequestOrder() iter.Func {
// Return an iterator over the different priority classes, minus the skip
// pieces.
return iter.Chain(
iterBitmapsDistinct(skip, now, readahead),
iterBitmapsDistinct(&skip, now, readahead),
func(cb iter.Callback) {
cn.t.pendingPieces.IterTyped(func(piece int) bool {
if skip.Contains(piece) {

3
misc_test.go
View File

@ -25,6 +25,7 @@ func TestIterBitmapsDistinct(t *testing.T) {
skip.Add(1)
first.Add(1, 0, 3)
second.Add(1, 2, 0)
assert.Equal(t, []interface{}{0, 3, 2}, iter.ToSlice(iterBitmapsDistinct(skip.Copy(), first, second)))
skipCopy := skip.Copy()
assert.Equal(t, []interface{}{0, 3, 2}, iter.ToSlice(iterBitmapsDistinct(&skipCopy, first, second)))
assert.Equal(t, []int{1}, skip.ToSortedSlice())
}