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
489aeacf
Commit
489aeacf
authored
Nov 28, 2016
by
Jeromy
Committed by
Jeromy
May 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bitswap: clean up ledgers when disconnecting
License: MIT Signed-off-by:
Jeromy
<
why@ipfs.io
>
parent
b649f755
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
1 deletion
+30
-1
bitswap.go
bitswap.go
+1
-0
decision/engine.go
decision/engine.go
+25
-1
decision/ledger.go
decision/ledger.go
+4
-0
No files found.
bitswap.go
View file @
489aeacf
...
@@ -414,6 +414,7 @@ func (bs *Bitswap) updateReceiveCounters(b blocks.Block) {
...
@@ -414,6 +414,7 @@ func (bs *Bitswap) updateReceiveCounters(b blocks.Block) {
// Connected/Disconnected warns bitswap about peer connections
// Connected/Disconnected warns bitswap about peer connections
func
(
bs
*
Bitswap
)
PeerConnected
(
p
peer
.
ID
)
{
func
(
bs
*
Bitswap
)
PeerConnected
(
p
peer
.
ID
)
{
bs
.
wm
.
Connected
(
p
)
bs
.
wm
.
Connected
(
p
)
bs
.
engine
.
PeerConnected
(
p
)
}
}
// Connected/Disconnected warns bitswap about peer connections
// Connected/Disconnected warns bitswap about peer connections
...
...
decision/engine.go
View file @
489aeacf
...
@@ -298,8 +298,32 @@ func (e *Engine) MessageSent(p peer.ID, m bsmsg.BitSwapMessage) error {
...
@@ -298,8 +298,32 @@ func (e *Engine) MessageSent(p peer.ID, m bsmsg.BitSwapMessage) error {
return
nil
return
nil
}
}
func
(
e
*
Engine
)
PeerConnected
(
p
peer
.
ID
)
{
e
.
lock
.
Lock
()
l
,
ok
:=
e
.
ledgerMap
[
p
]
if
!
ok
{
l
=
newLedger
(
p
)
e
.
ledgerMap
[
p
]
=
l
}
l
.
lk
.
Lock
()
l
.
ref
++
l
.
lk
.
Unlock
()
e
.
lock
.
Unlock
()
}
func
(
e
*
Engine
)
PeerDisconnected
(
p
peer
.
ID
)
{
func
(
e
*
Engine
)
PeerDisconnected
(
p
peer
.
ID
)
{
// TODO: release ledger
e
.
lock
.
Lock
()
defer
e
.
lock
.
Unlock
()
l
,
ok
:=
e
.
ledgerMap
[
p
]
if
!
ok
{
return
}
l
.
lk
.
Lock
()
l
.
ref
--
if
l
.
ref
<=
0
{
delete
(
e
.
ledgerMap
,
p
)
}
l
.
lk
.
Unlock
()
}
}
func
(
e
*
Engine
)
numBytesSentTo
(
p
peer
.
ID
)
uint64
{
func
(
e
*
Engine
)
numBytesSentTo
(
p
peer
.
ID
)
uint64
{
...
...
decision/ledger.go
View file @
489aeacf
...
@@ -43,6 +43,10 @@ type ledger struct {
...
@@ -43,6 +43,10 @@ type ledger struct {
// to a given peer
// to a given peer
sentToPeer
map
[
string
]
time
.
Time
sentToPeer
map
[
string
]
time
.
Time
// ref is the reference count for this ledger, its used to ensure we
// don't drop the reference to this ledger in multi-connection scenarios
ref
int
lk
sync
.
Mutex
lk
sync
.
Mutex
}
}
...
...
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