Repository navigation
Conversation
pthread_cond_timedwait returns the error number directly rather than returning -1 and setting errno, so the check for ( ret == -1 ) && ( errno == ETIMEDOUT ) was never true. On timeout the loop still exited via the ( ret == 0 ) condition, but the function then always returned true, so a timeout was wrongly reported as success. Had the intended branch fired, it would also have leaked the held mutex. Check ret == ETIMEDOUT and break out of the wait loop so all paths reach the single unlock. Return the actual event_triggered state read under the mutex instead of a hardcoded true, which also reports the correct result when a signal races with the timeout. Signed-off-by: Ted Lyngmo <ted@lyncon.se>
|
This file contains hidden or 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
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.



Fix timeout reporting and mutex leak in event_wait_timed
pthread_cond_timedwaitreturns the error number directly rather than returning -1 and settingerrno, so the check for( ret == -1 ) && ( errno == ETIMEDOUT )was nevertrue. On timeout the loop still exited via the( ret == 0 )condition, but the function then always returnedtrue, so a timeout was wrongly reported as success. Had the intended branch fired, it would also have leaked the held mutex.Check
ret == ETIMEDOUTand break out of the wait loop so all paths reach the single unlock. Return the actualevent_triggeredstate read under the mutex instead of a hardcoded true, which also reports the correct result when a signal races with the timeout.Test Steps
This program failes without this patch:
Checklist:
Related Issue
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.