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

Merge pull request #2192 from lucas-clemente/remove-unnecessary-session-destroy

Browse source 
remove unneccessary destroy of the session when retiring a connection ID
This commit is contained in:
Marten Seemann 2019-11-01 18:58:47 +07:00 • committed by GitHub
commit 46c46689c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
packet_handler_map.go
View file

@ -72,25 +72,14 @@ func (h *packetHandlerMap) Add(id protocol.ConnectionID, handler packetHandler)
func (h *packetHandlerMap) Remove(id protocol.ConnectionID) {
h.mutex.Lock()
h.removeByConnectionIDAsString(string(id))
delete(h.handlers, string(id))
h.mutex.Unlock()
}
func (h *packetHandlerMap) removeByConnectionIDAsString(id string) {
delete(h.handlers, id)
}
func (h *packetHandlerMap) Retire(id protocol.ConnectionID) {
h.retireByConnectionIDAsString(string(id))
}
func (h *packetHandlerMap) retireByConnectionIDAsString(id string) {
time.AfterFunc(h.deleteRetiredSessionsAfter, func() {
h.mutex.Lock()
if sess, ok := h.handlers[id]; ok {
sess.destroy(errors.New("deleting"))
}
h.removeByConnectionIDAsString(id)
delete(h.handlers, string(id))
h.mutex.Unlock()
})
}

1
packet_handler_map_test.go
View file

@ -139,7 +139,6 @@ var _ = Describe("Packet Handler Map", func() {
connID := protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8}
sess := NewMockPacketHandler(mockCtrl)
handler.Add(connID, sess)
sess.EXPECT().destroy(gomock.Any())
handler.Retire(connID)
time.Sleep(scaleDuration(30 * time.Millisecond))
handler.handlePacket(nil, nil, getPacket(connID))