Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
go-libp2p
Commits
b6f19a55
Commit
b6f19a55
authored
9 years ago
by
Jeromy
Browse files
Options
Download
Email Patches
Plain Diff
don't execute cancelled jobs
parent
d899b07f
master
2018-Q4-OKR
docs-improvements
feat/backoff-listing
feat/p2p-multiaddr
feat/pnet/working3
feat/protobuf
feat/relay-integrate
feat/udp
feat/update/go-reuseport
feature/standardize-readme
fix/473
fix/no-custom-field
fix/reset-ping-stream
fix/revert-correct-external-addr
gx/update-jccl6u
gx/update-nza0mn
jenkinsfile
kevina/fix-go-vet
multistream-ping
punching
revert-276-update-go-detect-race
wip/js-interop
v6.0.23
v6.0.22
v6.0.21
v6.0.20
v6.0.19
v6.0.18
v6.0.17
v6.0.16
v6.0.15
v6.0.14
v6.0.13
v6.0.12
v6.0.11
v6.0.10
v6.0.9
v6.0.8
v6.0.7
v6.0.6
v6.0.5
v6.0.4
v6.0.3
v6.0.2
v6.0.1
v6.0.0
v5.0.21
v5.0.20
v5.0.19
v5.0.18
v5.0.17
v5.0.16
v5.0.15
v5.0.14
v5.0.13
v5.0.12
v5.0.11
v5.0.10
v5.0.9
v5.0.8
v5.0.7
v5.0.6
v5.0.5
v5.0.4
v5.0.3
v5.0.2
v5.0.1
v5.0.0
v4.5.5
v4.5.4
v4.5.3
v4.5.2
v4.5.1
v4.5.0
v4.4.5
v4.4.4
v4.4.3
v4.4.2
v4.4.1
v4.4.0
v4.3.12
v4.3.11
v4.3.10
v4.3.9
v4.3.8
v4.3.7
v4.3.6
v4.3.5
v4.3.4
v4.3.3
v4.3.2
v4.3.1
v4.3.0
v4.2.0
v4.1.0
v4.0.4
v4.0.3
v4.0.2
v4.0.1
v4.0.0
v3.6.0
v3.5.4
v3.5.3
v3.5.2
v3.5.1
v3.5.0
v3.4.3
v3.4.2
v3.4.1
v3.4.0
v3.3.7
v3.3.6
v3.3.4
v3.3.3
v3.3.2
v3.3.1
v3.3.0
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
p2p/net/swarm/limiter.go
+13
-0
p2p/net/swarm/limiter.go
p2p/net/swarm/limiter_test.go
+57
-7
p2p/net/swarm/limiter_test.go
with
70 additions
and
7 deletions
+70
-7
p2p/net/swarm/limiter.go
View file @
b6f19a55
...
...
@@ -24,6 +24,15 @@ type dialJob struct {
success
bool
}
func
(
dj
*
dialJob
)
cancelled
()
bool
{
select
{
case
<-
dj
.
ctx
.
Done
()
:
return
true
default
:
return
false
}
}
type
dialLimiter
struct
{
rllock
sync
.
Mutex
fdConsuming
int
...
...
@@ -116,6 +125,10 @@ func (dl *dialLimiter) AddDialJob(dj *dialJob) {
// it held during the dial.
func
(
dl
*
dialLimiter
)
executeDial
(
j
*
dialJob
)
{
defer
dl
.
finishedDial
(
j
)
if
j
.
cancelled
()
{
return
}
con
,
err
:=
dl
.
dialFunc
(
j
.
ctx
,
j
.
peer
,
j
.
addr
)
select
{
case
j
.
resp
<-
dialResult
{
Conn
:
con
,
Err
:
err
}
:
...
...
This diff is collapsed.
Click to expand it.
p2p/net/swarm/limiter_test.go
View file @
b6f19a55
...
...
@@ -2,6 +2,7 @@ package swarm
import
(
"fmt"
"math/rand"
"strconv"
"testing"
"time"
...
...
@@ -75,13 +76,7 @@ func TestLimiterBasicDials(t *testing.T) {
l
:=
newDialLimiterWithParams
(
hangDialFunc
(
hang
),
concurrentFdDials
,
4
)
bads
:=
[]
ma
.
Multiaddr
{
addrWithPort
(
t
,
1
),
addrWithPort
(
t
,
2
),
addrWithPort
(
t
,
3
),
addrWithPort
(
t
,
4
),
}
bads
:=
[]
ma
.
Multiaddr
{
addrWithPort
(
t
,
1
),
addrWithPort
(
t
,
2
),
addrWithPort
(
t
,
3
),
addrWithPort
(
t
,
4
)}
good
:=
addrWithPort
(
t
,
20
)
resch
:=
make
(
chan
dialResult
)
...
...
@@ -162,6 +157,7 @@ func TestFDLimiting(t *testing.T) {
pid5
:=
peer
.
ID
(
"testpeer5"
)
utpaddr
:=
mustAddr
(
t
,
"/ip4/127.0.0.1/udp/7777/utp"
)
// This should complete immediately since utp addresses arent blocked by fd rate limiting
l
.
AddDialJob
(
&
dialJob
{
ctx
:
ctx
,
peer
:
pid5
,
addr
:
utpaddr
,
resp
:
resch
})
select
{
...
...
@@ -263,3 +259,57 @@ func TestTokenRedistribution(t *testing.T) {
t
.
Fatal
(
"should have gotten successful dial"
)
}
}
func
TestStressLimiter
(
t
*
testing
.
T
)
{
df
:=
func
(
ctx
context
.
Context
,
p
peer
.
ID
,
a
ma
.
Multiaddr
)
(
conn
.
Conn
,
error
)
{
if
tcpPortOver
(
a
,
1000
)
{
return
conn
.
Conn
(
nil
),
nil
}
else
{
time
.
Sleep
(
time
.
Millisecond
*
time
.
Duration
(
5
+
rand
.
Intn
(
100
)))
return
nil
,
fmt
.
Errorf
(
"test bad dial"
)
}
}
l
:=
newDialLimiterWithParams
(
df
,
20
,
5
)
var
bads
[]
ma
.
Multiaddr
for
i
:=
0
;
i
<
100
;
i
++
{
bads
=
append
(
bads
,
addrWithPort
(
t
,
i
))
}
addresses
:=
append
(
bads
,
addrWithPort
(
t
,
2000
))
success
:=
make
(
chan
struct
{})
for
i
:=
0
;
i
<
20
;
i
++
{
go
func
(
id
peer
.
ID
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
defer
cancel
()
resp
:=
make
(
chan
dialResult
)
time
.
Sleep
(
time
.
Duration
(
rand
.
Intn
(
10
))
*
time
.
Millisecond
)
for
_
,
i
:=
range
rand
.
Perm
(
len
(
addresses
))
{
l
.
AddDialJob
(
&
dialJob
{
addr
:
addresses
[
i
],
ctx
:
ctx
,
peer
:
id
,
resp
:
resp
,
})
}
for
res
:=
range
resp
{
if
res
.
Err
==
nil
{
success
<-
struct
{}{}
return
}
}
}(
peer
.
ID
(
fmt
.
Sprintf
(
"testpeer%d"
,
i
)))
}
for
i
:=
0
;
i
<
20
;
i
++
{
select
{
case
<-
success
:
case
<-
time
.
After
(
time
.
Second
*
5
)
:
t
.
Fatal
(
"expected a success within five seconds"
)
}
}
}
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help