From 6f324be85f50e671b9edb3ee959b77bad580eacc Mon Sep 17 00:00:00 2001
From: Jorropo <jorropo.pgm@gmail.com>
Date: Wed, 29 Mar 2023 01:23:30 +0200
Subject: [PATCH] blockservice: remove busyloop in getBlocks by removing
 batching

It makes the code quite more complex and there is no evidance it helps for anything.
---
 blockservice/blockservice.go | 50 ++++++++++++++----------------------
 1 file changed, 19 insertions(+), 31 deletions(-)

diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go
index 6691b805c..f1a450834 100644
--- a/blockservice/blockservice.go
+++ b/blockservice/blockservice.go
@@ -296,6 +296,7 @@ func getBlocks(ctx context.Context, ks []cid.Cid, bs blockstore.Blockstore, fget
 		}
 
 		if !allValid {
+			// can't shift in place because we don't want to clobber callers.
 			ks2 := make([]cid.Cid, 0, len(ks))
 			for _, c := range ks {
 				// hash security
@@ -333,52 +334,39 @@ func getBlocks(ctx context.Context, ks []cid.Cid, bs blockstore.Blockstore, fget
 			return
 		}
 
-		// batch available blocks together
-		const batchSize = 32
-		batch := make([]blocks.Block, 0, batchSize)
+		var cache [1]blocks.Block // preallocate once for all iterations
 		for {
-			var noMoreBlocks bool
-		batchLoop:
-			for len(batch) < batchSize {
-				select {
-				case b, ok := <-rblocks:
-					if !ok {
-						noMoreBlocks = true
-						break batchLoop
-					}
-
-					logger.Debugf("BlockService.BlockFetched %s", b.Cid())
-					batch = append(batch, b)
-				case <-ctx.Done():
+			var b blocks.Block
+			select {
+			case v, ok := <-rblocks:
+				if !ok {
 					return
-				default:
-					break batchLoop
 				}
+				b = v
+			case <-ctx.Done():
+				return
 			}
 
-			// also write in the blockstore for caching, inform the exchange that the blocks are available
-			err = bs.PutMany(ctx, batch)
+			// write in the blockstore for caching
+			err = bs.Put(ctx, b)
 			if err != nil {
 				logger.Errorf("could not write blocks from the network to the blockstore: %s", err)
 				return
 			}
 
-			err = f.NotifyNewBlocks(ctx, batch...)
+			// inform the exchange that the blocks are available
+			cache[0] = b
+			err = f.NotifyNewBlocks(ctx, cache[:]...)
 			if err != nil {
 				logger.Errorf("could not tell the exchange about new blocks: %s", err)
 				return
 			}
+			cache[0] = nil // early gc
 
-			for _, b := range batch {
-				select {
-				case out <- b:
-				case <-ctx.Done():
-					return
-				}
-			}
-			batch = batch[:0]
-			if noMoreBlocks {
-				break
+			select {
+			case out <- b:
+			case <-ctx.Done():
+				return
 			}
 		}
 	}()