Fixed crash found with non-blocking linger in srt-live-transmit #627
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…variables. Added some logs.
maxsharabayko
added
Type: Bug
maxsharabayko
requested changes
Mar 28, 2019
maxsharabayko
added
[apps]
maxsharabayko
requested changes
Apr 5, 2019
srtcore/api.cpp
Outdated
| { | ||
| HLOGC(mglog.Debug, log << "@" << u << "U::close: NOT AN ACTIVE SOCKET, returning."); | ||
| return 0; | ||
| } |
srtcore/api.cpp
Outdated
| @@ -1831,11 +1833,13 @@ void* CUDTUnited::garbageCollect(void* p) | |||
| timeout.tv_sec = now.tv_sec + 1; | |||
| timeout.tv_nsec = now.tv_usec * 1000; | |||
|
|
|||
| HLOGC(mglog.Debug, log << "GC: sleep until " << FormatTime(uint64_t(now.tv_usec) + 1000000*(timeout.tv_sec))); | |||
srtcore/api.cpp
Outdated
| @@ -964,35 +965,36 @@ int CUDTUnited::close(const SRTSOCKET u) | |||
| s->m_TimeStamp = CTimer::getTime(); | |||
|
|
|||
| m_Sockets.erase(s->m_SocketID); | |||
| m_ClosedSockets.insert(pair<SRTSOCKET, CUDTSocket*>(s->m_SocketID, s)); | |||
| m_ClosedSockets[s->m_SocketID] = s; | |||
| HLOGC(mglog.Debug, log << "@" << u << "U::close: Socket MOVED TO CLOSED for collecting later."); | |||
maxsharabayko
approved these changes
Apr 9, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The crash observed during closing the program with non-blocking and working linger was due to collision of the global object destruction.
This fix provides fair call of srt_cleanup() at the end, as it should be, and some smaller fixes to avoid possible collisions around global variables in the future.