TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/bench: close Engines on benchmark completion

Browse Source 
This reduces the speed with which these benchmarks exhaust their supply fds.
Not to zero unfortunately, but it's still helpful when doing long runs.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2021-05-07 12:53:11 -07:00 committed by Josh Bleecher Snyder
parent e9066ee625
commit 6618e82ba2
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wgengine/bench/bench.go
View File

@ -80,7 +80,7 @@ func main() {
// tx=134236 rx=133166 (1070 = 0.80% loss) (1088.9 Mbits/sec) // tx=134236 rx=133166 (1070 = 0.80% loss) (1088.9 Mbits/sec)
case 101: case 101:
setupWGTest(logf, traf, Addr1, Addr2) setupWGTest(nil, logf, traf, Addr1, Addr2)
default: default:
log.Fatalf("provide a valid test number (0..n)") log.Fatalf("provide a valid test number (0..n)")

2
wgengine/bench/bench_test.go
View File

@ -43,7 +43,7 @@ func BenchmarkBatchTCP(b *testing.B) {
func BenchmarkWireGuardTest(b *testing.B) { func BenchmarkWireGuardTest(b *testing.B) {
run(b, func(logf logger.Logf, traf *TrafficGen) { run(b, func(logf logger.Logf, traf *TrafficGen) {
setupWGTest(logf, traf, Addr1, Addr2) setupWGTest(b, logf, traf, Addr1, Addr2)
}) })
} }

9
wgengine/bench/wg.go
View File

@ -10,6 +10,7 @@ import (
"os" "os"
"strings" "strings"
"sync" "sync"
"testing"
"github.com/tailscale/wireguard-go/tun" "github.com/tailscale/wireguard-go/tun"
"inet.af/netaddr" "inet.af/netaddr"
@ -25,7 +26,7 @@ import (
"tailscale.com/wgengine/wgcfg" "tailscale.com/wgengine/wgcfg"
) )
func setupWGTest(logf logger.Logf, traf *TrafficGen, a1, a2 netaddr.IPPrefix) { func setupWGTest(b *testing.B, logf logger.Logf, traf *TrafficGen, a1, a2 netaddr.IPPrefix) {
l1 := logger.WithPrefix(logf, "e1: ") l1 := logger.WithPrefix(logf, "e1: ")
k1, err := wgkey.NewPrivate() k1, err := wgkey.NewPrivate()
if err != nil { if err != nil {
@ -49,6 +50,9 @@ func setupWGTest(logf logger.Logf, traf *TrafficGen, a1, a2 netaddr.IPPrefix) {
if err != nil { if err != nil {
log.Fatalf("e1 init: %v", err) log.Fatalf("e1 init: %v", err)
} }
if b != nil {
b.Cleanup(e1.Close)
}
l2 := logger.WithPrefix(logf, "e2: ") l2 := logger.WithPrefix(logf, "e2: ")
k2, err := wgkey.NewPrivate() k2, err := wgkey.NewPrivate()
@ -73,6 +77,9 @@ func setupWGTest(logf logger.Logf, traf *TrafficGen, a1, a2 netaddr.IPPrefix) {
if err != nil { if err != nil {
log.Fatalf("e2 init: %v", err) log.Fatalf("e2 init: %v", err)
} }
if b != nil {
b.Cleanup(e2.Close)
}
e1.SetFilter(filter.NewAllowAllForTest(l1)) e1.SetFilter(filter.NewAllowAllForTest(l1))
e2.SetFilter(filter.NewAllowAllForTest(l2)) e2.SetFilter(filter.NewAllowAllForTest(l2))