Added cleanup code such that all code coverage run tests pass. #196
+59
−7
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
ppt-adsk
commented
Nov 6, 2024
| _Destroy(); | ||
| } | ||
|
|
||
| void MayaHydraSceneIndex::_Destroy() |
There was a problem hiding this comment.
Add Destroy() method to perform proper cleanup on code coverage builds.
| #ifndef CODE_COVERAGE_WORKAROUND | ||
| private: | ||
| #endif | ||
| void _Destroy(); |
There was a problem hiding this comment.
Add Destroy() method to perform proper cleanup on code coverage builds.
There was a problem hiding this comment.
Do we have a ticket to track when to remove the CODE_COVERAGE_WORKAROUND?
There was a problem hiding this comment.
Just created one: HYDRA-1297
| friend struct PXR_NS::MayaUsdSceneIndexRegistration; | ||
| #endif | ||
|
|
||
| void Destroy() { |
There was a problem hiding this comment.
Add Destroy() method to perform proper cleanup on code coverage builds.
| @@ -339,6 +354,18 @@ struct MayaUsdSceneIndexRegistration : public MayaHydraSceneIndexRegistration | |||
| auto proxyShapeSceneIndex = TfDynamic_cast<MayaUsdProxyShapeSceneIndexRefPtr>(pluginSceneIndex); | |||
| proxyShapeSceneIndex->UpdateTime(); | |||
| } | |||
|
|
|||
| #ifdef CODE_COVERAGE_WORKAROUND | |||
| void Destroy() override { | |||
There was a problem hiding this comment.
Invoke Destroy() methods.
| #ifdef CODE_COVERAGE_WORKAROUND | ||
| // Leak the Maya scene index for code coverage, as its base class | ||
| // HdRetainedSceneIndex dtor crashes in Windows clang code coverage build. | ||
| _mayaHydraSceneIndex->_Destroy(); |
There was a problem hiding this comment.
Invoke Destroy() method.
lilike-adsk
approved these changes
Nov 6, 2024
ppt-adsk
added
the
ready-for-merge
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.
Code coverage builds have to leak retained scene indices because of a crash in the retained scene index destructor, on Clang code coverage builds alone. This creates a maintenance burden when such scene indices also manage other resources. This pull request adds a Destroy() method to certain classes so that proper cleanup can be done in code coverage builds, even if retained scene indices are leaked to avoid crashing.