Skip to content

Commit 503ad7b

Browse files
committed
Minor code-style fixes for new server benchmark
Minor code-style fixes for new server benchmark
1 parent a8382a4 commit 503ad7b

1 file changed

Lines changed: 26 additions & 28 deletions

File tree

server_test.go

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,6 @@ func TestConsumeSingleTURNFrame(t *testing.T) {
550550
}
551551
}
552552

553-
//nolint:gocognit,errcheck,govet
554553
func RunBenchmarkServer(b *testing.B, clientNum int) {
555554
loggerFactory := logging.NewDefaultLoggerFactory()
556555
credMap := map[string][]byte{
@@ -559,17 +558,17 @@ func RunBenchmarkServer(b *testing.B, clientNum int) {
559558

560559
testSeq := []byte("benchmark-data")
561560

562-
// server
561+
// Setup server
563562
serverAddr, err := net.ResolveUDPAddr("udp4", "0.0.0.0:3478")
564563
if err != nil {
565-
b.Fatalf("cannot resolve server address: %s", err.Error())
564+
b.Fatalf("Failed to resolve server address: %s", err)
566565
}
567566

568567
serverConn, err := net.ListenPacket(serverAddr.Network(), serverAddr.String())
569568
if err != nil {
570-
b.Fatalf("cannot allocate server listener at %s:%s", serverAddr.Network(), serverAddr.String())
569+
b.Fatalf("Failed to allocate server listener at %s:%s", serverAddr.Network(), serverAddr.String())
571570
}
572-
defer serverConn.Close()
571+
defer serverConn.Close() //nolint:errcheck
573572

574573
server, err := NewServer(ServerConfig{
575574
AuthHandler: func(username, realm string, srcAddr net.Addr) (key []byte, ok bool) {
@@ -589,43 +588,42 @@ func RunBenchmarkServer(b *testing.B, clientNum int) {
589588
LoggerFactory: loggerFactory,
590589
})
591590
if err != nil {
592-
b.Fatalf("cannot start server: %s", err.Error())
591+
b.Fatalf("Failed to start server: %s", err)
593592
}
594-
defer server.Close()
593+
defer server.Close() //nolint:errcheck
595594

596-
// create a sink
595+
// Create a sink
597596
sinkAddr, err := net.ResolveUDPAddr("udp4", "0.0.0.0:65432")
598597
if err != nil {
599-
b.Fatalf("cannot resolve sink address: %s", err.Error())
598+
b.Fatalf("Failed to resolve sink address: %s", err)
600599
}
601600

602601
sink, err := net.ListenPacket(sinkAddr.Network(), sinkAddr.String())
603602
if err != nil {
604-
b.Fatalf("cannot allocate sink: %s", err.Error())
603+
b.Fatalf("Failed to allocate sink: %s", err)
605604
}
606-
defer sink.Close()
605+
defer sink.Close() //nolint:errcheck
607606

608607
go func() {
609608
buf := make([]byte, 1600)
610609
for {
611-
_, _, err := sink.ReadFrom(buf)
612-
// ignore "use of closed network connection" errors
613-
if err != nil {
610+
// Ignore "use of closed network connection" errors
611+
if _, _, listenErr := sink.ReadFrom(buf); listenErr != nil {
614612
return
615613
}
616614

617-
// do not care about received data
615+
// Do not care about received data
618616
}
619617
}()
620618

621-
// client(s)
619+
// Setup client(s)
622620
clients := make([]net.PacketConn, clientNum)
623621
for i := 0; i < clientNum; i++ {
624-
clientConn, err := net.ListenPacket("udp4", "0.0.0.0:0")
625-
if err != nil {
626-
b.Fatalf("cannot allocate socket for client %d: %s", i+1, err.Error())
622+
clientConn, listenErr := net.ListenPacket("udp4", "0.0.0.0:0")
623+
if listenErr != nil {
624+
b.Fatalf("Failed to allocate socket for client %d: %s", i+1, err)
627625
}
628-
defer clientConn.Close()
626+
defer clientConn.Close() //nolint:errcheck
629627

630628
client, err := NewClient(&ClientConfig{
631629
STUNServerAddr: serverAddr.String(),
@@ -637,35 +635,35 @@ func RunBenchmarkServer(b *testing.B, clientNum int) {
637635
LoggerFactory: loggerFactory,
638636
})
639637
if err != nil {
640-
b.Fatalf("cannot start client %d: %s", i+1, err.Error())
638+
b.Fatalf("Failed to start client %d: %s", i+1, err)
641639
}
642640
defer client.Close()
643641

644-
if err := client.Listen(); err != nil {
645-
b.Fatalf("client %d cannot listen: %s", i+1, err.Error())
642+
if listenErr := client.Listen(); listenErr != nil {
643+
b.Fatalf("Client %d cannot listen: %s", i+1, listenErr)
646644
}
647645

648646
// create an allocation
649647
turnConn, err := client.Allocate()
650648
if err != nil {
651-
b.Fatalf("client %d cannot create allocation: %s", i+1, err.Error())
649+
b.Fatalf("Client %d cannot create allocation: %s", i+1, err)
652650
}
653-
defer turnConn.Close()
651+
defer turnConn.Close() //nolint:errcheck
654652

655653
clients[i] = turnConn
656654
}
657655

658-
// benchmark
656+
// Run benchmark
659657
for i := 0; i < b.N; i++ {
660658
for i := 0; i < clientNum; i++ {
661659
if _, err := clients[i].WriteTo(testSeq, sinkAddr); err != nil {
662-
b.Fatalf("client %d cannot send to TURN server: %s", i+1, err.Error())
660+
b.Fatalf("Client %d cannot send to TURN server: %s", i+1, err)
663661
}
664662
}
665663
}
666664
}
667665

668-
// BenchmarkServer will benchmark the server with multiple client connections
666+
// BenchmarkServer will benchmark the server with multiple simultaneous client connections
669667
func BenchmarkServer(b *testing.B) {
670668
for i := 1; i <= 4; i++ {
671669
b.Run(fmt.Sprintf("client_num_%d", i), func(b *testing.B) {

0 commit comments

Comments
 (0)