Freebsd items #2451

GuillaumeGomez · 2021-10-15T16:17:17Z

No description provided.

rust-highfive · 2021-10-15T16:17:20Z

(rust-highfive has picked a reviewer for you, use r? to override)

JohnTitor · 2021-10-15T18:36:18Z

Seems you messed up the branch.

GuillaumeGomez · 2021-10-15T18:39:15Z

I didn't finish the rebase for whatever reason. Should be better now. Let's see if CI is happy, I think a few things will be broken so I'll look how to fix them and check how to ignore some fields checks as well if needed.

GuillaumeGomez · 2021-10-15T19:34:04Z

@JohnTitor: Any idea why it's complaining about constants not being used?

error: constant is never used: `PRIO_PROCESS`
    --> src/unix/bsd/freebsdlike/freebsd/mod.rs:1814:1
     |
1814 | pub const PRIO_PROCESS: ::c_int = 0;
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

JohnTitor · 2021-10-15T20:27:18Z

Because it's already declared on a parent module:

libc/src/unix/bsd/mod.rs

Line 521 in e1eb972

pub const PRIO_PROCESS: ::c_int = 0;

GuillaumeGomez · 2021-10-15T20:27:53Z

Ah nice! Less work for me. :3

GuillaumeGomez · 2021-10-16T20:32:02Z

