chore: minor performance improvements in bitswap

CHANGELOG.md

@@ -22,6 +22,7 @@ The following emojis are used to highlight certain changes:
 
 - `chunker` refactored to reduce overall memory use by reducing heap fragmentation [#649](https://github.com/ipfs/boxo/pull/649)
 - `gateway` deserialized responses will have `Last-Modified` set to value from optional UnixFS 1.5 modification time field (if present in DAG) and a matching `If-Modified-Since` will return `304 Not Modified` (UnixFS 1.5 files only) [#659](https://github.com/ipfs/boxo/pull/659)
+- `bitswap/server` minor performance improvements in concurrent operations
 
 ### Removed
 

bitswap/server/internal/decision/blockstoremanager.go

@@ -4,6 +4,7 @@
 	"context"
 	"errors"
 	"sync"
+	"sync/atomic"
 
 	bstore "github.com/ipfs/boxo/blockstore"
 	blocks "github.com/ipfs/go-block-format"
@@ -85,35 +86,49 @@
 }
 
 func (bsm *blockstoreManager) getBlockSizes(ctx context.Context, ks []cid.Cid) (map[cid.Cid]int, error) {
-	res := make(map[cid.Cid]int)
 	if len(ks) == 0 {
-		return res, nil
+		return nil, nil
 	}
+	sizes := make([]int, len(ks))
 
-	var lk sync.Mutex
-	return res, bsm.jobPerKey(ctx, ks, func(c cid.Cid) {
+	var count atomic.Int32
+	err := bsm.jobPerKey(ctx, ks, func(i int, c cid.Cid) {
 		size, err := bsm.bs.GetSize(ctx, c)
 		if err != nil {
 			if !ipld.IsNotFound(err) {
 				// Note: this isn't a fatal error. We shouldn't abort the request
 				log.Errorf("blockstore.GetSize(%s) error: %s", c, err)
 			}
-		} else {
-			lk.Lock()
-			res[c] = size
-			lk.Unlock()
+			return
 		}
+		sizes[i] = size
+		count.Add(1)
 	})
+	if err != nil {
+		return nil, err
+	}
+	results := count.Load()
+	if results == 0 {
+		return nil, nil
+	}
+
+	res := make(map[cid.Cid]int, results)
+	for i, n := range sizes {
+		if n != 0 {
+			res[ks[i]] = n
+		}
+	}
+	return res, nil
 }
 
 func (bsm *blockstoreManager) getBlocks(ctx context.Context, ks []cid.Cid) (map[cid.Cid]blocks.Block, error) {
-	res := make(map[cid.Cid]blocks.Block, len(ks))
 	if len(ks) == 0 {
-		return res, nil
+		return nil, nil
 	}
+	blks := make([]blocks.Block, len(ks))
 
-	var lk sync.Mutex
-	return res, bsm.jobPerKey(ctx, ks, func(c cid.Cid) {
+	var count atomic.Int32
+	err := bsm.jobPerKey(ctx, ks, func(i int, c cid.Cid) {
 		blk, err := bsm.bs.Get(ctx, c)
 		if err != nil {
 			if !ipld.IsNotFound(err) {
@@ -122,21 +137,40 @@
 			}
 			return
 		}
-
-		lk.Lock()
-		res[c] = blk
-		lk.Unlock()
+		blks[i] = blk
+		count.Add(1)
 	})
+	if err != nil {
+		return nil, err
+	}
+	results := count.Load()
+	if results == 0 {
+		return nil, nil
+	}
+
+	res := make(map[cid.Cid]blocks.Block, results)
+	for i, blk := range blks {
+		if blk != nil {
+			res[ks[i]] = blk
+		}
+	}
+	return res, nil
 }
 
-func (bsm *blockstoreManager) jobPerKey(ctx context.Context, ks []cid.Cid, jobFn func(c cid.Cid)) error {
+func (bsm *blockstoreManager) jobPerKey(ctx context.Context, ks []cid.Cid, jobFn func(i int, c cid.Cid)) error {
+	if len(ks) == 1 {
+		jobFn(0, ks[0])
+		return nil
+	}
+
 	var err error
 	var wg sync.WaitGroup
-	for _, k := range ks {
+	for i, k := range ks {
 		c := k
+		idx := i
 		wg.Add(1)
 		err = bsm.addJob(ctx, func() {
-			jobFn(c)
+			jobFn(idx, c)
 			wg.Done()
 		})
 		if err != nil {

bitswap/server/internal/decision/engine.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"slices"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/google/uuid"
@@ -216,8 +217,7 @@ type Engine struct {
 	activeGauge metrics.Gauge
 
 	// used to ensure metrics are reported each fixed number of operation
-	metricsLock         sync.Mutex
-	metricUpdateCounter int
+	metricUpdateCounter atomic.Uint32
 
 	taskComparator TaskComparator
 
@@ -449,11 +449,7 @@ func newEngine(
 }
 
 func (e *Engine) updateMetrics() {
-	e.metricsLock.Lock()
-	c := e.metricUpdateCounter
-	e.metricUpdateCounter++
-	e.metricsLock.Unlock()
-
+	c := e.metricUpdateCounter.Add(1)
 	if c%100 == 0 {
 		stats := e.peerRequestQueue.Stats()
 		e.activeGauge.Set(float64(stats.NumActive))
@@ -693,7 +689,7 @@ func (e *Engine) MessageReceived(ctx context.Context, p peer.ID, m bsmsg.BitSwap
 		return true
 	}
 
-	// Get block sizes
+	// Get block sizes for unique CIDs.
 	wantKs := cid.NewSet()
 	for _, entry := range wants {
 		wantKs.Add(entry.Cid)
@@ -975,6 +971,7 @@ func (e *Engine) NotifyNewBlocks(blks []blocks.Block) {
 	var work bool
 	for _, b := range blks {
 		k := b.Cid()
+		blockSize := blockSizes[k]
 
 		e.lock.RLock()
 		peers := e.peerLedger.Peers(k)
@@ -983,7 +980,6 @@ func (e *Engine) NotifyNewBlocks(blks []blocks.Block) {
 		for _, entry := range peers {
 			work = true
 
-			blockSize := blockSizes[k]
 			isWantBlock := e.sendAsBlock(entry.WantType, blockSize)
 
 			entrySize := blockSize