Replace IceUtil::Mutex with std::mutex #1763
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
pepone
requested review from
externl,
bernardnormier and
InsertCreativityHere
pepone
commented
Feb 6, 2024
| @@ -44,61 +44,10 @@ mutex staticMutex; | |||
| int instanceCount = 0; | |||
| bool initOpenSSL = false; | |||
|
|
|||
| #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) | |||
There was a problem hiding this comment.
I think it doesn't make sense to support this older OpenSSL versions with 3.8. As per libressl I think is fine to remove this code we are not testing it.
| @@ -8,6 +8,7 @@ | |||
| #include <IceUtil/Config.h> | |||
| #include <IceUtil/Lock.h> | |||
| #include <IceUtil/Cond.h> | |||
| #include <IceUtil/Mutex.h> | |||
There was a problem hiding this comment.
Do we still use Mutex and Monitor? If not, I would remove them entirely.
There was a problem hiding this comment.
I still have to fix the tests, Application and Timer classes.
| @@ -44,61 +44,10 @@ mutex staticMutex; | |||
| int instanceCount = 0; | |||
| bool initOpenSSL = false; | |||
|
|
|||
| #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) | |||
| { | ||
| timedWait(waitTime); | ||
| if (_conditionVariable.wait_until(lock, chrono::steady_clock::now() + waitTime) == cv_status::timeout) |
There was a problem hiding this comment.
We should revisit this code.
externl
approved these changes
Feb 6, 2024
InsertCreativityHere
approved these changes
Feb 6, 2024
bernardnormier
approved these changes
Feb 6, 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.
This is a follow-up to #1755, replaces most of the remaining usages for IceUtil::Mutex in sources, still left: