Specialize sleep_until implementation #118480

dvdsk · 2023-11-30T14:36:29Z

Draft (I need the CI tests, which will probably fail)
related tracking issue: #113752

Replaces the generic catch all implementation with target_os specific ones for: linux/netbsd/freebsd/android/solaris/illumos, wasi, macos/ios/tvos/watchos and windows.

Points of attention:

Adds extern "C" calls to mach_wait_until and mach_timebase_info for macos etc. We could also import them from the mach2 crate, but then we depend on mach2 and we need to modify mach2 to work as an std dep (adding a feature rustc-dep-of-std).
The implementations need access to the target_os specific details of the Instant type. For that I added an into_inner and made some fields public. Is there a neater way?
All untested, I only have access to an linux install. I hope the CI catches any issues.

rustbot · 2023-11-30T14:36:38Z

r? @cuviper

(rustbot has picked a reviewer for you, use r? to override)

dvdsk · 2023-11-30T16:02:57Z

Not ready for review, however I need CI to run.

cuviper · 2023-11-30T19:29:46Z

We don't have a configured way to try full CI, but you can copy specific jobs from auto to pr here:

rust/src/ci/github-actions/ci.yml

Line 319 in b10cfcd

jobs:

Then ./x.py run src/tools/expand-yaml-anchors to update the real config, and push that as a temporary commit.

joboet

I tested this on my local macOS machine. While the implementation works, the test currently fails because its success margin is too small.

library/std/tests/thread.rs

library/std/src/thread/mod.rs

bors · 2023-12-07T08:28:36Z

