[core] Fix a data race by adding a shared mutex #2961
Closed
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
maxsharabayko
requested changes
Jun 17, 2024
| @@ -67,6 +67,36 @@ namespace srt | |||
| { | |||
| class CChannel; | |||
| class CUDT; | |||
| class CUDTWrapper; | |||
There was a problem hiding this comment.
The class definition follows below. This declaration is excessive.
Comment on lines
+72
to
+99
| class CUDTWrapper { | ||
| public: | ||
| CUDT *udt; | ||
| sync::SharedMutex mut; | ||
|
|
||
| public: | ||
| CUDTWrapper() | ||
| :udt(NULL) | ||
| ,mut() | ||
| { | ||
| } | ||
| void lockRead() | ||
| { | ||
| return mut.lockRead(); | ||
| } | ||
| void lockWrite() | ||
| { | ||
| return mut.lockWrite(); | ||
| } | ||
| void unlockRead() | ||
| { | ||
| return mut.unlockRead(); | ||
|
|
||
| } | ||
| void unlockWrite(){ | ||
| return mut.unlockWrite(); | ||
| } | ||
| }; |
There was a problem hiding this comment.
I don't quite like the name. It does not express what the class does, except for wrapping CUDT.
In fact, it can be a template class holding a pointer to a resource and a shared mutex, e.g.
template <class T>
class CSharedObject
{
private:
T* m_pObj;
sync::SharedMutex m_mtx;
public:
// ...
};| class CUDTWrapper; | ||
|
|
||
| class CUDTWrapper { | ||
| public: |
There was a problem hiding this comment.
Suggested change
| public: | |
| private: |
| Mutex m_pMutex; | ||
|
|
||
| int m_pCountRead; | ||
| bool m_pWriterLocked; |
There was a problem hiding this comment.
'p' means "pointer". This variable is of a type "Boolean", so should be m_bWriterLocked.
|
|
||
| Mutex m_pMutex; | ||
|
|
||
| int m_pCountRead; |
There was a problem hiding this comment.
"p" mean pointer, while the variable is not a pointer.
Please review the whole class.
1 task
Comment on lines
+1023
to
+1099
| /* REFERENCE IMPLEMENTATION | ||
| class shared_mutex | ||
| { | ||
| Mutex mut_; | ||
| Condition gate1_; | ||
| Condition gate2_; | ||
| unsigned state_; | ||
|
|
||
| static const unsigned write_entered_ = 1U << (sizeof(unsigned)*CHAR_BIT - 1); | ||
| static const unsigned n_readers_ = ~write_entered_; | ||
|
|
||
| public: | ||
|
|
||
| shared_mutex() : state_(0) {} | ||
|
|
||
|
|
||
| // Exclusive ownership | ||
|
|
||
| void | ||
| lock() | ||
| { | ||
| UniqueLock lk(mut_); | ||
| std::cout << "LOCK WRITE " << std::endl; | ||
| while (state_ & write_entered_) | ||
| gate1_.wait(lk); | ||
| state_ |= write_entered_; | ||
| while (state_ & n_readers_) | ||
| gate2_.wait(lk); | ||
| std::cout << "LOCK WRITE DONE" << std::endl; | ||
|
|
||
| } | ||
|
|
||
| void | ||
| unlock() | ||
| { | ||
| { | ||
| ScopedLock _(mut_); | ||
| state_ = 0; | ||
| } | ||
| std::cout << "UNLOCK WRITE " << std::endl; | ||
| gate1_.notify_all(); | ||
| std::cout << "UNLOCK WRITE DONE" << std::endl; | ||
|
|
||
| } | ||
|
|
||
| // Shared ownership | ||
|
|
||
| void | ||
| lock_shared() | ||
| { | ||
| UniqueLock lk(mut_); | ||
| while ((state_ & write_entered_) || (state_ & n_readers_) == n_readers_) | ||
| gate1_.wait(lk); | ||
| unsigned num_readers = (state_ & n_readers_) + 1; | ||
| state_ &= ~n_readers_; | ||
| state_ |= num_readers; | ||
| } | ||
|
|
||
| void | ||
| unlock_shared() | ||
| { | ||
| ScopedLock _(mut_); | ||
| unsigned num_readers = (state_ & n_readers_) - 1; | ||
| state_ &= ~n_readers_; | ||
| state_ |= num_readers; | ||
| if (state_ & write_entered_) | ||
| { | ||
| if (num_readers == 0) | ||
| gate2_.notify_one(); | ||
| } | ||
| else | ||
| { | ||
| if (num_readers == n_readers_ - 1) | ||
| gate1_.notify_one(); | ||
| } | ||
| } | ||
| };*/ |
Check notice
Code scanning / CodeQL
Commented-out code
|
|
||
| if (u == m_pListener) | ||
| m_pListener = NULL; | ||
| //ScopedLock lslock(m_LSLock); |
Check notice
Code scanning / CodeQL
Commented-out code
This was referenced Aug 5, 2024
Closed
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.
No description provided.