improve thread safety for concurrent tiff loads #3767
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
…thread-safety-for-concurrent-tiff-loads
lgritz
reviewed
Feb 9, 2023
lgritz
reviewed
Feb 9, 2023
src/libOpenImageIO/icc.cpp
Outdated
| // return color_space_names[color_space]; | ||
| auto it = color_space_names.find(color_space); | ||
| return (it != color_space_names.end()) ? it->second : nullptr; | ||
|
|
There was a problem hiding this comment.
Can you get rid of the extra blank line here, please?
There was a problem hiding this comment.
I removed the blank line.
lgritz
reviewed
Feb 9, 2023
There was a problem hiding this comment.
Wow, good catch. It did not occur to me that it might be queried with a key that wasn't already in the map, thus potentially altering it and breaking thread safety. I should have declared these const all along.
The whole thing LGTM except for the syntax error I pointed out with the missing brace.
lgritz
reviewed
Feb 9, 2023
lgritz
force-pushed
the
angudavi/improve-thread-safety-for-concurrent-tiff-loads
branch
from
053453e to
adc9705
Compare
lgritz
added a commit
to lgritz/OpenImageIO
that referenced
this pull request
Feb 11, 2023
…ation#3767) * Make lookups of const unordered_maps thread-safe * added back deleted end brace * clang-format --------- Co-authored-by: Larry Gritz <[email protected]>
lgritz
added a commit
to lgritz/OpenImageIO
that referenced
this pull request
Mar 8, 2023
…ation#3767) * Make lookups of const unordered_maps thread-safe * added back deleted end brace * clang-format --------- Co-authored-by: Larry Gritz <[email protected]>
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.
Description
This fixes a thread-safety issue with concurrent parsing of multiple tiff files. The code uses several static std::unordered_maps and the indexing operator[] was used to perform the lookup. Use of this operator has the side effect of adding a default value to the map if the key was not found. This is not what should happen and isn't thread safe. The proper fix is to make the maps const and use the find() method of the map to perform the lookup and return a default value if not found.
Tests
Tests were not performed. However the code changes were tested within the context of loading USD files with multiple tiff files.
Checklist:
have previously submitted a Contributor License Agreement
(individual, and if there is any way my
employers might think my programming belongs to them, then also
corporate).
(adding new test cases if necessary).