Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
kubo_final
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Anastasiia Chirikova
kubo_final
Commits
efa442ad
Commit
efa442ad
authored
10 years ago
by
Jeromy Johnson
Browse files
Options
Downloads
Patches
Plain Diff
adjust naming
parent
f574cd4b
No related branches found
No related tags found
1 merge request
!1
New
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
exchange/bitswap/bitswap.go
+4
-6
4 additions, 6 deletions
exchange/bitswap/bitswap.go
exchange/bitswap/workers.go
+4
-4
4 additions, 4 deletions
exchange/bitswap/workers.go
with
8 additions
and
10 deletions
exchange/bitswap/bitswap.go
+
4
−
6
View file @
efa442ad
...
...
@@ -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
()
...
...
This diff is collapsed.
Click to expand it.
exchange/bitswap/workers.go
+
4
−
4
View file @
efa442ad
...
...
@@ -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"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment