Dynamically allocate adb/usb devices using a vector, to avoid a hardcoded limit #3035
+1,106
−115
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
|
I tested and managed to connect to the 17-20 devices with this patch, seems working from my side! |
Adapt vlc_vector [1], that I initially wrote while implementing the VLC playlist [2]. Change the implementation to use "statement expressions" [3], which are forbidden in VLC because "non-standard", but: - they are supported by gcc and clang; - they are already used in the scrcpy codebase; - they avoid implementation hacks (VLC_VECTOR_FAILFLAG_); - they allow a better API (sc_vector_index_of() may return the result without an output parameter). PR #3035 <#3035> [1]: https://code.videolan.org/videolan/vlc/-/blob/0857947abaed9c89810cd96353aaa1b7e6ba3b0d/include/vlc_vector.h [2]: https://blog.rom1v.com/2019/05/a-new-core-playlist-for-vlc-4 [3]: https://gcc.gnu.org/onlinedocs/gcc/Statement-Exprs.html
For simplicity, the parsing of `adb devices -l` output is performed in a single pass on the whole output. This output was limited to 4096 bytes. Since there are about 100 chars per device line, this limited the number of connected devices to ~40. Increase to 65536 bytes to avoid a limitation in practice. PR #3035 <#3035>
|
Thank you for your tests 👍 Merged. |
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.
The maximum number of adb devices (and usb devices for HID/OTG) was hardcoded to 16, which is too low.
The first commit (8d06944) adds a
sc_vectordata structure and API. It is adapted fromvlc_vectorthat I initially wrote while implementing the VLC playlist.It is then used for listing usb devices and adb devices to remove any hardcoded limitation (the vector grows dynamically as necessary).
There is still a limitation in the parsing of
adb devices -l, which is implemented for simplicity in a single pass on the whole output. The output was limited to 4096 bytes (which represents ~40 devices). I changed to 65536 bytes, it should be sufficient in practice (~650 devices listed byadb devicesshould never happen).This replaces #3029.
@DarkZeros I added you as co-author for the adb devices listing. Please test this PR and confirm that it works for your use case.