Add Redox support for most of the modules #1098

AdminXVII · 2019-07-12T20:31:45Z

Some things are not implemented yet in redox, so a lot of annotations were added to remove functions when compiling for redox. Those functions will hopefully be added in time, but for now it's better to have partial support than none.

Blocked by rust-lang/libc#1438

asomers · 2019-07-12T20:36:13Z

Interesting! But I have two big questions:

What's the best way to get Redox running in a VM? The last time I tried I couldn't get it to work.
How would you test on Redox in CI?

AdminXVII · 2019-07-12T20:42:20Z

There is redoxer that does exactly this. You basically pull the redoxos/redoxer docker image and then run redoxer test

AdminXVII · 2019-07-12T20:58:34Z

https://gitlab.redox-os.org/redox-os/redoxfs/blob/master/.gitlab-ci.yml is an example

AdminXVII · 2019-07-27T15:15:26Z

The libc request was merged.

Cargo.toml

AdminXVII · 2019-09-16T23:40:30Z

Btw, should I include the tests for redox in this PR or should I make another one specifically for it?

asomers · 2019-09-16T23:45:28Z

Best if you can add them to this PR.

AdminXVII · 2019-09-17T15:34:20Z

@asomers the CI succeeded and I only added a new test. Is the problem resolved?

asomers · 2019-09-17T15:52:31Z

Amazing! You fixed it! ;). I guess Travis undid whatever they did on September 6. I see a lot of warnings in the Redox test build, though. Could you please silence all of the warnings?

AdminXVII · 2019-09-17T15:57:26Z

I was using the warnings to remember what needs to be included. I'd have silenced them when you would have been ready to merge. Is that ok with you?

asomers · 2019-09-17T16:15:34Z

You mean you want to silence them after I've reviewed the rest of the PR? That's ok.

AdminXVII · 2019-09-17T17:18:26Z

There is currently ongoing work to improve what redox can do, so as this goes I remove cfgs to add more things for Redox. I used the comment to see what was needed to add. That said I think it's better if I remove and simply grep, so discard my previous comment.

AdminXVII · 2020-05-06T17:06:19Z

1- Qemu is only necessary to run it. To compile, you'd simply do gmake all.
2- Not that I'm aware of.

asomers · 2020-05-07T02:30:11Z

