Fix the dead lock when handling SYNC_RECEIPT_TIMEOUT_EXPIRES event #779
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
|
Can you use addEventTimer() and deleteEventTimer(), rather than the *Locked() version? The lock is already held before calling the lock function. I see the lock is recursive, but I think that's a mistake - probably a workaround for some signal handler that doesn't exist. |
|
@christopher-s-hall - thanks for the comments! |
|
Hi @christopher-s-hall , as far as I can see addEventTimer and deleteEventTimer are private so I didn't use them. |
|
I'd say make them public. |
|
OK, I will give that a go. How do I proceed on this one, should I close it and create a new pull request to include all changes? |
|
You can add changes on top of this patch if you like. |
|
This change now looks correct to me. What do you think @christopher-s-hall ? |
christopher-s-hall
approved these changes
May 17, 2018
PawelModrzejewski
added a commit
to PawelModrzejewski/gptp
that referenced
this pull request
Jan 19, 2021
…mer() During testing of gPTP (daemon_cl) robustness implementation for ELVIS-2441067 dead locks were observed when calling startSyncReceiptTimer(), specifically during SYNC_RATE_INTERVAL_TIMEOUT_EXPIRED event handling. daemon_cl was blocked when entering mentioned function after new function requestFastSyncs() had been called to speed up syncs rate (after lost synchronization). Includes also removal of uninitialized 'isGM' variable from EtherPort class, as it is defined/initialized in CommonPort class. Not fixed in OpenAVnu. See discussion: Avnu/OpenAvnu#737 Fix for the dead lock was merged into OpenAVnu/open-avb-next branch as pull request #779 with more detailed description in issue #776. See: Avnu/OpenAvnu#779 commit 9b96ee647da61ffdf06dad031d06b8b13228e697 Merge: 81783f1 1cb0125 Author: andrew-elder <aelder@audioscience.com> Date: Thu May 17 15:26:34 2018 -0400 Merge pull request #779 from freddeng/freddeng-patch-1 Fix the dead lock when handling SYNC_RECEIPT_TIMEOUT_EXPIRES event commit 15fba8379f3a9e4ff0428cc3e4292aad40e485b1 Author: freddeng <freddeng78@yahoo.com.au> Date: Wed Apr 18 22:51:57 2018 +1000 Update common_port.cpp commit 1cb01252c0b64b572c9d567a7c3a145d364dd12b Author: Fred Deng <fred.deng@soundunited.com> Date: Fri Apr 27 12:56:19 2018 +1000 Change to using addEventTimer and deleteEventTimer without lock. Issue: MGUSIN-11895 Change-Id: Ic55bf317317ac44f1f98d960225a644eec39aeef [0013_daemons_gptp_linux-fix-the-dead-lock-when-handling-SYNC_RECEIPT_TIMEOUT_EXPIRES.patch] patch applied
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.
This is to fix issue #776 by adding timer queue lock in startSyncReceiptTimer and stopSyncReceiptTimer.