I updated locally the link to ctest2 until it's published. So now I get:

  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26555:23: error: redefinition of '__test_size_rusage'
  cargo:warning=             uint64_t __test_size_rusage(void) { return sizeof(struct rusage); }
  cargo:warning=                      ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2621:23: note: previous definition is here
  cargo:warning=             uint64_t __test_size_rusage(void) { return sizeof(struct rusage); }
  cargo:warning=                      ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26556:23: error: redefinition of '__test_align_rusage'
  cargo:warning=             uint64_t __test_align_rusage(void) {
  cargo:warning=                      ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2622:23: note: previous definition is here
  cargo:warning=             uint64_t __test_align_rusage(void) {
  cargo:warning=                      ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26568:27: error: redefinition of '__test_offset_rusage_ru_utime'
  cargo:warning=                 uint64_t __test_offset_rusage_ru_utime(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2634:27: note: previous definition is here
  cargo:warning=                 uint64_t __test_offset_rusage_ru_utime(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26571:27: error: redefinition of '__test_fsize_rusage_ru_utime'
  cargo:warning=                 uint64_t __test_fsize_rusage_ru_utime(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2637:27: note: previous definition is here
  cargo:warning=                 uint64_t __test_fsize_rusage_ru_utime(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26577:34: error: redefinition of '__test_field_type_rusage_ru_utime'
  cargo:warning=                 struct timeval* __test_field_type_rusage_ru_utime(struct rusage* b) {
  cargo:warning=                                 ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2643:34: note: previous definition is here
  cargo:warning=                 struct timeval* __test_field_type_rusage_ru_utime(struct rusage* b) {
  cargo:warning=                                 ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26582:27: error: redefinition of '__test_offset_rusage_ru_stime'
  cargo:warning=                 uint64_t __test_offset_rusage_ru_stime(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2648:27: note: previous definition is here
  cargo:warning=                 uint64_t __test_offset_rusage_ru_stime(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26585:27: error: redefinition of '__test_fsize_rusage_ru_stime'
  cargo:warning=                 uint64_t __test_fsize_rusage_ru_stime(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2651:27: note: previous definition is here
  cargo:warning=                 uint64_t __test_fsize_rusage_ru_stime(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26591:34: error: redefinition of '__test_field_type_rusage_ru_stime'
  cargo:warning=                 struct timeval* __test_field_type_rusage_ru_stime(struct rusage* b) {
  cargo:warning=                                 ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2657:34: note: previous definition is here
  cargo:warning=                 struct timeval* __test_field_type_rusage_ru_stime(struct rusage* b) {
  cargo:warning=                                 ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26596:27: error: redefinition of '__test_offset_rusage_ru_maxrss'
  cargo:warning=                 uint64_t __test_offset_rusage_ru_maxrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2662:27: note: previous definition is here
  cargo:warning=                 uint64_t __test_offset_rusage_ru_maxrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26599:27: error: redefinition of '__test_fsize_rusage_ru_maxrss'
  cargo:warning=                 uint64_t __test_fsize_rusage_ru_maxrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2665:27: note: previous definition is here
  cargo:warning=                 uint64_t __test_fsize_rusage_ru_maxrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26605:25: error: redefinition of '__test_field_type_rusage_ru_maxrss'
  cargo:warning=                  long* __test_field_type_rusage_ru_maxrss(struct rusage* b) {
  cargo:warning=                        ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2671:25: note: previous definition is here
  cargo:warning=                  long* __test_field_type_rusage_ru_maxrss(struct rusage* b) {
  cargo:warning=                        ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26610:27: error: redefinition of '__test_offset_rusage_ru_ixrss'
  cargo:warning=                 uint64_t __test_offset_rusage_ru_ixrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2676:27: note: previous definition is here
  cargo:warning=                 uint64_t __test_offset_rusage_ru_ixrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26613:27: error: redefinition of '__test_fsize_rusage_ru_ixrss'
  cargo:warning=                 uint64_t __test_fsize_rusage_ru_ixrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2679:27: note: previous definition is here
  cargo:warning=                 uint64_t __test_fsize_rusage_ru_ixrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26619:25: error: redefinition of '__test_field_type_rusage_ru_ixrss'
  cargo:warning=                  long* __test_field_type_rusage_ru_ixrss(struct rusage* b) {
  cargo:warning=                        ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2685:25: note: previous definition is here
  cargo:warning=                  long* __test_field_type_rusage_ru_ixrss(struct rusage* b) {
  cargo:warning=                        ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26624:27: error: redefinition of '__test_offset_rusage_ru_idrss'
  cargo:warning=                 uint64_t __test_offset_rusage_ru_idrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2690:27: note: previous definition is here
  cargo:warning=                 uint64_t __test_offset_rusage_ru_idrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26627:27: error: redefinition of '__test_fsize_rusage_ru_idrss'
  cargo:warning=                 uint64_t __test_fsize_rusage_ru_idrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2693:27: note: previous definition is here
  cargo:warning=                 uint64_t __test_fsize_rusage_ru_idrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26633:25: error: redefinition of '__test_field_type_rusage_ru_idrss'
  cargo:warning=                  long* __test_field_type_rusage_ru_idrss(struct rusage* b) {
  cargo:warning=                        ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2699:25: note: previous definition is here
  cargo:warning=                  long* __test_field_type_rusage_ru_idrss(struct rusage* b) {
  cargo:warning=                        ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26638:27: error: redefinition of '__test_offset_rusage_ru_isrss'
  cargo:warning=                 uint64_t __test_offset_rusage_ru_isrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2704:27: note: previous definition is here
  cargo:warning=                 uint64_t __test_offset_rusage_ru_isrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:26641:27: error: redefinition of '__test_fsize_rusage_ru_isrss'
  cargo:warning=                 uint64_t __test_fsize_rusage_ru_isrss(void) {
  cargo:warning=                          ^
  cargo:warning=/root/libc/target/x86_64-unknown-freebsd/debug/build/libc-test-809464fa918cfbf9/out/main.c:2707:27: note: previous definition is here
  cargo:warning=                 uint64_t __test_fsize_rusage_ru_isrss(void) {
  cargo:warning=                          ^
  cargo:warning=fatal error: too many errors emitted, stopping now [-ferror-limit=]
  cargo:warning=20 errors generated.
  exit status: 1

The fields don't seem duplicated so I'm not sure what would be the issue here. Any idea maybe?

JohnTitor · 2021-10-16T20:58:11Z

I guess some headers have rusage and it causes a conflict.

GuillaumeGomez · 2021-10-16T21:00:20Z

What do you mean? We have two ".h" including the same one you mean? Shouldn't #ifndef protects us from such cases to happen?

JohnTitor · 2021-10-16T21:08:55Z

I guess so because I remember that the same (or similar) failure happened in the past and it was due to import some similar header files (IIRC something like sys/foo.h was involved). But I'm not too familiar with FreeBSD, I would need some debugging to provide further help (looking at the generated C file would be a help, I imagine).

GuillaumeGomez · 2021-10-18T16:22:53Z

The last error is pretty interesting:

cargo:warning=/tmp/cirrus-ci-build/target/x86_64-unknown-freebsd/debug/build/libc-test-46bad6d5373dd9cb/out/main.c:33091:65: error: use of undeclared identifier 'KVME_TYPE_GUARD'
  cargo:warning=            static const int __test_const_KVME_TYPE_GUARD_val = KVME_TYPE_GUARD;

The KVME_TYPE_GUARD is defined in the sys/user.h header (which is added by the test script) alongside a few others KVME_* constants (which are found). How strange.

JohnTitor · 2021-10-18T17:40:19Z

It's newly added and hasn't been released yet, I think: freebsd/freebsd-src@25c6318

GuillaumeGomez · 2021-10-18T18:03:57Z

Ah, I shouldn't have look at the freebsd source code directly then haha. Thanks a lot for the information!

GuillaumeGomez · 2021-10-19T13:15:20Z

I fixed the PartialEq issue using the usual hack: I simply changed the array into [[c_char; 23]; 2] and now it's happy. I'm currently looking into the rust-semver issue: it seems to be compatible when changing private fields.

More flexible rule around adding public fields to struct with private fields This comes from rust-lang/libc#2451. Before this PR, the `kinfo_proc` struct only had one field which was private. I added the missing fields and made them all public. It doesn't seem to be a semver breaking change as the code using this struct previously will still work exactly the same.

JohnTitor · 2021-10-19T21:06:12Z

As the above comment says, we should also update the nightly version in the CI config.

GuillaumeGomez · 2021-10-19T21:48:45Z

Where is it set? I looked in the ci folder but didn't find it...

JohnTitor · 2021-10-20T01:38:44Z

Here:

libc/.github/workflows/bors.yml

Lines 253 to 275 in 5d7f90c

    
           semver_linux: 
        
             name: Semver Linux 
        
             runs-on: ubuntu-20.04 
        
             continue-on-error: true 
        
             steps: 
        
               - uses: actions/checkout@v2 
        
               - name: Setup Rust toolchain 
        
                 # Should update the semverver revision in semver.sh if we touch nightly ver. 
        
                 run: TOOLCHAIN=nightly-2021-07-23 sh ./ci/install-rust.sh 
        
               - name: Check breaking changes 
        
                 run: sh ci/semver.sh linux 
        
           semver_macos: 
        
             name: Semver macOS 
        
             runs-on: macos-11 
        
             continue-on-error: true 
        
             steps: 
        
               - uses: actions/checkout@v2 
        
               - name: Setup Rust toolchain 
        
                 # Pin nightly version to make semverver compilable. 
        
                 run: TOOLCHAIN=nightly-2021-07-23 sh ./ci/install-rust.sh 
        
               - name: Check breaking changes 
        
                 run: sh ci/semver.sh macos

GuillaumeGomez · 2021-10-20T09:00:08Z

I was simply not looking at the right place. Thanks!

GuillaumeGomez · 2021-10-20T09:30:21Z

Updated the CI nightly version as well!

JohnTitor · 2021-10-20T18:19:47Z

🎉, let's give it another try.
@bors r+

bors · 2021-10-20T18:19:49Z

📌 Commit b540e1b has been approved by JohnTitor

bors · 2021-10-20T18:19:56Z

⌛ Testing commit b540e1b with merge 6492988...

bors · 2021-10-20T19:23:38Z

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: JohnTitor
Pushing 6492988 to master...

GuillaumeGomez · 2021-10-20T21:01:17Z

Thanks a lot for your help @JohnTitor ! :)

lnicola · 2021-11-02T09:04:14Z

This will break rust-lang/rust on the next update, filed rust-lang/rust#90495.

GuillaumeGomez · 2021-11-02T09:21:35Z

@lnicola Good catch, thanks!

Pull in `libkvm` on FreeBSD This is needed when updating `libc` after rust-lang/libc#2451. Spotted in rust-lang#90464 where it caused `rust-analyzer` to fail to link. Similar to rust-lang#88676.

rust-highfive assigned JohnTitor Oct 15, 2021

rust-highfive added the S-waiting-on-review label Oct 15, 2021

GuillaumeGomez force-pushed the freebsd-items branch from 319704f to 26f7be2 Compare October 15, 2021 18:38

GuillaumeGomez force-pushed the freebsd-items branch 4 times, most recently from 13d0662 to e4c578a Compare October 15, 2021 19:24

GuillaumeGomez force-pushed the freebsd-items branch 2 times, most recently from 901bb48 to 0518911 Compare October 15, 2021 20:37

GuillaumeGomez mentioned this pull request Oct 16, 2021

Allow to subtract in constants JohnTitor/ctest2#28

Merged

GuillaumeGomez force-pushed the freebsd-items branch from 0518911 to e323f88 Compare October 16, 2021 20:12

GuillaumeGomez force-pushed the freebsd-items branch 2 times, most recently from b14a3b7 to d7dfd3a Compare October 18, 2021 16:10

GuillaumeGomez force-pushed the freebsd-items branch from d7dfd3a to afb8241 Compare October 18, 2021 16:26

GuillaumeGomez force-pushed the freebsd-items branch 3 times, most recently from f300a01 to 00a8ef9 Compare October 18, 2021 19:46

GuillaumeGomez force-pushed the freebsd-items branch from b0eee59 to 2b5532b Compare October 19, 2021 11:42

GuillaumeGomez added 2 commits October 19, 2021 15:14

Skip checks for kvm_t and a few kinfo_proc struct fields

b3934d8

Update ctest2 version to 0.4.2

037806f

GuillaumeGomez force-pushed the freebsd-items branch from 2b5532b to 037806f Compare October 19, 2021 13:14

GuillaumeGomez mentioned this pull request Oct 19, 2021

More flexible rule around adding public fields to struct with private fields rust-lang/rust-semverver#229

Merged

GuillaumeGomez force-pushed the freebsd-items branch from 0dbbb9d to 409d55d Compare October 20, 2021 09:01

Update semverver version used in CI

b540e1b

GuillaumeGomez force-pushed the freebsd-items branch from 409d55d to b540e1b Compare October 20, 2021 09:02

bors added S-waiting-on-bors and removed S-waiting-on-review labels Oct 20, 2021

bors merged commit 6492988 into rust-lang:master Oct 20, 2021

GuillaumeGomez deleted the freebsd-items branch October 20, 2021 19:46

GuillaumeGomez mentioned this pull request Nov 1, 2021

Add FreeBSD support? GuillaumeGomez/sysinfo#433

Closed

This was referenced Nov 2, 2021

⬆️ rust-analyzer rust-lang/rust#90464

Merged

Pull in libkvm on FreeBSD rust-lang/rust#90495

Merged

Uh oh!

Freebsd items #2451

Freebsd items #2451

Uh oh!

Conversation

GuillaumeGomez commented Oct 15, 2021

Uh oh!

rust-highfive commented Oct 15, 2021

Uh oh!

JohnTitor commented Oct 15, 2021

Uh oh!

GuillaumeGomez commented Oct 15, 2021

Uh oh!

GuillaumeGomez commented Oct 15, 2021

Uh oh!

JohnTitor commented Oct 15, 2021

Uh oh!

GuillaumeGomez commented Oct 15, 2021

Uh oh!

GuillaumeGomez commented Oct 16, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JohnTitor commented Oct 16, 2021

Uh oh!

GuillaumeGomez commented Oct 16, 2021

Uh oh!

JohnTitor commented Oct 16, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GuillaumeGomez commented Oct 18, 2021

Uh oh!

JohnTitor commented Oct 18, 2021

Uh oh!

GuillaumeGomez commented Oct 18, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GuillaumeGomez commented Oct 19, 2021

Uh oh!

JohnTitor commented Oct 19, 2021

Uh oh!

GuillaumeGomez commented Oct 19, 2021

Uh oh!

JohnTitor commented Oct 20, 2021

Uh oh!

GuillaumeGomez commented Oct 20, 2021

Uh oh!

GuillaumeGomez commented Oct 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JohnTitor commented Oct 20, 2021

Uh oh!

bors commented Oct 20, 2021

Uh oh!

bors commented Oct 20, 2021

Uh oh!

bors commented Oct 20, 2021

Uh oh!

GuillaumeGomez commented Oct 20, 2021

Uh oh!

lnicola commented Nov 2, 2021

Uh oh!

GuillaumeGomez commented Nov 2, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

GuillaumeGomez commented Oct 16, 2021 •

edited

Loading

JohnTitor commented Oct 16, 2021 •

edited

Loading

GuillaumeGomez commented Oct 18, 2021 •

edited

Loading

GuillaumeGomez commented Oct 20, 2021 •

edited

Loading