Add devstat items #2565

GuillaumeGomez · 2021-11-22T14:59:57Z

No description provided.

rust-highfive · 2021-11-22T15:00:00Z

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

GuillaumeGomez · 2021-11-22T15:02:33Z

src/unix/bsd/freebsdlike/freebsd/mod.rs

+        pub tk_nin: ::c_long,
+        pub tk_nout: ::c_long,
+        pub dinfo: *mut devinfo,
+        pub snap_time: ::c_double,


To be noted: this is supposed to be a long double, but I have absolutely no idea how to bind such a type... And the C spec is wonderful about it: https://gcc.gnu.org/onlinedocs/gcc/Floating-Types.html

bors · 2021-11-23T07:23:27Z

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

GuillaumeGomez · 2021-11-23T11:07:17Z

I'm having trouble with errors like:

error: incompatible pointer types returning 'devstat_type_flags *' from a function with result type 'struct devstat_type_flags *'

They are C enums but the comparison considers them as structs? Just in case, the C enums are defined here.

bors · 2021-11-24T09:56:38Z

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

GuillaumeGomez · 2021-11-24T21:20:39Z

@JohnTitor Any idea about why I'm getting this error when using enums?

GuillaumeGomez · 2021-12-01T09:29:52Z

Fixed the conflict.

bors · 2021-12-01T21:47:57Z

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

GuillaumeGomez · 2021-12-01T21:57:02Z

Rebased.

GuillaumeGomez · 2021-12-03T13:26:37Z

r? @Amanieu

Amanieu · 2021-12-03T15:30:55Z

src/unix/bsd/freebsdlike/freebsd/mod.rs

+    } else {
+        pub type c_longdouble = [u8; 16];
+    }
+}


Have you checked that this actually works? I imagine that from a calling-convention point of view, a long double is passed/returned differently from an array of u8.

Do you know how to check it? I tried it on the C API and valgrind seemed fine with it but no clue if it isn't just plain luck at this point...

I did a few tests on godbolt:

On x86 & x86_64, long doubles are passed in 80-bit x87 float registers. There is no way to represent this with normal Rust code.

On aarch64, long doubles are passed in 128-bit SIMD registers. You can probably emulate this by using uint64x2_t from the (currently unstable) stdarch intrinsics.

In conclusion, I don't think it is practical to bind these API using Rust at the moment. I would recommend using a wrapper written in C to convert these values to a normal double.

In the longer term, I plan on adding arch-specific types such as f80, f128, f16, etc to stdarch, but this is unlikely to happen any time soon.

Would it make sense to make it private and remove the double functions using long double and keeping it for the statinfo struct?

That might work, but you need to make sure that you have the correct size/alignment for c_longdouble on all arches. My recommendation would be to search for LongDouble[Size|Align] in clang/lib/Basic/Targets/ to get the correct values for all targets that FreeBSD supports.

We only test FreeBSD on one arch? :o

We only test it on x86_64. But we do test that it builds on x86_64, i686, aarch64 and powerpc64.

I'm not sure what you mean: are the types actually checked on the arch you mentioned or is it simply running a cargo build?

The types are only checked on x86_64 I think.

Oh, that's pretty bad. :-/

GuillaumeGomez · 2021-12-03T16:43:42Z

@Amanieu In the end, I simply commented everything related to long double. For the time being, I think it's the easiest solution unfortunately.

Amanieu · 2021-12-03T16:51:37Z

I would prefer if the code was properly deleted, it's messy to leave commented code around. Also, the build.rs changes related to long double should also be removed.

GuillaumeGomez · 2021-12-03T16:54:43Z

Ok, done as well.

libc-test/build.rs

Amanieu · 2021-12-03T17:40:04Z

@bors r+

bors · 2021-12-03T17:40:05Z

📌 Commit ac6e16b has been approved by Amanieu

bors · 2021-12-03T17:55:17Z

⌛ Testing commit ac6e16b with merge 92b4680...

bors · 2021-12-03T19:04:48Z

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

lnicola · 2021-12-15T14:34:09Z

Hello! As you might know, rust-analyzer is included as a submodule in rust-lang/rust.

We generally try to keep our dependencies up to date, and one of those is libc, so we often use a newer version than rustc itself. This isn't a problem, but sometimes libc implements new APIs for FreeBSD and requires linking to extra libraries, which are not available in the rust-lang/rust CI image. I've seen this happen for libkvm, libprocstat and libdevstat, see for example rust-lang/rust#91909.

Adding new APIs is fine, of course, but would you mind pinging me next time you link to a new library so I can update the FreeBSD toolchain script? Even if we don't do this for RA, it still needed before upgrading libc in rust-lang/rust. Thanks!

EDIT: ideally we'd run FreeBSD on CI, but I'm not sure how to do it, and it's still not easy to keep our list of libraries in sync with what rust-lang/rust has.

Gate PartialEq and Eq on freebsd objects behind extra_traits This fixes the failure in rust-lang/rust#93351 (comment). These derives were recently added in #2565. Other PartialEq/Eq derives in the project (and this file) are all behind the `extra_traits` gate.

