Add clock_gettime shim#975

Merged

bors merged 13 commits into

rust-lang:masterfrom

pvdrz:clock-shim

Oct 15, 2019

pvdrz commented Oct 2, 2019 •

edited

Loading

Contributor

I think there is no way to do proper testing of this other than checking that miri does not crash when calling clock_gettime.

pvdrz force-pushed the clock-shim branch 2 times, most recently from 2ffc663 to 5259ebe Compare

October 3, 2019 15:45

bjorn3 commented Oct 3, 2019

Member

Also I'm not sure what to do if the current time is lower than UNIX_EPOCH, which might happen if someone decides to mess with the clock before running miri.

You could calculate the opposite difference (UNIX_EPOCH-now) and then write a negative number, as clock_gettime returns a signed int.

pvdrz commented Oct 3, 2019

Contributor Author

Also I'm not sure what to do if the current time is lower than UNIX_EPOCH, which might happen if someone decides to mess with the clock before running miri.

You could calculate the opposite difference (UNIX_EPOCH-now) and then write a negative number, as clock_gettime returns a signed int.

That sounds like a good idea. I'll try to do that

pvdrz commented Oct 3, 2019 •

edited

Loading

Contributor Author

Also CI is failing because the size of long and time_t is platform dependent. How should I handle that?

Edit: Solved by recovering the types from the target's libc

bors commented Oct 8, 2019

Contributor

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

pvdrz force-pushed the clock-shim branch 2 times, most recently from bbef7a0 to e00db1b Compare

October 8, 2019 20:43

pvdrz mentioned this pull request

Add getcwd shim #958

Merged

RalfJung reviewed

View reviewed changes

src/shims/env.rs

RalfJung reviewed

View reviewed changes

src/shims/foreign_items.rs Outdated

pvdrz force-pushed the clock-shim branch from b1fca61 to 07abfb3 Compare

October 10, 2019 20:19

RalfJung reviewed

View reviewed changes

src/helpers.rs

RalfJung reviewed

View reviewed changes

src/helpers.rs Outdated

RalfJung reviewed

View reviewed changes

src/shims/time.rs

RalfJung reviewed

View reviewed changes

tests/run-pass/clock.rs

pvdrz force-pushed the clock-shim branch from de342e9 to 9813851 Compare

October 11, 2019 05:59

bors commented Oct 11, 2019

Contributor

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

pvdrz added 10 commits

October 11, 2019 11:36


          Add clock_gettime shim

aa3e970


          Reduce size of nanoseconds

fcf04b5


          Return negative times when the current time is before the unix epoch

adfa2eb


          Get size of integers using libc

7a6df85


          Add gettimeofday shim for macOS

b7863f2


          Add helper function to write structs

9f24c12


          Throw error instead of panicking for unfittable bits

b8ee90d


          Move time related functions to its own module

8f4d185


          Fix sign when number of seconds is zero

87b210d


          Split write_c_ints into less specific helper functions

2cbf4af

pvdrz force-pushed the clock-shim branch from 9813851 to 2cbf4af Compare

October 11, 2019 16:41

RalfJung reviewed

View reviewed changes

src/helpers.rs Outdated

RalfJung reviewed

View reviewed changes

src/shims/time.rs Outdated

RalfJung reviewed

View reviewed changes

src/shims/time.rs Outdated


          Group libc helper functions

508df22

RalfJung reviewed

View reviewed changes

src/helpers.rs Outdated

RalfJung reviewed

View reviewed changes

src/helpers.rs Outdated


          Error on negative times

50618b5

RalfJung reviewed

View reviewed changes

src/shims/time.rs Outdated

RalfJung reviewed

View reviewed changes

src/shims/time.rs Outdated

RalfJung reviewed

View reviewed changes

src/shims/time.rs Outdated

RalfJung reviewed

View reviewed changes

tests/run-pass/clock.rs


          Use places instead of ptrs to write packed immtys

f9c7688

pvdrz force-pushed the clock-shim branch from 2724b6c to f9c7688 Compare

October 14, 2019 21:00

RalfJung commented Oct 14, 2019

Member

Yeah this looks good, thanks a lot. :)

bors commented Oct 14, 2019

Contributor

📌 Commit f9c7688 has been approved by RalfJung

bors added a commit that referenced this pull request


          Auto merge of #975 - christianpoveda:clock-shim, r=RalfJung

5d66fb4

Add clock_gettime shim

r? @oli-obk

I think there is no way to do proper testing of this other than checking that miri does not crash when calling `clock_gettime`.

bors commented Oct 14, 2019

Contributor

⌛ Testing commit f9c7688 with merge 5d66fb4...

pvdrz force-pushed the clock-shim branch from 877842c to f9c7688 Compare

October 14, 2019 21:40

RalfJung commented Oct 15, 2019

Member

That push aborted landing the PR I think.

@bors r+ retry

bors commented Oct 15, 2019

Contributor

📌 Commit f9c7688 has been approved by RalfJung

bors commented Oct 15, 2019

Contributor

⌛ Testing commit f9c7688 with merge d902a11...

bors added a commit that referenced this pull request


          Auto merge of #975 - christianpoveda:clock-shim, r=RalfJung

d902a11

Add clock_gettime shim

r? @oli-obk

I think there is no way to do proper testing of this other than checking that miri does not crash when calling `clock_gettime`.

RalfJung mentioned this pull request

Add function to error with enabled isolation #996

Merged

bors commented Oct 15, 2019

Contributor

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing d902a11 to master...

bors merged commit f9c7688 into rust-lang:master

bors mentioned this pull request

Change the last OS error location to a place #991

Merged

pvdrz commented Oct 15, 2019

Contributor Author

Thank you, I did a commit to the wrong branch by accident D:

RalfJung mentioned this pull request

Can't call foreign function: clock_gettime #641

Closed

jonhoo mentioned this pull request

Fix ci jonhoo/haphazard#15

Merged

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

Labels

None yet