1
0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-29 17:36:38 +08:00

fix: return pointer

@whyrusleeping
This commit is contained in:
Brian Tiger Chow
2015-01-19 02:35:09 -08:00
parent 60e288ed4b
commit 5985854099
2 changed files with 9 additions and 6 deletions

View File

@ -281,7 +281,10 @@ func (bs *bitswap) taskWorker(ctx context.Context) {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return return
case envelope := <-nextEnvelope: case envelope, ok := <-nextEnvelope:
if !ok {
continue
}
bs.send(ctx, envelope.Peer, envelope.Message) bs.send(ctx, envelope.Peer, envelope.Message)
} }
} }

View File

@ -71,7 +71,7 @@ type Engine struct {
// outbox contains outgoing messages to peers. This is owned by the // outbox contains outgoing messages to peers. This is owned by the
// taskWorker goroutine // taskWorker goroutine
outbox chan (<-chan Envelope) outbox chan (<-chan *Envelope)
bs bstore.Blockstore bs bstore.Blockstore
@ -85,7 +85,7 @@ func NewEngine(ctx context.Context, bs bstore.Blockstore) *Engine {
ledgerMap: make(map[peer.ID]*ledger), ledgerMap: make(map[peer.ID]*ledger),
bs: bs, bs: bs,
peerRequestQueue: newPRQ(), peerRequestQueue: newPRQ(),
outbox: make(chan (<-chan Envelope), outboxChanBuffer), outbox: make(chan (<-chan *Envelope), outboxChanBuffer),
workSignal: make(chan struct{}), workSignal: make(chan struct{}),
} }
go e.taskWorker(ctx) go e.taskWorker(ctx)
@ -95,7 +95,7 @@ func NewEngine(ctx context.Context, bs bstore.Blockstore) *Engine {
func (e *Engine) taskWorker(ctx context.Context) { func (e *Engine) taskWorker(ctx context.Context) {
defer close(e.outbox) // because taskWorker uses the channel exclusively defer close(e.outbox) // because taskWorker uses the channel exclusively
for { for {
oneTimeUse := make(chan Envelope, 1) // buffer to prevent blocking oneTimeUse := make(chan *Envelope, 1) // buffer to prevent blocking
select { select {
case <-ctx.Done(): case <-ctx.Done():
return return
@ -108,7 +108,7 @@ func (e *Engine) taskWorker(ctx context.Context) {
close(oneTimeUse) close(oneTimeUse)
return // ctx cancelled return // ctx cancelled
} }
oneTimeUse <- *envelope // buffered. won't block oneTimeUse <- envelope // buffered. won't block
close(oneTimeUse) close(oneTimeUse)
} }
} }
@ -141,7 +141,7 @@ func (e *Engine) nextEnvelope(ctx context.Context) (*Envelope, error) {
} }
// Outbox returns a channel of one-time use Envelope channels. // Outbox returns a channel of one-time use Envelope channels.
func (e *Engine) Outbox() <-chan (<-chan Envelope) { func (e *Engine) Outbox() <-chan (<-chan *Envelope) {
return e.outbox return e.outbox
} }