mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-05 13:17:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

privatize session.run

Browse source 
ref #60
This commit is contained in:
Lucas Clemente 2016-05-15 18:49:09 +02:00
parent 2fb42afc8a
commit a10d58c8ca
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
congestion/cubic_sender_test.go
View file

@ -414,7 +414,7 @@ var _ = Describe("Cubic Sender", func() {
Expect(sender.RetransmissionDelay()).To(Equal(expected_delay)) Expect(sender.RetransmissionDelay()).To(Equal(expected_delay))
for i := 0; i < 100; i++ { for i := 0; i < 100; i++ {
// Run to make sure that we converge. // run to make sure that we converge.
rttStats.UpdateRTT(kRttMs+kDeviationMs, 0, clock.Now()) rttStats.UpdateRTT(kRttMs+kDeviationMs, 0, clock.Now())
rttStats.UpdateRTT(kRttMs-kDeviationMs, 0, clock.Now()) rttStats.UpdateRTT(kRttMs-kDeviationMs, 0, clock.Now())
} }

4
server.go
View file

@ -15,7 +15,7 @@ import (
// packetHandler handles packets // packetHandler handles packets
type packetHandler interface { type packetHandler interface {
handlePacket(addr interface{}, hdr *publicHeader, data []byte) handlePacket(addr interface{}, hdr *publicHeader, data []byte)
Run() run()
} }
// A Server of QUIC // A Server of QUIC
@ -128,7 +128,7 @@ func (s *Server) handlePacket(conn *net.UDPConn, remoteAddr *net.UDPAddr, packet
s.streamCallback, s.streamCallback,
s.closeCallback, s.closeCallback,
) )
go session.Run() go session.run()
s.sessionsMutex.Lock() s.sessionsMutex.Lock()
s.sessions[hdr.ConnectionID] = session s.sessions[hdr.ConnectionID] = session
s.sessionsMutex.Unlock() s.sessionsMutex.Unlock()

2
server_test.go
View file

@ -22,7 +22,7 @@ func (s *mockSession) handlePacket(addr interface{}, hdr *publicHeader, data []b
s.packetCount++ s.packetCount++
} }
func (s *mockSession) Run() { func (s *mockSession) run() {
} }
func newMockSession(conn connection, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback, closeCallback closeCallback) packetHandler { func newMockSession(conn connection, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback, closeCallback closeCallback) packetHandler {

4
session.go
View file

@ -126,8 +126,8 @@ func newSession(conn connection, v protocol.VersionNumber, connectionID protocol
return session return session
} }
// Run the session main loop // run the session main loop
func (s *Session) Run() { func (s *Session) run() {
for { for {
// Close immediately if requested // Close immediately if requested
select { select {

16
session_test.go
View file

@ -315,7 +315,7 @@ var _ = Describe("Session", func() {
scfg := handshake.NewServerConfig(crypto.NewCurve25519KEX(), signer) scfg := handshake.NewServerConfig(crypto.NewCurve25519KEX(), signer)
nGoRoutinesBefore = runtime.NumGoroutine() nGoRoutinesBefore = runtime.NumGoroutine()
session = newSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) { closed = true }).(*Session) session = newSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) { closed = true }).(*Session)
go session.Run() go session.run()
Eventually(func() int { return runtime.NumGoroutine() }).Should(Equal(nGoRoutinesBefore + 2)) Eventually(func() int { return runtime.NumGoroutine() }).Should(Equal(nGoRoutinesBefore + 2))
}) })
@ -437,13 +437,13 @@ var _ = Describe("Session", func() {
0x18, 0x6f, 0x44, 0xba, 0x97, 0x35, 0xd, 0x6f, 0xbf, 0x64, 0x3c, 0x79, 0x66, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x18, 0x6f, 0x44, 0xba, 0x97, 0x35, 0xd, 0x6f, 0xbf, 0x64, 0x3c, 0x79, 0x66, 0x6f, 0x6f, 0x62, 0x61, 0x72,
}, },
} }
session.Run() session.run()
Expect(session.sendingScheduled).To(Receive()) Expect(session.sendingScheduled).To(Receive())
}) })
Context("bundling of small packets", func() { Context("bundling of small packets", func() {
It("bundles two small frames into one packet", func() { It("bundles two small frames into one packet", func() {
go session.Run() go session.run()
session.queueStreamFrame(&frames.StreamFrame{ session.queueStreamFrame(&frames.StreamFrame{
StreamID: 5, StreamID: 5,
@ -458,7 +458,7 @@ var _ = Describe("Session", func() {
}) })
It("sends out two big frames in two packet", func() { It("sends out two big frames in two packet", func() {
go session.Run() go session.run()
session.queueStreamFrame(&frames.StreamFrame{ session.queueStreamFrame(&frames.StreamFrame{
StreamID: 5, StreamID: 5,
@ -473,7 +473,7 @@ var _ = Describe("Session", func() {
}) })
It("sends out two small frames that are written to long after one another into two packet", func() { It("sends out two small frames that are written to long after one another into two packet", func() {
go session.Run() go session.run()
session.queueStreamFrame(&frames.StreamFrame{ session.queueStreamFrame(&frames.StreamFrame{
StreamID: 5, StreamID: 5,
@ -489,7 +489,7 @@ var _ = Describe("Session", func() {
}) })
It("sends a queued ACK frame only once", func() { It("sends a queued ACK frame only once", func() {
go session.Run() go session.run()
packetNumber := protocol.PacketNumber(0x1337) packetNumber := protocol.PacketNumber(0x1337)
session.receivedPacketHandler.ReceivedPacket(packetNumber, true) session.receivedPacketHandler.ReceivedPacket(packetNumber, true)
@ -540,7 +540,7 @@ var _ = Describe("Session", func() {
} }
session.handlePacket(nil, hdr, []byte("foobar")) session.handlePacket(nil, hdr, []byte("foobar"))
} }
session.Run() session.run()
Expect(conn.written).To(HaveLen(1)) Expect(conn.written).To(HaveLen(1))
Expect(conn.written[0]).To(ContainSubstring(string([]byte("PRST")))) Expect(conn.written[0]).To(ContainSubstring(string([]byte("PRST"))))
@ -568,7 +568,7 @@ var _ = Describe("Session", func() {
}) })
session.packer.connectionParametersManager = session.connectionParametersManager session.packer.connectionParametersManager = session.connectionParametersManager
session.packer.sentPacketHandler = newMockSentPacketHandler() session.packer.sentPacketHandler = newMockSentPacketHandler()
session.Run() // Would normally not return session.run() // Would normally not return
Expect(conn.written[0]).To(ContainSubstring("No recent network activity.")) Expect(conn.written[0]).To(ContainSubstring("No recent network activity."))
close(done) close(done)
}, 0.5) }, 0.5)