New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

std.posix: Rewriting enums to seperate clock IDs for clock_gettime() and timerfd_create() - Follow-up #22627

Merged

alexrp merged 8 commits into ziglang:master from chrboesch:pr21347

Feb 1, 2025

Contributor

chrboesch commented Jan 27, 2025

Follow-up PR of #21347, as it was accidentally deleted.
Incorporated the latest suggestions from @alexrp to better distinguish CLOCK for clock_gettime() and TIMERFD_CLOCK for timerfd_create().

fixes #20334


          Rewriting enums to seperate clock IDs for clock_gettime() and timerfd…

4a769ac

…_create() - Follow-up

alexrp reviewed

View reviewed changes

lib/std/c/freebsd.zig Outdated Show resolved Hide resolved

alexrp reviewed

View reviewed changes

lib/std/os/linux.zig Outdated Show resolved Hide resolved

alexrp reviewed

View reviewed changes

lib/std/os/linux.zig Outdated Show resolved Hide resolved

alexrp reviewed

View reviewed changes

lib/std/os/linux/test.zig Outdated Show resolved Hide resolved

alexrp reviewed

View reviewed changes

lib/std/posix.zig Outdated Show resolved Hide resolved

alexrp reviewed

View reviewed changes

lib/std/posix.zig Outdated Show resolved Hide resolved

alexrp reviewed

View reviewed changes

lib/std/posix.zig Outdated Show resolved Hide resolved


          Fixed changes from clockid_t to timerfd_clockid_t

c685733

alexrp reviewed

View reviewed changes

lib/std/posix.zig Outdated Show resolved Hide resolved


          Changed clk_id back to clock_id

d5c65be

Member

alexrp commented Jan 27, 2025

Looks ok to me now. Let's see what CI says.


          Merge branch 'master' into pr21347

0d22f68

alexrp reviewed

View reviewed changes

lib/std/c/freebsd.zig Outdated Show resolved Hide resolved

alexrp reviewed

View reviewed changes

lib/std/posix.zig Outdated Show resolved Hide resolved

chrboesch added 3 commits

January 29, 2025 11:19


          Changed error message for better understanding

c039135


          Merge branch 'master' into pr21347

08c4dbb


          Removed unnecessary variable

36e704c

alexrp approved these changes

View reviewed changes

Member

alexrp left a comment

Thanks; LGTM.

A cleanup opportunity here is to remove the CLOCK/TIMERFD_CLOCK aliases since I'm not convinced they add any value over just using the clockid_t/timerfd_clockid_t enums directly. But since CLOCK was already here, such a change can be a future PR.

alexrp enabled auto-merge (squash)

January 29, 2025 10:27

Contributor Author

chrboesch commented Jan 29, 2025

..such a change can be a future PR.

agree

Contributor Author

chrboesch commented Jan 30, 2025

Looks like aarch64-windows ci doesn't work?

Member

alexrp commented Jan 30, 2025

It's just catching up. It's by far our slowest CI machine and it's been very busy over the past few days due to merging a lot of PRs.

Contributor Author

chrboesch commented Jan 30, 2025

Didn't work, no runner were available within 1 day.


          Merge branch 'master' into pr21347

281c1d4

Trevor-Strong mentioned this pull request

std.os.linux.clock_getres still uses i32 for the clock id instead of clockid_t #22697

Open

alexrp merged commit 58c00a8 into ziglang:master

10 checks passed

chrboesch deleted the pr21347 branch

February 1, 2025 12:33

mrjbq7 mentioned this pull request

Fix timerfd_clockid_t on linux and freebsd #22725

Merged

trilowy added a commit to trilowy/http.zig that referenced this pull request


          fix: zig master 0.14.0-dev.3026+c225b780e

6d85319

ziglang/zig#22627

trilowy mentioned this pull request

fix: zig master 0.14.0-dev.3026+c225b780e karlseguin/http.zig#96

Merged

karlseguin pushed a commit to karlseguin/http.zig that referenced this pull request


          fix: zig master 0.14.0-dev.3026+c225b780e (#96)

a691d73

ziglang/zig#22627

huaxk mentioned this pull request

update http.zig to fix zig master 0.14.0-dev.3026+c225b780e cztomsik/tokamak#12

Merged

leroycep mentioned this pull request

update to zig 0.14.0-dev.2952+8fa47bb90 mitchellh/libxev#139

Open

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet