[Android] Workaround for invalid return value from clock_nanosleep #64679
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
simonrozsival
requested review from
imhameed,
lambdageek,
SamMonoRT and
vargaz
as code owners
|
Tagging subscribers to 'arch-android': @steveisok, @akoeplinger Issue DetailsThere used to be a bug in Android libc implementation of Fixes dotnet/android#6600
|
|
/azp run runtime-extra-platforms |
|
Azure Pipelines successfully started running 1 pipeline(s). |
lambdageek
reviewed
Feb 2, 2022
…sival/fix-old-android-clock-nanosleep-inconsistency
lambdageek
previously requested changes
Feb 7, 2022
ghost
added
the
needs-author-action
ghost
removed
the
needs-author-action
simonrozsival
dismissed
lambdageek’s stale review
Thanks for the suggestions, @lambdageek!
lambdageek
reviewed
Feb 7, 2022
|
/azp run runtime-extra-platforms |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
There's a failing WASM test but it seems completely unrelated to this PR to me. I believe this PR could be merged. |
|
Yea the browser wasm windows System.Threading.Channels.Tests failures are #65012 |
|
@steveisok should we backport to net6? |
|
Yes. |
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/1846939447 |
|
@akoeplinger backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Account for incorrect implementation of clock_nanosleep in older Android libc
Applying: Shorten comments
Applying: Add g_clock_nanosleep function
error: sha1 information is lacking or useless (src/mono/mono/mini/mini-posix.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 Add g_clock_nanosleep function
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@simonrozsival can you please look into doing a manual PR for 6.0? thanks |
|
@akoeplinger Sure! I'll create one. |
simonrozsival
added a commit
to simonrozsival/runtime
that referenced
this pull request
Feb 15, 2022
…otnet#64679) There used to be a bug in Android libc implementation of `clock_nanosleep`. The return value should be `errno` on errors but instead in it returns `-1` and sets `errno`. The libc (Bionic) bug [has been fixed](https://android-review.googlesource.com/c/platform/bionic/+/110652/) since Android 6 and newer but it causes problems to [customers who are unable to update Android on their devices](dotnet/android#6600 (comment)). Fixes dotnet/android#6600 * Account for incorrect implementation of clock_nanosleep in older Android libc * Shorten comments * Add g_clock_nanosleep function * Add remap definition * Fix build * Make sure the extra check runs only on Android * Make Windows builds happy * Try making wasm builds happy
This was referenced Feb 15, 2022
akoeplinger
pushed a commit
that referenced
this pull request
Feb 15, 2022
This is a follow-up of #64679 I realized that one invocation of `clock_nanosleep` wasn't replaced with `g_clock_nanosleep`.
simonrozsival
added a commit
to simonrozsival/mono
that referenced
this pull request
Feb 16, 2022
akoeplinger
pushed a commit
to mono/mono
that referenced
this pull request
Feb 17, 2022
akoeplinger
pushed a commit
to akoeplinger/mono
that referenced
this pull request
Feb 17, 2022
…ono#21433) Fixes dotnet/android#6600 Backported from dotnet/runtime#64679 and dotnet/runtime#65373 (cherry picked from commit 36daf03)
akoeplinger
added a commit
to mono/mono
that referenced
this pull request
Feb 17, 2022
…osleep (#21435) * [Android] Workaround for invalid return value from clock_nanosleep (#21433) Fixes dotnet/android#6600 Backported from dotnet/runtime#64679 and dotnet/runtime#65373 (cherry picked from commit 36daf03) * Fix Windows build Co-authored-by: Simon Rozsival <simon@rozsival.com>
lewing
pushed a commit
that referenced
this pull request
Mar 10, 2022
…k_nanosleep (#65372) * [Android] Workaround for invalid return value from clock_nanosleep (#64679) There used to be a bug in Android libc implementation of `clock_nanosleep`. The return value should be `errno` on errors but instead in it returns `-1` and sets `errno`. The libc (Bionic) bug [has been fixed](https://android-review.googlesource.com/c/platform/bionic/+/110652/) since Android 6 and newer but it causes problems to [customers who are unable to update Android on their devices](dotnet/android#6600 (comment)). Fixes dotnet/android#6600 * Account for incorrect implementation of clock_nanosleep in older Android libc * Shorten comments * Add g_clock_nanosleep function * Add remap definition * Fix build * Make sure the extra check runs only on Android * Make Windows builds happy * Try making wasm builds happy * Fix leftover direct call to clock_nanosleep
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.
There used to be a bug in Android libc implementation of
clock_nanosleep. The return value should beerrnoon errors but instead in it returns-1and setserrno. The libc (Bionic) bug has been fixed since Android 6 and newer but it causes problems to customers who are unable to update Android on their devices.Fixes dotnet/android#6600