Skip to content

[core] Fixed the inconsistency between getFirstLostSeq() and ackDataUpTo() #2488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Nov 1, 2022
Merged

[core] Fixed the inconsistency between getFirstLostSeq() and ackDataUpTo() #2488

merged 2 commits into from
Nov 1, 2022

Conversation

gou4shi1
Copy link
Contributor

@gou4shi1 gou4shi1 commented Oct 14, 2022 •
edited
Loading

I found the ackDataUpTo: IPE logs from #2463 happened frequently, e.g.

11:05:45.433712/SRT:TsbPd!W:SRT.br: @965985327:RCV-DROPPED 53 packet(s). Packet seqno %1675849901 delayed for 234.185 ms
11:05:45.433777/SRT:RcvQ:w1*E:SRT.xt: @965985327: ackDataUpTo: IPE: invalid ACK from %1675849901 to %1675849848 (-53 packets)

It may caused by the inconsistency between getFirstLostSeq() and ackDataUpTo():

[RcvQ] m_pRcvLossList->getFirstLostSeq() -> 1675849848
[TsbPd] rcvDropTooLateUpTo() -> 1675849901
[RcvQ] ackDataUpTo() -> 1675849848 < 1675849901!

So getFirstLostSeq() should be protected by m_RcvBufferLock together with ackDataUpTo().

@maxsharabayko maxsharabayko added Type: Bug Indicates an unexpected problem or unintended behavior [core] Area: Changes in SRT library core labels Oct 14, 2022
@maxsharabayko maxsharabayko added this to the v1.6.0 milestone Oct 14, 2022
maxsharabayko
maxsharabayko reviewed Oct 17, 2022
View reviewed changes
@gou4shi1 @maxsharabayko
Update srtcore/core.cpp
d18df82 
Co-authored-by: Maxim Sharabayko <maxlovic@gmail.com>
@codecov-commenter
Copy link

Codecov Report

Merging #2488 (d18df82) into master (04369b8) will decrease coverage by 0.14%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #2488      +/-   ##
==========================================
- Coverage   66.10%   65.96%   -0.15%     
==========================================
  Files          96       96              
  Lines       19599    19602       +3     
==========================================
- Hits        12956    12930      -26     
- Misses       6643     6672      +29
Impacted Files Coverage Δ
srtcore/core.cpp 59.72% <100.00%> (-0.43%) ⬇️
srtcore/cache.h 80.00% <0.00%> (-3.08%) ⬇️
srtcore/congctl.cpp 81.34% <0.00%> (-1.56%) ⬇️
srtcore/list.cpp 82.11% <0.00%> (-0.82%) ⬇️
srtcore/queue.cpp 80.59% <0.00%> (-0.60%) ⬇️
srtcore/buffer_snd.cpp 66.85% <0.00%> (+0.57%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@maxsharabayko maxsharabayko merged commit 0f6e7c7 into Haivision:master Nov 1, 2022
@gou4shi1 gou4shi1 deleted the fix-sendCtrlAck branch November 1, 2022 10:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maxsharabayko maxsharabayko maxsharabayko left review comments

Assignees
No one assigned
Labels
[core] Area: Changes in SRT library core Type: Bug Indicates an unexpected problem or unintended behavior
Projects
None yet
Milestone
v1.5.2
Development

Successfully merging this pull request may close these issues.
3 participants
@gou4shi1 @codecov-commenter @maxsharabayko