Fix Android device issues related to filesystem/IO #58586
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
|
Tagging subscribers to this area: @dotnet/area-system-io Issue Details
|
|
Tagging subscribers to 'arch-android': @steveisok, @akoeplinger Issue Details
|
- Use F_SETLK64 for fcntl to fix an issue where 32bit arm Android apps would get the wrong flag - Add numerical magic numbers for missing file systems to Interop.UnixFileSystemTypes so they are correctly recognized - Make ping test a bit more forgiving if the process returns a few milliseconds _before_ the timeout - Disable System.IO.Net5Compat.Tests.csproj on Helix for non-Windows platforms like intended, we were still building it since we pass `/p:ArchiveTests=true` on CI
akoeplinger
force-pushed
the
android-fixes
branch
from
f20634a to
db5cf28
Compare
am11
reviewed
Sep 2, 2021
Comment on lines
+1563
to
+1569
| #if defined(TARGET_ANDROID) && defined(HAVE_FLOCK64) | ||
| // On Android, fcntl is always implemented by fcntl64 but before https://github.com/aosp-mirror/platform_bionic/commit/09e77f35ab8d291bf88302bb9673aaa518c6bcb0 | ||
| // there was no remapping of F_SETLK to F_SETLK64 when _FILE_OFFSET_BITS=64 (which we set in eng/native/configurecompiler.cmake) so we need to always pass F_SETLK64 | ||
| int command = F_SETLK64; | ||
| #else | ||
| int command = F_SETLK; | ||
| #endif |
There was a problem hiding this comment.
Is there a case where generic condition won't work:
Suggested change
| #if defined(TARGET_ANDROID) && defined(HAVE_FLOCK64) | |
| // On Android, fcntl is always implemented by fcntl64 but before https://github.com/aosp-mirror/platform_bionic/commit/09e77f35ab8d291bf88302bb9673aaa518c6bcb0 | |
| // there was no remapping of F_SETLK to F_SETLK64 when _FILE_OFFSET_BITS=64 (which we set in eng/native/configurecompiler.cmake) so we need to always pass F_SETLK64 | |
| int command = F_SETLK64; | |
| #else | |
| int command = F_SETLK; | |
| #endif | |
| #ifdef F_SETLK64 | |
| int command = F_SETLK64; | |
| #else | |
| int command = F_SETLK; | |
| #endif |
There was a problem hiding this comment.
I wasn't sure and since I want the change to go back to release/6.0 I thought it's better to keep the existing code as is. We can try your version for 7.0.
am11
reviewed
Sep 2, 2021
src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs
Show resolved
Hide resolved
jozkee
reviewed
Sep 3, 2021
src/libraries/System.IO/tests/Net5CompatTests/System.IO.Net5Compat.Tests.csproj
Outdated
Show resolved
Hide resolved
adamsitnik
approved these changes
Sep 3, 2021
akoeplinger
added a commit
to mdh1418/runtime
that referenced
this pull request
Sep 9, 2021
- Use F_SETLK64 for fcntl to fix an issue where 32bit arm Android apps would get the wrong flag - Add numerical magic numbers for missing file systems to Interop.UnixFileSystemTypes so they are correctly recognized - Make ping test a bit more forgiving if the process returns a few milliseconds _before_ the timeout (cherry picked from commit 462ab6e)
steveisok
pushed a commit
that referenced
this pull request
Sep 13, 2021
…t and test fixes for Android (#58841) Manual backport of #57208, #58519, #58562, #58210, #57732, #58428, #58586, #58745, #57687 to release/6.0 Numerous test suites have been failing for iOS/tvOS/MacCatalyst consistently on CI without useful logs as to why. Moreover, some of these suites pass locally. This PR looks to reduce the failures on CI by skipping the problematic suites Skips test suites logged in #53624 ActiveIssues #58440 #58418 #58367 #58584 Co-authored-by: Mitchell Hwang <mitchell.hwang@microsoft.com> Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com> Co-authored-by: Jo Shields <directhex@apebox.org>
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
- Make sure System.IO.Net5Compat.Tests.csproj builds formoved to run System.IO.Tests .NET 5 compat tests on every OS #58611$(NetCoreAppCurrent)since it is now supposed to be running on all platforms.