src/fcntl.rs

    let fd = path.with_nix_path(|cstr| {
-        let modebits = c_uint::from(mode.bits());
-        unsafe { libc::open(cstr.as_ptr(), oflag.bits(), modebits) }
+        unsafe { libc::open(cstr.as_ptr(), oflag.bits(), mode.bits() as c_uint) }


Why did you make this change? Using from is usually preferable to as.

It's because mode_t is a signed int on redox, so in terms of integer, because it can be lossy, the From<c_uint> trait is not implemented for c_int but as c_uint works fine.

asomers · 2020-05-07T02:30:26Z

src/fcntl.rs

    let fd = path.with_nix_path(|cstr| {
-        let modebits = c_uint::from(mode.bits());
-        unsafe { libc::openat(dirfd, cstr.as_ptr(), oflag.bits(), modebits) }
+        unsafe { libc::openat(dirfd, cstr.as_ptr(), oflag.bits(), mode.bits() as c_uint) }


Ditto from/as.

test/sys/test_signal.rs

src/dir.rs

AdminXVII · 2020-05-11T16:20:36Z

The as cast is needed because mode_t is signed on redox while unsigned on open. From<c_uint> is not implemented for c_int, but it's not a problem since this will leave the bits in place, which is the expected behaviour.

Some things are not implemented yet in redox, so a lot of annotations were added to remove functions when compiling for redox. Those functions will hopefully be added in time, but for now it's better to have partial support than none. Blocked by rust-lang/libc#1438

TODO: Fix them in Relibc

FIFOs are not supported (yet?) by RedoxFS, so disable it

- Make sure all tests pass the CI - Redox does not (yet) have passwd functions, so remove it

AdminXVII · 2020-05-18T03:20:21Z

Rebased

asomers · 2020-05-20T02:26:47Z

Ok, could you please do one last thing? Just add Redox to the list of supported platforms in the README.md. Put it in the "Tier 3" section.

AdminXVII · 2020-05-20T02:48:48Z

Sure it's done!

asomers

Let's do it!

bors r+

AdminXVII · 2020-05-20T03:09:38Z

Yes! Thanks a lot for your time, it's greatly appreciated!

bors · 2020-05-20T03:40:12Z

Build succeeded:

This test cannot be compiled under Redox. PR nix-rust#1098 attempted to disable it for Redox, but actually disabled it everywhere. AFAICT, Cargo has no syntax to conditionally enable a target, except based on features. Instead, use conditional compilation within the test.

This test cannot be compiled under Redox. PR #1098 attempted to disable it for Redox, but actually disabled it everywhere. AFAICT, Cargo has no syntax to conditionally enable a target, except based on features. Instead, use conditional compilation within the test.

asomers added this to the 0.16.0 milestone Jul 12, 2019

AdminXVII force-pushed the add-redox-support branch from 5e6db09 to 6fd6456 Compare July 22, 2019 17:46

AdminXVII force-pushed the add-redox-support branch from 492ef33 to 030e753 Compare September 11, 2019 12:50

mati865 reviewed Sep 11, 2019

View reviewed changes

Cargo.toml Outdated Show resolved Hide resolved

AdminXVII force-pushed the add-redox-support branch 3 times, most recently from fcf97ca to 94a4d2b Compare September 12, 2019 16:23

AdminXVII force-pushed the add-redox-support branch 12 times, most recently from b8498fb to 2a560e4 Compare September 17, 2019 15:04

asomers reviewed May 7, 2020

View reviewed changes

AdminXVII closed this May 7, 2020

AdminXVII reopened this May 7, 2020

AdminXVII force-pushed the add-redox-support branch from 3320483 to ef07a8e Compare May 14, 2020 06:09

AdminXVII and others added 12 commits May 17, 2020 21:05

Remove more unsupported functions and make it possible to run tests

e94c139

Add termio support

639d3b8

Add poll

4c28b9f

Make sure to leave the values as-is in open

57fa56f

Remove temporarily the failing tests for Redox

9e5e934

TODO: Fix them in Relibc

Disable mkfifo for Redox

b01c5c6

FIFOs are not supported (yet?) by RedoxFS, so disable it

Add redoxer testing for travis

f091291

Remove warnings when compiling for Redox

92e63f6

Add wait, fdatasync, poll and pause for Redox

5229c44

Fix test and remove group & user for redox

106927a

- Make sure all tests pass the CI - Redox does not (yet) have passwd functions, so remove it

Simply disable the dir module, since only the entry struct is available

bedbb8d

AdminXVII force-pushed the add-redox-support branch from ef07a8e to bedbb8d Compare May 18, 2020 01:06

Add Redox to Tier 3

b05c3dc

asomers approved these changes May 20, 2020

View reviewed changes

bors bot merged commit d950c48 into nix-rust:master May 20, 2020

asomers mentioned this pull request May 31, 2020

Convert the crate to edition 2018 #1254

Merged

Add Redox support for most of the modules #1098

Add Redox support for most of the modules #1098

Uh oh!

Conversation

AdminXVII commented Jul 12, 2019

Uh oh!

asomers commented Jul 12, 2019

Uh oh!

AdminXVII commented Jul 12, 2019

Uh oh!

AdminXVII commented Jul 12, 2019

Uh oh!

AdminXVII commented Jul 27, 2019

Uh oh!

Uh oh!

AdminXVII commented Sep 16, 2019

Uh oh!

asomers commented Sep 16, 2019

Uh oh!

AdminXVII commented Sep 17, 2019

Uh oh!

asomers commented Sep 17, 2019

Uh oh!

AdminXVII commented Sep 17, 2019

Uh oh!

asomers commented Sep 17, 2019

Uh oh!

AdminXVII commented Sep 17, 2019

Uh oh!

AdminXVII commented May 6, 2020

Uh oh!

asomers May 7, 2020

Choose a reason for hiding this comment

Uh oh!

AdminXVII May 7, 2020

Choose a reason for hiding this comment

Uh oh!

asomers May 7, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

AdminXVII commented May 11, 2020

Uh oh!

AdminXVII commented May 18, 2020

Uh oh!

asomers commented May 20, 2020

Uh oh!

AdminXVII commented May 20, 2020

Uh oh!

asomers left a comment

Choose a reason for hiding this comment

Uh oh!

AdminXVII commented May 20, 2020

Uh oh!

bors bot commented May 20, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants