use mutex for peer-manager pool cleanup

walldiss · Oct 6, 2023 · 14b8922 · 14b8922
1 parent 0b5fc0b
commit 14b8922
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/share/p2p/peers/manager.go b/share/p2p/peers/manager.go
@@ -7,7 +7,6 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
-	"unsafe"
 
 	logging "github.com/ipfs/go-log/v2"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
@@ -518,9 +517,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()
 	}
 }
 

diff --git a/share/p2p/peers/pool.go b/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.Lock()
+	defer p.m.Unlock()
+	// swap the pool with an empty one
+	*p = *newPool(time.Second)
+}