LBRYCommunity/tracker
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

add waitgroup to udp server

Browse source
This commit is contained in:
Jimmy Zelinskie 2015-10-28 16:32:17 -04:00
parent c0ba9b7d38
commit 39b1990798
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
udp/udp.go
View file

@ -9,6 +9,7 @@ package udp
import ( import (
"errors" "errors"
"net" "net"
"sync"
"time" "time"
"github.com/golang/glog" "github.com/golang/glog"
@ -20,13 +21,14 @@ import (
// Server represents a UDP torrent tracker. // Server represents a UDP torrent tracker.
type Server struct { type Server struct {
config *config.Config config *config.Config
tracker *tracker.Tracker tracker *tracker.Tracker
sock *net.UDPConn
connIDGen *ConnectionIDGenerator
closing chan struct{} closing chan struct{}
booting chan struct{} booting chan struct{}
sock *net.UDPConn wg sync.WaitGroup
connIDGen *ConnectionIDGenerator
} }
func (s *Server) serve() error { func (s *Server) serve() error {
@ -73,7 +75,9 @@ func (s *Server) serve() error {
return err return err
} }
s.wg.Add(1)
go func() { go func() {
defer s.wg.Done()
start := time.Now() start := time.Now()
response, action, err := s.handlePacket(buffer[:n], addr) response, action, err := s.handlePacket(buffer[:n], addr)
defer pool.GiveSlice(buffer) defer pool.GiveSlice(buffer)
@ -124,6 +128,7 @@ func (s *Server) Serve() {
func (s *Server) Stop() { func (s *Server) Stop() {
close(s.closing) close(s.closing)
s.sock.SetReadDeadline(time.Now()) s.sock.SetReadDeadline(time.Now())
s.wg.Wait()
} }
// NewServer returns a new UDP server for a given configuration and tracker. // NewServer returns a new UDP server for a given configuration and tracker.