Fix stdin handling in CUFileDriverScope #5902
Merged
Conversation
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
JanuszL
force-pushed
the
fix_gds_file_desc
branch
2 times, most recently
from
a8b66cc to
76b925e
Compare
|
!build |
|
CI MESSAGE: [27700108]: BUILD STARTED |
|
CI MESSAGE: [27700108]: BUILD FAILED |
JanuszL
force-pushed
the
fix_gds_file_desc
branch
from
76b925e to
e77deac
Compare
|
!build |
|
CI MESSAGE: [27704106]: BUILD STARTED |
|
CI MESSAGE: [27704106]: BUILD FAILED |
- adds stdin backup and restore mechanism to prevent issues with file descriptor handling when using cuFile library. This fixes a problem where cuFileDriverOpen could close stdin, causing subsequent GDS file operations to fail when the file descriptor 0 is reused. Signed-off-by: Janusz Lisiecki <[email protected]>
JanuszL
force-pushed
the
fix_gds_file_desc
branch
from
e77deac to
1518bfb
Compare
|
!build |
|
CI MESSAGE: [27711278]: BUILD STARTED |
mzient
reviewed
Apr 29, 2025
| @@ -32,7 +33,23 @@ namespace test { | |||
|
|
|||
| struct CUFileDriverScope { | |||
| CUFileDriverScope() { | |||
| // cuFileDriverOpen is some versions of cuFile library, can close stdin | |||
There was a problem hiding this comment.
Suggested change
| // cuFileDriverOpen is some versions of cuFile library, can close stdin | |
| // cuFileDriverOpen in some versions of cuFile library, can close stdin |
mzient
reviewed
Apr 29, 2025
| @@ -43,10 +60,42 @@ struct CUFileDriverScope { | |||
| #pragma push_macro("cuFileDriverClose") | |||
| #undef cuFileDriverClose | |||
| if (cuFileIsSymbolAvailable("cuFileDriverClose_v2")) { | |||
| // cuFileDriverOpen is some versions of cuFile library, can close stdin | |||
There was a problem hiding this comment.
Suggested change
| // cuFileDriverOpen is some versions of cuFile library, can close stdin | |
| // cuFileDriverOpen in some versions of cuFile library, can close stdin |
mzient
reviewed
Apr 29, 2025
| } else { | ||
| // cuFileDriverOpen is some versions of cuFile library, can close stdin |
There was a problem hiding this comment.
Suggested change
| // cuFileDriverOpen is some versions of cuFile library, can close stdin | |
| // cuFileDriverOpen in some versions of cuFile library, can close stdin |
mzient
reviewed
Apr 29, 2025
dali/util/cufile_helper.h
Outdated
| @@ -37,15 +38,47 @@ struct CUFileDriverScope { | |||
| CUFileDriverScope() { | |||
| // v2 API performs proper reference counting, so we increase the reference count here... | |||
| if (cuFileIsSymbolAvailable("cuFileDriverClose_v2")) { | |||
| // cuFileDriverOpen is some versions of cuFile library, can close stdin | |||
There was a problem hiding this comment.
Suggested change
| // cuFileDriverOpen is some versions of cuFile library, can close stdin | |
| // cuFileDriverOpen in some versions of cuFile library, can close stdin |
mzient
reviewed
Apr 29, 2025
dali/util/cufile_helper.h
Outdated
| } | ||
| } | ||
| ~CUFileDriverScope() { | ||
| // ...and decrease it here. | ||
| // The old GDS API would simply destroy the library, possibly still in use by other modules | ||
| // within the process. | ||
| if (cuFileIsSymbolAvailable("cuFileDriverClose_v2")) { | ||
| // cuFileDriverOpen is some versions of cuFile library, can close stdin |
There was a problem hiding this comment.
Suggested change
| // cuFileDriverOpen is some versions of cuFile library, can close stdin | |
| // cuFileDriverOpen in some versions of cuFile library, can close stdin |
mzient
approved these changes
Apr 29, 2025
|
CI MESSAGE: [27711278]: BUILD FAILED |
|
CI MESSAGE: [27711278]: BUILD PASSED |
jantonguirao
approved these changes
Apr 30, 2025
Signed-off-by: Janusz Lisiecki <[email protected]>
|
!build |
|
CI MESSAGE: [27749210]: BUILD STARTED |
|
CI MESSAGE: [27749210]: BUILD 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.
handling when using cuFile library. This fixes a problem where cuFileDriverOpen/Close
could close stdin, causing subsequent GDS file operations to fail when the file
descriptor 0 is reused.
Category:
Bug fix (non-breaking change which fixes an issue)
Description:
handling when using cuFile library. This fixes a problem where cuFileDriverOpen/Close
could close stdin, causing subsequent GDS file operations to fail when the file
descriptor 0 is reused.
Additional information:
Affected modules and functionalities:
Key points relevant for the review:
Tests:
Checklist
Documentation
DALI team only
Requirements
REQ IDs: N/A
JIRA TASK: N/A