rust-highfive assigned JohnTitor Nov 22, 2021

rust-highfive added the S-waiting-on-review label Nov 22, 2021

GuillaumeGomez commented Nov 22, 2021

View reviewed changes

GuillaumeGomez force-pushed the procstat branch 6 times, most recently from 0c2939c to c76f177 Compare November 22, 2021 15:52

GuillaumeGomez changed the title ~~Add procstat items~~ Add devstat items Nov 22, 2021

GuillaumeGomez force-pushed the procstat branch 3 times, most recently from 238d71b to 8e7db86 Compare November 22, 2021 16:56

GuillaumeGomez mentioned this pull request Nov 22, 2021

Add support for long double JohnTitor/ctest2#30

Merged

GuillaumeGomez force-pushed the procstat branch 5 times, most recently from 5635d65 to fba1905 Compare November 23, 2021 11:05

GuillaumeGomez force-pushed the procstat branch from fba1905 to 4d42380 Compare November 23, 2021 13:27

GuillaumeGomez mentioned this pull request Nov 23, 2021

Add freebsd support GuillaumeGomez/sysinfo#620

Merged

GuillaumeGomez force-pushed the procstat branch from 4d42380 to 03fb604 Compare November 24, 2021 21:20

GuillaumeGomez force-pushed the procstat branch 3 times, most recently from 97ac38e to f594d0a Compare November 28, 2021 19:37

Update ctest2 dependency

ddc070c

GuillaumeGomez force-pushed the procstat branch from b4a10f1 to c4de1bc Compare December 1, 2021 21:55

rust-highfive assigned Amanieu and unassigned JohnTitor Dec 3, 2021

Amanieu reviewed Dec 3, 2021

View reviewed changes

GuillaumeGomez force-pushed the procstat branch from c4de1bc to ad8e2c2 Compare December 3, 2021 16:42

GuillaumeGomez force-pushed the procstat branch 2 times, most recently from 1f05b36 to aa44de4 Compare December 3, 2021 16:54

Amanieu reviewed Dec 3, 2021

View reviewed changes

libc-test/build.rs Outdated Show resolved Hide resolved

GuillaumeGomez force-pushed the procstat branch from aa44de4 to 7a0d705 Compare December 3, 2021 16:58

Add devstat items

ac6e16b

GuillaumeGomez force-pushed the procstat branch from 7a0d705 to ac6e16b Compare December 3, 2021 17:02

bors added S-waiting-on-bors and removed S-waiting-on-review labels Dec 3, 2021

bors merged commit 92b4680 into rust-lang:master Dec 3, 2021

GuillaumeGomez deleted the procstat branch December 3, 2021 19:05

tmandry mentioned this pull request Jan 28, 2022

Gate PartialEq and Eq on freebsd objects behind extra_traits #2659

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add devstat items #2565

Add devstat items #2565

GuillaumeGomez commented Nov 22, 2021

rust-highfive commented Nov 22, 2021

GuillaumeGomez Nov 22, 2021

bors commented Nov 23, 2021

GuillaumeGomez commented Nov 23, 2021

bors commented Nov 24, 2021

GuillaumeGomez commented Nov 24, 2021

GuillaumeGomez commented Dec 1, 2021

bors commented Dec 1, 2021

GuillaumeGomez commented Dec 1, 2021

GuillaumeGomez commented Dec 3, 2021

Amanieu Dec 3, 2021

GuillaumeGomez Dec 3, 2021

Amanieu Dec 3, 2021

GuillaumeGomez Dec 3, 2021

Amanieu Dec 3, 2021

GuillaumeGomez Dec 3, 2021

Amanieu Dec 3, 2021

GuillaumeGomez Dec 3, 2021

Amanieu Dec 3, 2021

GuillaumeGomez Dec 3, 2021

GuillaumeGomez commented Dec 3, 2021

Amanieu commented Dec 3, 2021

GuillaumeGomez commented Dec 3, 2021

Amanieu commented Dec 3, 2021

bors commented Dec 3, 2021

bors commented Dec 3, 2021

bors commented Dec 3, 2021

lnicola commented Dec 15, 2021 •

edited

Loading

Add devstat items #2565

Add devstat items #2565

Conversation

GuillaumeGomez commented Nov 22, 2021

rust-highfive commented Nov 22, 2021

Choose a reason for hiding this comment

bors commented Nov 23, 2021

GuillaumeGomez commented Nov 23, 2021

bors commented Nov 24, 2021

GuillaumeGomez commented Nov 24, 2021

GuillaumeGomez commented Dec 1, 2021

bors commented Dec 1, 2021

GuillaumeGomez commented Dec 1, 2021

GuillaumeGomez commented Dec 3, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GuillaumeGomez commented Dec 3, 2021

Amanieu commented Dec 3, 2021

GuillaumeGomez commented Dec 3, 2021

Amanieu commented Dec 3, 2021

bors commented Dec 3, 2021

bors commented Dec 3, 2021

bors commented Dec 3, 2021

lnicola commented Dec 15, 2021 • edited Loading

lnicola commented Dec 15, 2021 •

edited

Loading