chore(watch): simplify watch data synchronization #9154
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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
8 Skipped Deployments
|
chris-olszewski
commented
Sep 16, 2024
| let changed_packages_guard = changed_packages.lock().await; | ||
| if !changed_packages_guard.borrow().is_empty() { | ||
| let changed_packages = changed_packages_guard.take(); | ||
| let some_changed_packages = { |
There was a problem hiding this comment.
We only acquire the guard in the block so we ensure we release the lock once we take the changed packages. This lets the event_fut make progress while self.execute_run is pending.
| (!changed_packages_guard.is_empty()) | ||
| .then(|| std::mem::take(changed_packages_guard.deref_mut())) | ||
| }; | ||
| if let Some(changed_packages) = some_changed_packages { | ||
| self.execute_run(changed_packages).await?; |
There was a problem hiding this comment.
changed_packages_guard is still held while run is being executed, this prevents any events from being handled.
NicholasLYang
approved these changes
Sep 17, 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.
Description
Basic view of the futures involved with running
watchevents_futtakes events from the package changes watcher and folds them into aChangedPackagesstruct. It then triggers a notify.run_futloops waiting for a notification and then performing a run.SIGINTsThis PR cleans up how packages changes are synchronized between futures:
RefCellasMutexalready implies mutually exclusive access the the underlying resourcerun_futholding onto the changed packages lock for the entirety of it's run. This allows us to switch fromtokio::sync::Mutextostd::sync::Mutex. Which is suggested by thetokio::sync::MutexdocsTesting Instructions
rustc+ 👀 . Quick gut check by runningturbo watchand triggering package changes