From 6efa8db8887c70679aedeaec44411f886976d2e1 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sun, 12 Apr 2015 13:24:38 +0200
Subject: downloader: renamed chunks to queue

---
 eth/downloader/chunk.go | 98 -------------------------------------------------
 eth/downloader/queue.go | 98 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 98 deletions(-)
 delete mode 100644 eth/downloader/chunk.go
 create mode 100644 eth/downloader/queue.go

(limited to 'eth/downloader')

diff --git a/eth/downloader/chunk.go b/eth/downloader/chunk.go
deleted file mode 100644
index b68c5bc82..000000000
--- a/eth/downloader/chunk.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package downloader
-
-import (
-	"math"
-	"sync"
-	"time"
-
-	"github.com/ethereum/go-ethereum/core/types"
-	"gopkg.in/fatih/set.v0"
-)
-
-// queue represents hashes that are either need fetching or are being fetched
-type queue struct {
-	hashPool *set.Set
-
-	mu       sync.Mutex
-	fetching map[string]*chunk
-	blocks   []*types.Block
-}
-
-func newqueue() *queue {
-	return &queue{
-		hashPool: set.New(),
-		fetching: make(map[string]*chunk),
-	}
-}
-
-// reserve a `max` set of hashes for `p` peer.
-func (c *queue) get(p *peer, max int) *chunk {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	// return nothing if the pool has been depleted
-	if c.hashPool.Size() == 0 {
-		return nil
-	}
-
-	limit := int(math.Min(float64(max), float64(c.hashPool.Size())))
-	// Create a new set of hashes
-	hashes, i := set.New(), 0
-	c.hashPool.Each(func(v interface{}) bool {
-		if i == limit {
-			return false
-		}
-
-		hashes.Add(v)
-		i++
-
-		return true
-	})
-	// remove the fetchable hashes from hash pool
-	c.hashPool.Separate(hashes)
-	// Create a new chunk for the seperated hashes. The time is being used
-	// to reset the chunk (timeout)
-	chunk := &chunk{hashes, time.Now()}
-	// register as 'fetching' state
-	c.fetching[p.id] = chunk
-
-	// create new chunk for peer
-	return chunk
-}
-
-func (c *queue) deliver(id string, blocks []*types.Block) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	chunk := c.fetching[id]
-	// If the chunk was never requested simply ignore it
-	if chunk != nil {
-		delete(c.fetching, id)
-
-		// seperate the blocks and the hashes
-		chunk.seperate(blocks)
-		// Add the blocks
-		c.blocks = append(c.blocks, blocks...)
-
-		// Add back whatever couldn't be delivered
-		c.hashPool.Merge(chunk.hashes)
-	}
-}
-
-func (c *queue) put(hashes *set.Set) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	c.hashPool.Merge(hashes)
-}
-
-type chunk struct {
-	hashes *set.Set
-	itime  time.Time
-}
-
-func (ch *chunk) seperate(blocks []*types.Block) {
-	for _, block := range blocks {
-		ch.hashes.Remove(block.Hash())
-	}
-}
diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go
new file mode 100644
index 000000000..b68c5bc82
--- /dev/null
+++ b/eth/downloader/queue.go
@@ -0,0 +1,98 @@
+package downloader
+
+import (
+	"math"
+	"sync"
+	"time"
+
+	"github.com/ethereum/go-ethereum/core/types"
+	"gopkg.in/fatih/set.v0"
+)
+
+// queue represents hashes that are either need fetching or are being fetched
+type queue struct {
+	hashPool *set.Set
+
+	mu       sync.Mutex
+	fetching map[string]*chunk
+	blocks   []*types.Block
+}
+
+func newqueue() *queue {
+	return &queue{
+		hashPool: set.New(),
+		fetching: make(map[string]*chunk),
+	}
+}
+
+// reserve a `max` set of hashes for `p` peer.
+func (c *queue) get(p *peer, max int) *chunk {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
+	// return nothing if the pool has been depleted
+	if c.hashPool.Size() == 0 {
+		return nil
+	}
+
+	limit := int(math.Min(float64(max), float64(c.hashPool.Size())))
+	// Create a new set of hashes
+	hashes, i := set.New(), 0
+	c.hashPool.Each(func(v interface{}) bool {
+		if i == limit {
+			return false
+		}
+
+		hashes.Add(v)
+		i++
+
+		return true
+	})
+	// remove the fetchable hashes from hash pool
+	c.hashPool.Separate(hashes)
+	// Create a new chunk for the seperated hashes. The time is being used
+	// to reset the chunk (timeout)
+	chunk := &chunk{hashes, time.Now()}
+	// register as 'fetching' state
+	c.fetching[p.id] = chunk
+
+	// create new chunk for peer
+	return chunk
+}
+
+func (c *queue) deliver(id string, blocks []*types.Block) {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
+	chunk := c.fetching[id]
+	// If the chunk was never requested simply ignore it
+	if chunk != nil {
+		delete(c.fetching, id)
+
+		// seperate the blocks and the hashes
+		chunk.seperate(blocks)
+		// Add the blocks
+		c.blocks = append(c.blocks, blocks...)
+
+		// Add back whatever couldn't be delivered
+		c.hashPool.Merge(chunk.hashes)
+	}
+}
+
+func (c *queue) put(hashes *set.Set) {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
+	c.hashPool.Merge(hashes)
+}
+
+type chunk struct {
+	hashes *set.Set
+	itime  time.Time
+}
+
+func (ch *chunk) seperate(blocks []*types.Block) {
+	for _, block := range blocks {
+		ch.hashes.Remove(block.Hash())
+	}
+}
-- 
cgit v1.2.3