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

remove unnecessary mutex locking in the stream flow controller

Browse source
This commit is contained in:
Marten Seemann 2020-11-08 18:00:13 +07:00
parent 69158cf5f1
commit 5352cd509b
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
internal/flowcontrol/stream_flow_controller.go
View file

@ -50,9 +50,6 @@ func NewStreamFlowController(
// UpdateHighestReceived updates the highestReceived value, if the offset is higher. // UpdateHighestReceived updates the highestReceived value, if the offset is higher.
func (c *streamFlowController) UpdateHighestReceived(offset protocol.ByteCount, final bool) error { func (c *streamFlowController) UpdateHighestReceived(offset protocol.ByteCount, final bool) error {
c.mutex.Lock()
defer c.mutex.Unlock()
// If the final offset for this stream is already known, check for consistency. // If the final offset for this stream is already known, check for consistency.
if c.receivedFinalOffset { if c.receivedFinalOffset {
// If we receive another final offset, check that it's the same. // If we receive another final offset, check that it's the same.
@ -110,8 +107,11 @@ func (c *streamFlowController) SendWindowSize() protocol.ByteCount {
} }
func (c *streamFlowController) maybeQueueWindowUpdate() { func (c *streamFlowController) maybeQueueWindowUpdate() {
if c.receivedFinalOffset {
return
}
c.mutex.Lock() c.mutex.Lock()
hasWindowUpdate := !c.receivedFinalOffset && c.hasWindowUpdate() hasWindowUpdate := c.hasWindowUpdate()
c.mutex.Unlock() c.mutex.Unlock()
if hasWindowUpdate { if hasWindowUpdate {
c.queueWindowUpdate() c.queueWindowUpdate()
@ -119,14 +119,13 @@ func (c *streamFlowController) maybeQueueWindowUpdate() {
} }
func (c *streamFlowController) GetWindowUpdate() protocol.ByteCount { func (c *streamFlowController) GetWindowUpdate() protocol.ByteCount {
// don't use defer for unlocking the mutex here, GetWindowUpdate() is called frequently and defer shows up in the profiler // If we already received the final offset for this stream, the peer won't need any additional flow control credit.
c.mutex.Lock()
// if we already received the final offset for this stream, the peer won't need any additional flow control credit
if c.receivedFinalOffset { if c.receivedFinalOffset {
c.mutex.Unlock()
return 0 return 0
} }
// Don't use defer for unlocking the mutex here, GetWindowUpdate() is called frequently and defer shows up in the profiler
c.mutex.Lock()
oldWindowSize := c.receiveWindowSize oldWindowSize := c.receiveWindowSize
offset := c.baseFlowController.getWindowUpdate() offset := c.baseFlowController.getWindowUpdate()
if c.receiveWindowSize > oldWindowSize { // auto-tuning enlarged the window size if c.receiveWindowSize > oldWindowSize { // auto-tuning enlarged the window size