use mutex for peer-manager pool cleanup

share/p2p/peers/manager.go

@@ -4,11 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"sync"
-	"sync/atomic"
-	"time"
-	"unsafe"
-
 	logging "github.com/ipfs/go-log/v2"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/event"
@@ -17,6 +12,9 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/p2p/host/eventbus"
 	"github.com/libp2p/go-libp2p/p2p/net/conngater"
+	"sync"
+	"sync/atomic"
+	"time"
 
 	libhead "github.com/celestiaorg/go-header"
 
@@ -518,9 +516,7 @@ func (m *Manager) markPoolAsSynced(datahash string) {
 	p := m.getOrCreatePool(datahash)
 	if p.isSynced.CompareAndSwap(false, true) {
 		p.isSynced.Store(true)
-		old := (*unsafe.Pointer)(unsafe.Pointer(&p.pool))
-		// release pointer to old pool to free up memory
-		atomic.StorePointer(old, unsafe.Pointer(newPool(time.Second)))
+		p.reset()
 	}
 }
 

share/p2p/peers/pool.go

@@ -221,3 +221,10 @@ func (p *pool) len() int {
 	defer p.m.RUnlock()
 	return p.activeCount
 }
+
+func (p *pool) reset() {
+	p.m.RLock()
+	defer p.m.RUnlock()
+	// swap the pool with an empty one
+	*p = *newPool(time.Second)
+}