☔ The latest upstream changes (presumably #116565) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2024-01-13T16:52:58Z

☔ The latest upstream changes (presumably #117285) made this pull request unmergeable. Please resolve the merge conflicts.

cuviper · 2024-01-25T19:12:49Z

I'm clearing this from my queue while it's in draft, but you can use ready when you are.

@rustbot author

Dylan-DPC · 2024-02-18T06:52:52Z

@dvdsk any updates on this pr? thanks

dvdsk · 2024-08-02T14:49:33Z

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:
$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust.git master
$ git push --force-with-lease
The following commits are merge commits:
* [fa89b9b](https://github.com/rust-lang/rust/commit/fa89b9b354b832315fe8662090d4a2ecbe2136cd)

* [30870b8](https://github.com/rust-lang/rust/commit/30870b8aaf04b9a721aee8d2eca14c19a6f28493)

* [030b112](https://github.com/rust-lang/rust/commit/030b112252926f66f1c0d2787fb2093e737a2d08)

* [dac9893](https://github.com/rust-lang/rust/commit/dac9893c9ba5bbfa70e25dfe293f9625b86df698)

mostly some misery I had with the submodules causing the merges to not become fast forwards. The commit history is a bit ugly anyway. Ill see if I can clean that up later, maybe just squash it all done to one or two commits.

joboet · 2024-08-02T15:21:36Z

library/std/src/sys/pal/unix/thread.rs

+            let info = info.assume_init();
+            let ticks = nanos * (info.denom as u64) / (info.numer as u64);
+
+            let ret = mach_wait_until(ticks);


mach_wait_until can be interrupted by signals just like clock_nanosleep, so this should check if ret is KERN_ABORTED (14) and retry in that case.

thanks for finding that out 👍 And nice to read (the stack overflow link) I am not the only one that struggled to find any details on mach_wait_until

It is not working and I can not figure out why. Since I am not familiar with developing on windows I might not be the best person to work on this. The work removed in this commit might be a useful jumping off point for anyone else however.

more unix platforms target_vendor's done by: Co-authored-by: Jonas Böttiger <jonasboettiger@icloud.com>

dvdsk · 2024-08-05T13:16:19Z

@rustbot ready

bors · 2024-08-31T11:25:16Z

☔ The latest upstream changes (presumably #129809) made this pull request unmergeable. Please resolve the merge conflicts.

rustbot assigned cuviper Nov 30, 2023

dvdsk marked this pull request as ready for review November 30, 2023 16:03

joboet reviewed Dec 4, 2023

View reviewed changes

library/std/tests/thread.rs Outdated Show resolved Hide resolved

library/std/src/thread/mod.rs Show resolved Hide resolved

dvdsk force-pushed the sleep_until_os_specific_impl branch 2 times, most recently from 7ace020 to 1e36e08 Compare December 24, 2023 14:44

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Dec 24, 2023

This comment has been minimized.

Sign in to view

dvdsk force-pushed the sleep_until_os_specific_impl branch from 5470a7c to a0f50b6 Compare December 24, 2023 16:44

dvdsk marked this pull request as draft December 24, 2023 16:47

This comment has been minimized.

Sign in to view

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 25, 2024

joboet reviewed Aug 2, 2024

View reviewed changes

dvdsk added 3 commits August 3, 2024 12:50

adds specialized impl of sleep_until for unix and wasi

e8a12c5

adds specialized impl for sleep_until for macos/ios/watchos/tvos

24b8263

adds specialized impl for sleep_until for windows

9db39b8

dvdsk force-pushed the sleep_until_os_specific_impl branch from d59d09d to bf0ebb9 Compare August 3, 2024 11:31

rustbot removed the has-merge-commits PR has merge commits, merge with caution. label Aug 3, 2024

dvdsk force-pushed the sleep_until_os_specific_impl branch from bf0ebb9 to 61439b2 Compare August 3, 2024 11:35

This comment has been minimized.

Sign in to view

dvdsk and others added 7 commits August 3, 2024 13:53

(lib/sleep_until) adds test & update docs & fix mac support

5c4d0ff

removes the specialization for windows OS

c13a732

It is not working and I can not figure out why. Since I am not familiar with developing on windows I might not be the best person to work on this. The work removed in this commit might be a useful jumping off point for anyone else however.

add visionos to sleep_until + check mach_wait_until result

0f77174

fix missing non specialized windows sleep fn

716429d

(lib/sleep_until) use target_vendor apple + fix windows removeal + add

3b06a4a

more unix platforms target_vendor's done by: Co-authored-by: Jonas Böttiger <jonasboettiger@icloud.com>

(lib/sleep_until) allow unused code for Instant::into_inner

36c631a

(lib/sleep_until) fmt + fix tiny rebase mistake

bbb93cb

dvdsk force-pushed the sleep_until_os_specific_impl branch from 61439b2 to bbb93cb Compare August 3, 2024 11:56

This comment has been minimized.

Sign in to view

(lib/sleep_until) mac, check for aborted and comment on docs

4d4a72a

This comment has been minimized.

Sign in to view

(lib/sleep_util) fix missing import

00f5d5b

dvdsk force-pushed the sleep_until_os_specific_impl branch from a88ec6d to 00f5d5b Compare August 5, 2024 13:15

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 5, 2024

jieyouxu added the F-sleep_until `#![feature(sleep_until)]` label Aug 8, 2024

(lib/sleep_until) add vxworks (os) clock_nanosleep impl

9de080e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Specialize sleep_until implementation #118480

Specialize sleep_until implementation #118480

dvdsk commented Nov 30, 2023 •

edited

Loading

rustbot commented Nov 30, 2023

dvdsk commented Nov 30, 2023

cuviper commented Nov 30, 2023

joboet left a comment

bors commented Dec 7, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented Jan 13, 2024

cuviper commented Jan 25, 2024

Dylan-DPC commented Feb 18, 2024

dvdsk commented Aug 2, 2024 •

edited

Loading

joboet Aug 2, 2024

dvdsk Aug 3, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

dvdsk commented Aug 5, 2024

bors commented Aug 31, 2024

Specialize sleep_until implementation #118480

Are you sure you want to change the base?

Specialize sleep_until implementation #118480

Conversation

dvdsk commented Nov 30, 2023 • edited Loading

rustbot commented Nov 30, 2023

dvdsk commented Nov 30, 2023

cuviper commented Nov 30, 2023

joboet left a comment

Choose a reason for hiding this comment

bors commented Dec 7, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented Jan 13, 2024

cuviper commented Jan 25, 2024

Dylan-DPC commented Feb 18, 2024

dvdsk commented Aug 2, 2024 • edited Loading

joboet Aug 2, 2024

Choose a reason for hiding this comment

dvdsk Aug 3, 2024

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

dvdsk commented Aug 5, 2024

bors commented Aug 31, 2024

dvdsk commented Nov 30, 2023 •

edited

Loading

dvdsk commented Aug 2, 2024 •

edited

Loading