Add timed lock support to RWLock #5866
Merged
+48
−6
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
matyhtf
requested changes
Sep 28, 2025
include/swoole_lock.h
Outdated
| int unlock() override; | ||
| int trylock_rd() override; | ||
| int trylock() override; | ||
| int lock_wait(int timeout_msec); |
There was a problem hiding this comment.
It should be a member method of RWLock not SpinLock
| public function locakwait(float $timeout = 1.0): bool {} | ||
| public function trylock(): bool {} | ||
| public function lock_read(): bool {} | ||
| public function lock_read(?float $timeout = null): bool {} |
There was a problem hiding this comment.
Do not modify lock_rd() method, but modify lock_wait(), add an int type parameter, and specify whether the lock type is wrlock or rdlock.
|
updated as suggestions with additional stub definition typo fixed |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #5866 +/- ##
==========================================
+ Coverage 86.11% 86.13% +0.01%
==========================================
Files 109 109
Lines 16820 16836 +16
Branches 2975 2977 +2
==========================================
+ Hits 14485 14502 +17
+ Misses 2335 2334 -1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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 PR introduces timeout-based locking support for the
RWLocktype inSwoole\\Lock, aligning its behavior withMutexbased.Changes introduced:
lock_read()→lock_read(?float $timeout = null): Enables acquiring a read lock with an optional timeout.lockwait(float $timeout): Extended to supportRWLockin addition toMutex.These PHP-level API changes introduce new semantics around lock acquisition timing and may warrant further discussion regarding coroutine compatibility and expected behavior.