[Android] Workaround for invalid return value from clock_nanosleep by simonrozsival · Pull Request #64679 · dotnet/runtime

simonrozsival · 2022-02-02T13:32:28Z

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 since Android 6 and newer but it causes problems to customers who are unable to update Android on their devices.

Fixesdotnet/android#6600

…oid libc

ghost · 2022-02-02T13:32:35Z

Tagging subscribers to 'arch-android': @steveisok, @akoeplinger
See info in area-owners.md if you want to be subscribed.

Issue Details

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 since Android 6 and newer but it causes problems to customers who are unable to update Android on their devices.

Fixes dotnet/android#6600

Author:	simonrozsival
Assignees:	-
Labels:	`os-android`
Milestone:	-

simonrozsival · 2022-02-02T15:27:34Z

/azp run runtime-extra-platforms

azure-pipelines · 2022-02-02T15:27:59Z

Azure Pipelines successfully started running 1 pipeline(s).

lambdageek

It's ok, but maybe we can have less copy/pasted code if we added a utility function to eglib

…sival/fix-old-android-clock-nanosleep-inconsistency

lambdageek

Good start. Needs couple of changes

@lambdageek

Thanks for the suggestions, @lambdageek!

lambdageek

LGTM

Thanks!

lambdageek

Windows builds are unhappy. But we don't need clock_nanosleep there, anyway.

simonrozsival · 2022-02-08T08:59:28Z

/azp run runtime-extra-platforms

azure-pipelines · 2022-02-08T08:59:48Z

Azure Pipelines successfully started running 1 pipeline(s).

simonrozsival · 2022-02-09T10:07:50Z

There's a failing WASM test but it seems completely unrelated to this PR to me. I believe this PR could be merged.

lambdageek · 2022-02-09T17:40:28Z

Yea the browser wasm windows System.Threading.Channels.Tests failures are #65012

lambdageek · 2022-02-09T17:42:02Z

@steveisok should we backport to net6?

akoeplinger · 2022-02-15T12:26:13Z

Yes.

akoeplinger · 2022-02-15T12:31:56Z

/backport to release/6.0

github-actions · 2022-02-15T12:32:10Z

Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/1846939447

github-actions · 2022-02-15T12:33:40Z

@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 forincorrect implementation of clock_nanosleepin 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 128

Please backport manually!

akoeplinger · 2022-02-15T12:34:06Z

@simonrozsival can you please look into doing a manual PR for 6.0? thanks

simonrozsival · 2022-02-15T12:39:14Z

@akoeplinger Sure! I'll create one.

…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)). Fixesdotnet/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 is a follow-up of #64679 I realized that one invocation of `clock_nanosleep` wasn't replaced with `g_clock_nanosleep`.

…21433) Fixesdotnet/android#6600 Backported from dotnet/runtime#64679 and dotnet/runtime#65373

…ono#21433) Fixesdotnet/android#6600 Backported from dotnet/runtime#64679 and dotnet/runtime#65373 (cherry picked from commit 36daf03)

…osleep (#21435) * [Android] Workaround for invalid return value from clock_nanosleep (#21433) Fixesdotnet/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>

…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)). Fixesdotnet/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

simonrozsival added 2 commits January 28, 2022 20:32

Account for incorrect implementation of clock_nanosleep in older Andr…
29c71c3
…oid libc

Shorten comments
69ce197

simonrozsival added the os-android label Feb 2, 2022

simonrozsival requested a review from steveisok February 2, 2022 13:32

simonrozsival requested review from SamMonoRT, imhameed, lambdageek and vargaz as code owners February 2, 2022 13:32

ghost added the area-VM-meta-mono label Feb 2, 2022

ghost assigned simonrozsival Feb 2, 2022

lambdageek reviewed Feb 2, 2022
View reviewed changes

Comment threadsrc/mono/mono/eglib/gdate-unix.c Outdated

simonrozsival added 3 commits February 7, 2022 13:18

Add g_clock_nanosleep function
49d42c3

Merge branch 'main' of github.com:simonrozsival/runtime into simonroz…
c48c4da
…sival/fix-old-android-clock-nanosleep-inconsistency

Add remap definition
bcb469a

lambdageek previously requested changes Feb 7, 2022
View reviewed changes

ghost added the needs-author-action An issue or pull request that requires more info or actions from the author. label Feb 7, 2022

Fix build
63e4323

ghost removed the needs-author-action An issue or pull request that requires more info or actions from the author. label Feb 7, 2022

Make sure the extra check runs only on Android
4995631

lambdageek approved these changes Feb 7, 2022
View reviewed changes

lambdageek reviewed Feb 7, 2022
View reviewed changes

Comment threadsrc/mono/mono/eglib/glib.h
Comment threadsrc/mono/mono/eglib/CMakeLists.txt Outdated

simonrozsival added 2 commits February 7, 2022 21:04

Make Windows builds happy
aed9f56

Try making wasm builds happy
d420457

lambdageek merged commit ac82c68 into dotnet:mainFeb 9, 2022

This was referenced Feb 15, 2022
[release/6.0] [Android] Workaround for invalid return value from clock_nanosleep #65372
Merged
[Android] Fix leftover direct invocation of clock_nanosleep #65373
Merged

akoeplinger pushed a commit that referenced this pull request Feb 15, 2022
[Android] Fix leftover direct invocation of clock_nanosleep (#65373)
f428813
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
Backportdotnet/runtime#64679
b77b32e

simonrozsival mentioned this pull request Feb 16, 2022
[Android] Workaround for invalid return value from clock_nanosleep mono/mono#21433
Merged

akoeplinger pushed a commit to mono/mono that referenced this pull request Feb 17, 2022
[Android] Workaround for invalid return value from clock_nanosleep (#…
36daf03
…21433) Fixesdotnet/android#6600 Backported from dotnet/runtime#64679 and dotnet/runtime#65373

akoeplinger mentioned this pull request Feb 17, 2022
[2020-02][Android] Workaround for invalid return value from clock_nanosleep mono/mono#21435
Merged

ghost locked as resolved and limited conversation to collaborators Mar 17, 2022

Uh oh!

Conversation

simonrozsival commented Feb 2, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost commented Feb 2, 2022

Uh oh!

simonrozsival commented Feb 2, 2022

Uh oh!

azure-pipelinesBot commented Feb 2, 2022

Uh oh!

lambdageek left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lambdageek left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lambdageek left a comment

Choose a reason for hiding this comment

Uh oh!

lambdageek left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

simonrozsival commented Feb 8, 2022

Uh oh!

azure-pipelinesBot commented Feb 8, 2022

Uh oh!

simonrozsival commented Feb 9, 2022

Uh oh!

lambdageek commented Feb 9, 2022

Uh oh!

lambdageek commented Feb 9, 2022

Uh oh!

akoeplinger commented Feb 15, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

akoeplinger commented Feb 15, 2022

Uh oh!

github-actionsBot commented Feb 15, 2022

Uh oh!

github-actionsBot commented Feb 15, 2022

Uh oh!

akoeplinger commented Feb 15, 2022

Uh oh!

simonrozsival commented Feb 15, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

simonrozsival commented Feb 2, 2022•
edited
Loading

akoeplinger commented Feb 15, 2022•
edited
Loading