opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-30 09:59:13 +08:00
Code Issues Projects Releases Wiki Activity

adjust naming

Browse Source
This commit is contained in:
Jeromy
2015-05-25 18:00:34 -07:00
parent f574cd4b80
commit efa442ada2
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
exchange/bitswap/bitswap.go
View File

@ -82,7 +82,7 @@ func New(parent context.Context, p peer.ID, network bsnet.BitSwapNetwork,
notifications: notif, notifications: notif,
engine: decision.NewEngine(ctx, bstore), // TODO close the engine with Close() method engine: decision.NewEngine(ctx, bstore), // TODO close the engine with Close() method
network: network, network: network,
batchRequests: make(chan *blockRequest, sizeBatchRequestChan), findKeys: make(chan *blockRequest, sizeBatchRequestChan),
process: px, process: px,
newBlocks: make(chan *blocks.Block, HasBlockBufferSize), newBlocks: make(chan *blocks.Block, HasBlockBufferSize),
provideKeys: make(chan u.Key), provideKeys: make(chan u.Key),
@ -115,10 +115,8 @@ type Bitswap struct {
notifications notifications.PubSub notifications notifications.PubSub
// Requests for a set of related blocks // send keys to a worker to find and connect to providers for them
// the assumption is made that the same peer is likely to findKeys chan *blockRequest
// have more than a single block in the set
batchRequests chan *blockRequest
engine *decision.Engine engine *decision.Engine
@ -209,7 +207,7 @@ func (bs *Bitswap) GetBlocks(ctx context.Context, keys []u.Key) (<-chan *blocks.
ctx: ctx, ctx: ctx,
} }
select { select {
case bs.batchRequests <- req: case bs.findKeys <- req:
return promise, nil return promise, nil
case <-ctx.Done(): case <-ctx.Done():
return nil, ctx.Err() return nil, ctx.Err()

8
exchange/bitswap/workers.go
View File

@ -31,7 +31,7 @@ func init() {
func (bs *Bitswap) startWorkers(px process.Process, ctx context.Context) { func (bs *Bitswap) startWorkers(px process.Process, ctx context.Context) {
// Start up a worker to handle block requests this node is making // Start up a worker to handle block requests this node is making
px.Go(func(px process.Process) { px.Go(func(px process.Process) {
bs.clientWorker(ctx) bs.providerConnector(ctx)
}) })
// Start up workers to handle requests from other nodes for the data on this node // Start up workers to handle requests from other nodes for the data on this node
@ -134,13 +134,13 @@ func (bs *Bitswap) provideCollector(ctx context.Context) {
} }
} }
// TODO: figure out clientWorkers purpose in life // connects to providers for the given keys
func (bs *Bitswap) clientWorker(parent context.Context) { func (bs *Bitswap) providerConnector(parent context.Context) {
defer log.Info("bitswap client worker shutting down...") defer log.Info("bitswap client worker shutting down...")
for { for {
select { select {
case req := <-bs.batchRequests: case req := <-bs.findKeys:
keys := req.keys keys := req.keys
if len(keys) == 0 { if len(keys) == 0 {
log.Warning("Received batch request for zero blocks") log.Warning("Received batch request for zero blocks")