Improve cleanup reliability #5613
Merged
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
Some options, such as --show-touches or --stay-awake, modify Android
settings and must be restored upon exit.
If scrcpy terminates (e.g. due to an early error) in the middle of the
clean up configuration, the device may be left in an inconsistent state
(some settings might be changed but not restored).
This issue can be reproduced with high probability by forcing scrcpy to
fail:
scrcpy --show-touches --video-encoder=fail
To prevent this problem, ensure that the clean up thread is not
interrupted until the clean up process is started.
Refs #5601 <#5601>
PR #5613 <#5613>
|
My project is using Os.setsid method, it should do the same thing as To my knowledge, on most devices, using But some device still kills the process when unplugging USB cable, like the original issue reported. Shizuku is using daemon, and the behavior is same. |
Ah yes, I will do that instead. I didn't know |
rom1v
added a commit
that referenced
this pull request
Dec 9, 2024
Reimplement c59a3c3 using Os.setsid(). Refs #5613 comment <#5613 (comment)> Suggested-by: Simon Chan <[email protected]>
bartsaintgermain
pushed a commit
to bartsaintgermain/scrcpy
that referenced
this pull request
Apr 11, 2025
Some options, such as --show-touches or --stay-awake, modify Android
settings and must be restored upon exit.
If scrcpy terminates (e.g. due to an early error) in the middle of the
clean up configuration, the device may be left in an inconsistent state
(some settings might be changed but not restored).
This issue can be reproduced with high probability by forcing scrcpy to
fail:
scrcpy --show-touches --video-encoder=fail
To prevent this problem, ensure that the clean up thread is not
interrupted until the clean up process is started.
Refs Genymobile#5601 <Genymobile#5601>
PR Genymobile#5613 <Genymobile#5613>
bartsaintgermain
pushed a commit
to bartsaintgermain/scrcpy
that referenced
this pull request
Apr 11, 2025
If available, start the cleanup process in a new session to reduce the likelihood of it being terminated along with the scrcpy server process on some devices. The binaries setsid and nohup are often available, but it is not guaranteed. Refs Genymobile#5601 <Genymobile#5601> PR Genymobile#5613 <Genymobile#5613>
bartsaintgermain
pushed a commit
to bartsaintgermain/scrcpy
that referenced
this pull request
Apr 11, 2025
Reimplement c59a3c3 using Os.setsid(). Refs Genymobile#5613 comment <Genymobile#5613 (comment)> Suggested-by: Simon Chan <[email protected]>
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.
Currently, if scrcpy terminates before the cleanup process is started (race condition), e.g. due to an early error, the initial state is not restored. This can be easily reproduced by forcing scrcpy to fail:
In addition, starting the cleanup process with
setsidornohupreduces the likelihood of it being killed along with the scrcpy server process on some devices (but not all).Refs #5601.
Here is a binary to replace in scrcpy 3.0.2:
scrcpy-serverSHA-256: e925077940dbe82ab8375aca06bf471d88a7c775096b6747eac810f074481b9