RSDK-1959 — Fix macos webcams disconnections cause viam-server to freeze #5492
+97
−39
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
viambot
added
the
safe to test
viambot
added
safe to test
viambot
added
safe to test
hexbabe
commented
Dec 1, 2025
| c.buffer.frame = nil | ||
| // Make a private copy of the previously published frame so consumers can continue to read it, | ||
| // then return the Reader-managed buffer before we kick off the next read. This avoids holding | ||
| // on to driver memory while still serving the last frame. |
Member
Author
There was a problem hiding this comment.
Introducing prevRelease fixes the hang. All other changes on this PR are to supplement it, to ensure best practices, and fix vulnerabilities in the code I saw along the way of fixing the hang.
viambot
added
safe to test
hexbabe
commented
Dec 1, 2025
| } | ||
|
|
||
| // Must lock the mutex before using this function. | ||
| func (buffer *WebcamBuffer) stopBuffer() { |
Member
Author
There was a problem hiding this comment.
I hate how buffer is used to group together the actual buffer and the worker that fills it. I made a lot of changes to fix that naming and also deleted this helper function that is frankly a bit confusing.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Tests on linux/arm64 (rpi5b)
In fact, this PR fixed an unreported linux bug too (unplug/replug is not working on linux/arm64 on the main branch).
Tests on darwin/arm64 (viam issued macbook air laptop)