Implement statfs for dragonfly, freebsd and openbsd #1039

alesharik · 2018-07-12T23:33:10Z

No description provided.

rust-highfive · 2018-07-12T23:33:20Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

semarie · 2018-07-13T04:21:34Z

for OpenBSD, could you put the c_uchar definition in src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs ? the three definition you added are the same, so it could be factorized.

semarie · 2018-07-13T04:35:38Z

src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs

+        pub mount_info: mount_info,
+    }
+
+    pub union mount_info {


I have the following error will trying to run testsuite on openbsd:

error: no rules expected the token `union` --> src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs:54:9 | 54 | pub union mount_info { | ^^^^^

The block is in s! marco block, and union seems unsupported by the macro

I fixed unions. Can you rerun the testsuite?

semarie · 2018-07-13T17:40:44Z

c_uchar is already globally defined : https://github.com/rust-lang/libc/blob/master/src/lib.rs#L131
lot of errors related to union (I think your added support of union is only partial)

cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:13863:17: error: must use 'union' tag
 to refer to type 'mount_info'
cargo:warning=                mount_info* __test_field_type_statfs_mount_info(struct statfs* b) {
cargo:warning=                ^
cargo:warning=                union
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:13868:67: error: use of undeclared id
entifier 'mount_info'
cargo:warning=            uint64_t __test_size_mount_info(void) { return sizeof(mount_info); }
cargo:warning=                                                                  ^
...
cargo:warning=fatal error: too many errors emitted, stopping now [-ferror-limit=]
cargo:warning=20 errors generated.
exit code: 1

alexcrichton · 2018-07-13T20:07:44Z

Thanks! Looks like @semarie still has some errors though?

alesharik · 2018-07-13T20:18:32Z

Yes. And I'm building Rust for OpenBSD to fix them

semarie · 2018-07-14T04:35:13Z

@alesharik just a side note: you will have some unrelated errors regarding this PR (depending the openbsd version you use): KERN_MAXID on current, SIGSTKSZ (changed again recently) and struct arphdr alignment. See #1040.

semarie · 2018-07-15T05:00:37Z

I still have the same kind of errors.

--- stdout
-----------------------------------------
cargo:rerun-if-changed=../src/lib.rs
cargo:rerun-if-changed=../src/macros.rs
cargo:rerun-if-changed=../src/dox.rs
cargo:rerun-if-changed=../src/unix/mod.rs
cargo:rerun-if-changed=../src/unix/bsd/mod.rs
cargo:rerun-if-changed=../src/unix/bsd/netbsdlike/mod.rs
cargo:rerun-if-changed=../src/unix/bsd/netbsdlike/openbsdlike/mod.rs
cargo:rerun-if-changed=../src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs
cargo:rerun-if-changed=../src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs
OPT_LEVEL = Some("0")
HOST = Some("x86_64-unknown-openbsd")
HOST = Some("x86_64-unknown-openbsd")
CC_x86_64-unknown-openbsd = None
CC_x86_64_unknown_openbsd = None
HOST_CC = None
CC = None
HOST = Some("x86_64-unknown-openbsd")
HOST = Some("x86_64-unknown-openbsd")
CFLAGS_x86_64-unknown-openbsd = None
CFLAGS_x86_64_unknown_openbsd = None
HOST_CFLAGS = None
CFLAGS = None
DEBUG = Some("true")
running: "cc" "-O0" "-ffunction-sections" "-fdata-sections" "-fPIC" "-g" "-m64" "-Wall" "-Wextra" "-Wall" "-Wextra" "-Werror" "-Wno-unused-parameter" "-Wno-type-limits" "-Wno-deprecated-declarations" "-Wno-deprecated-declarations" "-o" "/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.o" "-c" "/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c"
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:13961:17: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                mount_info* __test_field_type_statfs_mount_info(struct statfs* b) {
cargo:warning=                ^
cargo:warning=                union
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:13966:67: error: use of undeclared identifier 'mount_info'
cargo:warning=            uint64_t __test_size_mount_info(void) { return sizeof(mount_info); }
cargo:warning=                                                                  ^
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:13967:73: error: use of undeclared identifier 'mount_info'
cargo:warning=            uint64_t __test_align_mount_info(void) { return __alignof__(mount_info); }
cargo:warning=                                                                        ^
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:13971:37: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                    return offsetof(mount_info, ufs_args);
cargo:warning=                                    ^
cargo:warning=                                    union
cargo:warning=/usr/include/stddef.h:69:51: note: expanded from macro 'offsetof'
cargo:warning=#define offsetof(type, member)  __builtin_offsetof(type, member)
cargo:warning=                                                   ^
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:13974:21: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                    mount_info* foo = NULL;
cargo:warning=                    ^
cargo:warning=                    union
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:13979:72: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                struct ufs_args* __test_field_type_mount_info_ufs_args(mount_info* b) {
cargo:warning=                                                                       ^
cargo:warning=                                                                       union
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:13985:37: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                    return offsetof(mount_info, mfs_args);
cargo:warning=                                    ^
cargo:warning=                                    union
cargo:warning=/usr/include/stddef.h:69:51: note: expanded from macro 'offsetof'
cargo:warning=#define offsetof(type, member)  __builtin_offsetof(type, member)
cargo:warning=                                                   ^
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:13988:21: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                    mount_info* foo = NULL;
cargo:warning=                    ^
cargo:warning=                    union
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:13993:72: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                struct mfs_args* __test_field_type_mount_info_mfs_args(mount_info* b) {
cargo:warning=                                                                       ^
cargo:warning=                                                                       union
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:13999:37: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                    return offsetof(mount_info, nfs_args);
cargo:warning=                                    ^
cargo:warning=                                    union
cargo:warning=/usr/include/stddef.h:69:51: note: expanded from macro 'offsetof'
cargo:warning=#define offsetof(type, member)  __builtin_offsetof(type, member)
cargo:warning=                                                   ^
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:14002:21: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                    mount_info* foo = NULL;
cargo:warning=                    ^
cargo:warning=                    union
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:14007:72: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                struct nfs_args* __test_field_type_mount_info_nfs_args(mount_info* b) {
cargo:warning=                                                                       ^
cargo:warning=                                                                       union
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:14013:37: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                    return offsetof(mount_info, iso_args);
cargo:warning=                                    ^
cargo:warning=                                    union
cargo:warning=/usr/include/stddef.h:69:51: note: expanded from macro 'offsetof'
cargo:warning=#define offsetof(type, member)  __builtin_offsetof(type, member)
cargo:warning=                                                   ^
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:14016:21: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                    mount_info* foo = NULL;
cargo:warning=                    ^
cargo:warning=                    union
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:14021:72: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                struct iso_args* __test_field_type_mount_info_iso_args(mount_info* b) {
cargo:warning=                                                                       ^
cargo:warning=                                                                       union
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:14027:37: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                    return offsetof(mount_info, msdosfs_args);
cargo:warning=                                    ^
cargo:warning=                                    union
cargo:warning=/usr/include/stddef.h:69:51: note: expanded from macro 'offsetof'
cargo:warning=#define offsetof(type, member)  __builtin_offsetof(type, member)
cargo:warning=                                                   ^
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:14030:21: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                    mount_info* foo = NULL;
cargo:warning=                    ^
cargo:warning=                    union
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:14035:80: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                struct msdosfs_args* __test_field_type_mount_info_msdosfs_args(mount_info* b) {
cargo:warning=                                                                               ^
cargo:warning=                                                                               union
cargo:warning=/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c:14041:37: error: must use 'union' tag to refer to type 'mount_info'
cargo:warning=                    return offsetof(mount_info, ntfs_args);
cargo:warning=                                    ^
cargo:warning=                                    union
cargo:warning=/usr/include/stddef.h:69:51: note: expanded from macro 'offsetof'
cargo:warning=#define offsetof(type, member)  __builtin_offsetof(type, member)
cargo:warning=                                                   ^
cargo:warning=fatal error: too many errors emitted, stopping now [-ferror-limit=]
cargo:warning=20 errors generated.
exit code: 1

--- stderr
thread 'main' panicked at '

Internal error occurred: Command "cc" "-O0" "-ffunction-sections" "-fdata-sections" "-fPIC" "-g" "-m64" "-Wall" "-Wextra" "-Wall" "-Wextra" "-Werror" "-Wno-unused-parameter" "-Wno-type-limits" "-Wno-deprecated-declarations" "-Wno-deprecated-declarations" "-o" "/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.o" "-c" "/data/semarie/repos/rust/build-libc/./build/debug/build/libc-test-12b6aa225dc34292/out/main.c" with args "cc" did not execute successfully (status code exit code: 1).

', /data/semarie/repos/rust/build-libc/./crates/registry/src/git.colasdn.top-1ecc6299db9ec823/cc-1.0.17/src/lib.rs:2180:5
note: Run with `RUST_BACKTRACE=1` for a backtrace.

Does ctest crate (which is used to generate the C code that will be used in the libc testsuite) have union support at all ?

alesharik · 2018-07-15T06:18:37Z

Nope, it doesn't. I'm working on it

afdw · 2018-07-16T04:48:34Z

Here is the PR that adds missing support for unions in the ctest crate: https://github.com/alexcrichton/ctest/pull/34

semarie

first pass after the ctest changes: still need work for openbsd :)

thanks

semarie · 2018-07-16T16:06:51Z

src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs

+        pub ex_flags: ::c_int,
+        pub ex_root: ::uid_t,
+        pub ex_anon: xucred,
+        pub ex_addr: *mut sockaddr_in,


it is struct sockaddr

semarie · 2018-07-16T16:07:12Z

src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs

+        pub ex_anon: xucred,
+        pub ex_addr: *mut sockaddr_in,
+        pub ex_addrlen: ::c_int,
+        pub ex_mask: *mut sockaddr_in,


struct sockaddr

semarie · 2018-07-16T16:08:18Z

src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs

+    }
+
+    pub struct fusefs_args {
+        pub fspec: *mut ::c_char,


pub name: *mut ::c_char;

semarie · 2018-07-16T16:09:01Z

src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs

+        pub export_info: export_args,
+        pub uid: ::uid_t,
+        pub gid: ::gid_t,
+        pub mask: ::mode_t,


pub mode: ::mode_t

semarie · 2018-07-16T16:10:25Z

src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs

+        pub ex_masklen: ::c_int,
+    }
+
+    pub struct in_addr {


in_addr is already defined

semarie · 2018-07-16T16:11:09Z

src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs

+    pub struct in_addr {
+        pub s_addr: ::in_addr_t,
+    }
+    pub struct sockaddr_in {


sockaddr_in is already defined

alexcrichton · 2018-07-16T19:48:10Z

This is looking good to me! Are there any final bits to fix or is this good to go?

afdw · 2018-07-16T20:11:39Z

One problem that @semarie has mentioned is still not fixed yet:

cargo:warning=/home/user/test/libc/target/debug/build/libc-test-12b6aa225dc34292/out/main.c:14593:28: error: no member named 'mode' in 'msdosfs_args'
cargo:warning=                    return offsetof(struct msdosfs_args, mode);
cargo:warning=                           ^                             ~~~~
cargo:warning=/usr/include/stddef.h:69:32: note: expanded from macro 'offsetof'
cargo:warning=#define offsetof(type, member)  __builtin_offsetof(type, member)
cargo:warning=                                ^                        ~~~~~~
cargo:warning=/home/user/test/libc/target/debug/build/libc-test-12b6aa225dc34292/out/main.c:14597:40: error: no member named 'mode' in 'struct msdosfs_args'
cargo:warning=                    return sizeof(foo->mode);
cargo:warning=                                  ~~~  ^
cargo:warning=/home/user/test/libc/target/debug/build/libc-test-12b6aa225dc34292/out/main.c:14602:32: error: no member named 'mode' in 'struct msdosfs_args'
cargo:warning=                    return &b->mode;
cargo:warning=                            ~  ^
cargo:warning=/home/user/test/libc/target/debug/build/libc-test-12b6aa225dc34292/out/main.c:14681:28: error: no member named 'mask' in 'ntfs_args'
cargo:warning=                    return offsetof(struct ntfs_args, mask);
cargo:warning=                           ^                          ~~~~
cargo:warning=/usr/include/stddef.h:69:32: note: expanded from macro 'offsetof'
cargo:warning=#define offsetof(type, member)  __builtin_offsetof(type, member)
cargo:warning=                                ^                        ~~~~~~
cargo:warning=/home/user/test/libc/target/debug/build/libc-test-12b6aa225dc34292/out/main.c:14685:40: error: no member named 'mask' in 'struct ntfs_args'
cargo:warning=                    return sizeof(foo->mask);
cargo:warning=                                  ~~~  ^
cargo:warning=/home/user/test/libc/target/debug/build/libc-test-12b6aa225dc34292/out/main.c:14690:32: error: no member named 'mask' in 'struct ntfs_args'
cargo:warning=                    return &b->mask;
cargo:warning=                            ~  ^

alesharik · 2018-07-16T22:20:33Z

I think it is good to go

alexcrichton · 2018-07-16T22:55:32Z

@bors: r+

bors · 2018-07-16T22:55:33Z

📌 Commit 5ec8699 has been approved by alexcrichton

afdw · 2018-07-16T22:55:33Z

Yes, looks like it builds successfully and passes all tests.

bors · 2018-07-16T22:55:39Z

⌛ Testing commit 5ec8699 with merge 03231e9...

Implement statfs for dragonfly, freebsd and openbsd

bors · 2018-07-17T00:44:22Z

💔 Test failed - status-appveyor

semarie · 2018-07-17T04:20:25Z

it would be more simple to test if libc could be updated to use latest ctest crate... I need to rewrite the changes for each test

semarie · 2018-07-17T04:23:38Z

oh, it is just Cargo.lock that need to be updated

semarie · 2018-07-17T04:35:27Z

with an update of Cargo.lock to make ctest#bf780a0e be used, it is ok for me: all tests passes on openbsd

alexcrichton · 2018-07-17T13:47:41Z

@bors: r+

bors · 2018-07-17T13:47:42Z

📌 Commit ce4c140 has been approved by alexcrichton

bors · 2018-07-17T13:47:51Z

⌛ Testing commit ce4c140 with merge 5ac35c8...

Implement statfs for dragonfly, freebsd and openbsd

bors · 2018-07-17T14:10:26Z

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 5ac35c8 to master...

rust-highfive assigned alexcrichton Jul 12, 2018

semarie reviewed Jul 13, 2018

View reviewed changes

alesharik changed the title ~~Implement statfs for dragonfly, freebsd, netbsd and openbsd~~ Implement statfs for dragonfly, freebsd and openbsd Jul 13, 2018

afdw mentioned this pull request Jul 16, 2018

Add support for unions without typedefs gnzlbg/ctest#34

Merged

semarie suggested changes Jul 16, 2018

View reviewed changes

Implement statfs for dragonfly, freebsd and openbsd

5ec8699

bors added a commit that referenced this pull request Jul 16, 2018

Auto merge of #1039 - alesharik:master, r=alexcrichton

03231e9

Implement statfs for dragonfly, freebsd and openbsd

Bump ctest version

ce4c140

bors added a commit that referenced this pull request Jul 17, 2018

Auto merge of #1039 - alesharik:master, r=alexcrichton

5ac35c8

Implement statfs for dragonfly, freebsd and openbsd

bors merged commit ce4c140 into rust-lang:master Jul 17, 2018

bors mentioned this pull request Jul 17, 2018

Add MODULE_INIT_ constants #1041

Merged

Implement statfs for dragonfly, freebsd and openbsd #1039

Implement statfs for dragonfly, freebsd and openbsd #1039

Uh oh!

Conversation

alesharik commented Jul 12, 2018

Uh oh!

rust-highfive commented Jul 12, 2018

Uh oh!

semarie commented Jul 13, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

semarie commented Jul 13, 2018

Uh oh!

alexcrichton commented Jul 13, 2018

Uh oh!

alesharik commented Jul 13, 2018

Uh oh!

semarie commented Jul 14, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

semarie commented Jul 15, 2018

Uh oh!

alesharik commented Jul 15, 2018

Uh oh!

afdw commented Jul 16, 2018

Uh oh!

semarie left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Jul 16, 2018

Uh oh!

afdw commented Jul 16, 2018

Uh oh!

alesharik commented Jul 16, 2018

Uh oh!

alexcrichton commented Jul 16, 2018

Uh oh!

bors commented Jul 16, 2018

Uh oh!

afdw commented Jul 16, 2018

Uh oh!

bors commented Jul 16, 2018

Uh oh!

bors commented Jul 17, 2018

Uh oh!

semarie commented Jul 17, 2018

Uh oh!

semarie commented Jul 17, 2018

Uh oh!

semarie commented Jul 17, 2018

Uh oh!

alexcrichton commented Jul 17, 2018

Uh oh!

bors commented Jul 17, 2018

Uh oh!

bors commented Jul 17, 2018

Uh oh!

bors commented Jul 17, 2018

Uh oh!

Uh oh!

semarie commented Jul 14, 2018 •

edited

Loading