Revert change to report interval logic #325
Merged
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
jw3
force-pushed
the
324-fix_state_reports
branch
2 times, most recently
from
7d4f452 to
8be8211
Compare
75acb36 changed the `else` block to an `else if` at line 418 which caused the `pthread_cond_wait` call to fall outside of the block. This commit restores the else so `pthread_cond_wait` falls within the else and is only called when reporting is disabled.
jw3
force-pushed
the
324-fix_state_reports
branch
from
8be8211 to
38b2242
Compare
|
Thoughts on this one @radosroka? |
|
Thanks for the patch. I reviewed it. It restores the code as it was at commit 5a8f685. But it also adds a "if (stop)" check before the pthread_cond_wait. That change in flow made the comparison look more complicated than at first glance, but it also fixes it by not waiting if we are stopping. Looks good to me. |
stevegrubb
merged commit 3df9987
into
linux-application-whitelisting:main
17 of 30 checks passed
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.
Undo a change that came along with code formatting in 75acb36.
There was an
elseblock changed to anelse ifat line 418 which caused thepthread_cond_waitcall to fall outside of the else block.Closes #324