Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-bitswap
Commits
5056a837
Commit
5056a837
authored
May 25, 2015
by
Jeromy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adjust naming
parent
e5aa2acc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
10 deletions
+8
-10
bitswap.go
bitswap.go
+4
-6
workers.go
workers.go
+4
-4
No files found.
bitswap.go
View file @
5056a837
...
...
@@ -82,7 +82,7 @@ func New(parent context.Context, p peer.ID, network bsnet.BitSwapNetwork,
notifications
:
notif
,
engine
:
decision
.
NewEngine
(
ctx
,
bstore
),
// TODO close the engine with Close() method
network
:
network
,
batchRequests
:
make
(
chan
*
blockRequest
,
sizeBatchRequestChan
),
findKeys
:
make
(
chan
*
blockRequest
,
sizeBatchRequestChan
),
process
:
px
,
newBlocks
:
make
(
chan
*
blocks
.
Block
,
HasBlockBufferSize
),
provideKeys
:
make
(
chan
u
.
Key
),
...
...
@@ -115,10 +115,8 @@ type Bitswap struct {
notifications
notifications
.
PubSub
// Requests for a set of related blocks
// the assumption is made that the same peer is likely to
// have more than a single block in the set
batchRequests
chan
*
blockRequest
// send keys to a worker to find and connect to providers for them
findKeys
chan
*
blockRequest
engine
*
decision
.
Engine
...
...
@@ -209,7 +207,7 @@ func (bs *Bitswap) GetBlocks(ctx context.Context, keys []u.Key) (<-chan *blocks.
ctx
:
ctx
,
}
select
{
case
bs
.
batchRequest
s
<-
req
:
case
bs
.
findKey
s
<-
req
:
return
promise
,
nil
case
<-
ctx
.
Done
()
:
return
nil
,
ctx
.
Err
()
...
...
workers.go
View file @
5056a837
...
...
@@ -31,7 +31,7 @@ func init() {
func
(
bs
*
Bitswap
)
startWorkers
(
px
process
.
Process
,
ctx
context
.
Context
)
{
// Start up a worker to handle block requests this node is making
px
.
Go
(
func
(
px
process
.
Process
)
{
bs
.
clientWorke
r
(
ctx
)
bs
.
providerConnecto
r
(
ctx
)
})
// 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
func
(
bs
*
Bitswap
)
clientWorke
r
(
parent
context
.
Context
)
{
//
connects to providers for the given keys
func
(
bs
*
Bitswap
)
providerConnecto
r
(
parent
context
.
Context
)
{
defer
log
.
Info
(
"bitswap client worker shutting down..."
)
for
{
select
{
case
req
:=
<-
bs
.
batchRequest
s
:
case
req
:=
<-
bs
.
findKey
s
:
keys
:=
req
.
keys
if
len
(
keys
)
==
0
{
log
.
Warning
(
"Received batch request for zero blocks"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment