HPCC-31981 Mutex code was inefficient #18756
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
ghalliday
reviewed
Jun 18, 2024
There was a problem hiding this comment.
@richardkchapman looks good. Needs a bit of tidying up - commit message, squash and a few compile issues, but otherwise good to merge.
system/jlib/jmutex.hpp
Outdated
| { | ||
| friend class Monitor; | ||
| protected: | ||
| Mutex(const char *name) |
There was a problem hiding this comment.
OldMutex - otherwise you get windows compile errors.
system/jlib/jmutex.hpp
Outdated
| @@ -46,8 +47,9 @@ extern jlib_decl void spinUntilReady(std::atomic_uint &value); | |||
| #endif | |||
|
|
|||
| #ifdef _WIN32 | |||
| class jlib_decl Mutex | |||
| class jlib_decl OldMutex | |||
There was a problem hiding this comment.
Legacy might be a better name than old, but doesn't really matter.
system/jlib/jpqueue.hpp
Outdated
|
|
||
| waiting--; | ||
| return ret; | ||
| } | ||
| Mutex mutex; |
There was a problem hiding this comment.
trivial: newline before rather than after so that members are grouped together
system/jlib/jmutex.hpp
Outdated
| private: | ||
| T &mutex; | ||
| public: | ||
| MutexBlock<T>(T &m) : mutex(m) { mutex.lock(); }; |
There was a problem hiding this comment.
I think the is not needed/correct on the constructor, and is causing compile errors for wasmembed
|
@ghalliday made changes as suggested, and squashed. Please re-review |
Refactor Mutex class to use modern C++ standard mutexes, which are significantly faster. Leave old Mutex class in place just in case the unlockall functionality is significant in the one place that uses it. Also fixes Incorrect summary stats fromjlib timing test Signed-off-by: Richard Chapman <[email protected]>
ghalliday
approved these changes
Jun 19, 2024
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.
Type of change:
Checklist:
Smoketest:
Testing: