add support of RustyHermit's BSD socket layer #107405

stlankes · 2023-01-28T08:43:48Z

RustyHermit is a tier 3 platform and publishes a new kernel interface. The new version supports a common BSD socket layer. By supporting this interface, the implementation of std can be harmonized to other operating systems. In sys_common/mod.rs we remove only a special case for RustyHermit. All changes are done in the RustyHermit specific directories.

To realize this socket layer, the handling of file descriptors is also harmonized to other operating systems.

rustbot · 2023-01-28T08:43:54Z

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-01-28T08:43:57Z

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

Stabilizing library features
Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
Changing public documentation in ways that create new stability guarantees
Changing observable runtime behavior of library APIs

bjorn3 · 2023-01-28T14:29:29Z

Cargo.lock

+
+[[package]]
+name = "hermit-abi"
+version = "0.3.0"


We will now have all three versions of hermit-abi required at the same time.

Oh, you are right. I will write PRs to upgrade num_cpus etc.

stlankes · 2023-01-28T23:03:38Z

The last commit is more a suggestion from my side. I am not sure, where I should store the AsFd and similar traits. I trie to harmonize my implementation to other implementations.

Mark-Simulacrum · 2023-01-29T19:40:17Z

Please mark with @rustbot ready when this is ready for review -- looks like maybe some dependency upgrades are still in progress?

stlankes · 2023-01-29T21:18:25Z

Ok, I will do it. However is-terminal depends on io-lifetimes. To update io-lifetimes I need the fd traits from the current PR. (hermit-os/io-lifetimes@dd05273).

stlankes · 2023-01-31T14:13:23Z

@Mark-Simulacrum If I understand it correctly, atty is not longer maintained and not all crates moved to is-terminal. In addition, is-terminal depends indirectly from this PR (see above). How do you handle it?

Mark-Simulacrum · 2023-01-31T16:47:21Z

@rustbot ready

Mark-Simulacrum · 2023-02-12T19:47:14Z

@bjorn3 is there a reason I'm missing we shouldn't just land this PR, and then follow-up with dropping hermit-abi dependencies once the ecosystem syncs back up?

bjorn3 · 2023-02-12T20:01:15Z

That would work.

The changes in files not specific to hermit look correct to me. For the hermit specific files I didn't notice anything obviously wrong, but also didn't review it as closely. Given that RustyHermit is a tier 3 target and the PR author is a maintainer of RustyHermit, I think this is fine.

@bors r+

bors · 2023-02-12T20:01:16Z

📌 Commit dd270f1f440831cd4b491185b2fa2c35b6bfd503 has been approved by bjorn3

It is now in the queue for this repository.

bors · 2023-02-12T21:19:35Z

⌛ Testing commit dd270f1f440831cd4b491185b2fa2c35b6bfd503 with merge 3103afcd69f7155552cd4c91f644f1c2c4a8628c...

bors · 2023-02-18T12:53:03Z

💔 Test failed - checks-actions

mkroening · 2023-02-24T12:20:03Z

library/std/src/os/fd/raw.rs

+#[cfg(target_os = "hermit")]
+use hermit_abi::{STDERR_FILENO, STDIN_FILENO, STDOUT_FILENO};
+#[cfg(not(target_os = "hermit"))]
+use libc::{STDERR_FILENO, STDIN_FILENO, STDOUT_FILENO};


The CI issue happens when documenting std on Windows. std::os::fd exists even on Windows with cfg(doc). We might work around like this:

Suggested change

#[cfg(target_os = "hermit")]

use hermit_abi::{STDERR_FILENO, STDIN_FILENO, STDOUT_FILENO};

#[cfg(not(target_os = "hermit"))]

use libc::{STDERR_FILENO, STDIN_FILENO, STDOUT_FILENO};

#[cfg(target_os = "hermit")]

use hermit_abi as libc;

This, together with changing the FILENOs back to libc::*_FILENO, should solve the windows docs issue.

rustbot · 2023-02-24T14:27:51Z

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

RustHermit publishs a new kernel interface and supports a common BSD socket layer. By supporting this interface, the implementation can be harmonized to other operating systems. To realize this socket layer, the handling of file descriptors is also harmonized to other operating systems.

By moving the IO traits, the RustyHermit support is harmonized to of other operating systems.

stlankes · 2023-02-24T14:33:24Z

@bjorn3 I think that @mkroening's comment is correct. The documentation was broken.

bjorn3 · 2023-02-25T17:23:52Z

@bors r+

bors · 2023-02-25T17:23:55Z

📌 Commit af8ee64 has been approved by bjorn3

It is now in the queue for this repository.

bors · 2023-02-25T19:43:04Z

⌛ Testing commit af8ee64 with merge 34e6673...

bors · 2023-02-25T23:15:03Z

☀️ Test successful - checks-actions
Approved by: bjorn3
Pushing 34e6673 to master...

rust-timer · 2023-02-26T00:55:58Z

Finished benchmarking commit (34e6673): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

dependencies: reduce the amount of crates pulling in atty It would be nice to have only one `hermit-abi` in `Cargo.lock` (rust-lang#107405 (comment)). The only crate pulling in the old `hermit-abi` version is `atty`, which is unmaintained. This PR upgrades three dependencies, which then no longer depend on `atty`: * `Cargo.lock`: `colored v2.0.0 -> v2.0.4` * `Cargo.lock`: `tracing-tree v0.2.3 -> v0.2.4` * Miri: `env_logger 0.9.3 -> 0.10.0` The only dependency chain left that pulls in `hermit-abi 0.1.19` is: `hermit-abi 0.1.19` -> `atty 0.2.14` -> `env_logger 0.7.1` -> `jsonpath_lib 0.2.6` -> `jsondocck 0.1.0` (src/tools/jsondocck) Replacing jsondocck with jsondocckng is tracked in rust-lang#94140.

dependencies: reduce the amount of crates pulling in atty It would be nice to have only one `hermit-abi` in `Cargo.lock` (rust-lang/rust#107405 (comment)). The only crate pulling in the old `hermit-abi` version is `atty`, which is unmaintained. This PR upgrades three dependencies, which then no longer depend on `atty`: * `Cargo.lock`: `colored v2.0.0 -> v2.0.4` * `Cargo.lock`: `tracing-tree v0.2.3 -> v0.2.4` * Miri: `env_logger 0.9.3 -> 0.10.0` The only dependency chain left that pulls in `hermit-abi 0.1.19` is: `hermit-abi 0.1.19` -> `atty 0.2.14` -> `env_logger 0.7.1` -> `jsonpath_lib 0.2.6` -> `jsondocck 0.1.0` (src/tools/jsondocck) Replacing jsondocck with jsondocckng is tracked in rust-lang/rust#94140.

rustbot assigned Mark-Simulacrum Jan 28, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jan 28, 2023

bjorn3 reviewed Jan 28, 2023

View reviewed changes

This was referenced Jan 28, 2023

increase version number of hermit-abi seanmonstar/num_cpus#129

Closed

increase version number of hermit-abi softprops/atty#59

Closed

stlankes force-pushed the bsd branch 2 times, most recently from ce31f74 to 68cef7c Compare January 29, 2023 15:10

This comment has been minimized.

Sign in to view

stlankes mentioned this pull request Jan 29, 2023

Bump hermit-abi to 0.3.0 and don't restrict hermit-abi architectures seanmonstar/num_cpus#128

Merged

stlankes force-pushed the bsd branch from 68cef7c to dd270f1 Compare January 29, 2023 17:37

Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 29, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 31, 2023

Mark-Simulacrum assigned bjorn3 and unassigned Mark-Simulacrum Feb 12, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 12, 2023

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 18, 2023

This comment has been minimized.

Sign in to view

erikdesjardins mentioned this pull request Feb 19, 2023

CI: spurious error building LLVM on mingw: ranlib.exe: could not create temporary file whilst writing archive: no more archived files #108227

Open

mkroening reviewed Feb 24, 2023

View reviewed changes

stlankes added 4 commits February 24, 2023 15:30

move IO traits to std/src/os/hermit

b5fb4f3

By moving the IO traits, the RustyHermit support is harmonized to of other operating systems.

remove code duplications

90162a7

avoid the usage of libc during the creation of documentation

af8ee64

stlankes force-pushed the bsd branch from 104a3ba to af8ee64 Compare February 24, 2023 14:30

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 25, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 25, 2023

bors merged commit 34e6673 into rust-lang:master Feb 25, 2023

rustbot added this to the 1.69.0 milestone Feb 25, 2023

This was referenced Feb 25, 2023

Add initial libstd support for Xous #104101

Merged

Add Minimal Std implementation for UEFI #105861

Merged

Use random HashMap keys on Hermit #107387

Merged

mkroening deleted the bsd branch February 25, 2023 23:58

mkroening mentioned this pull request Sep 19, 2023

dependencies: reduce the amount of crates pulling in atty #115975

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add support of RustyHermit's BSD socket layer #107405

add support of RustyHermit's BSD socket layer #107405

stlankes commented Jan 28, 2023

rustbot commented Jan 28, 2023

rustbot commented Jan 28, 2023

bjorn3 Jan 28, 2023

stlankes Jan 28, 2023

stlankes commented Jan 28, 2023

This comment has been minimized.

Mark-Simulacrum commented Jan 29, 2023

stlankes commented Jan 29, 2023

stlankes commented Jan 31, 2023

Mark-Simulacrum commented Jan 31, 2023

Mark-Simulacrum commented Feb 12, 2023

bjorn3 commented Feb 12, 2023

bors commented Feb 12, 2023

bors commented Feb 12, 2023

bors commented Feb 18, 2023

This comment has been minimized.

mkroening Feb 24, 2023

rustbot commented Feb 24, 2023

stlankes commented Feb 24, 2023

bjorn3 commented Feb 25, 2023

bors commented Feb 25, 2023

bors commented Feb 25, 2023

bors commented Feb 25, 2023

rust-timer commented Feb 26, 2023

add support of RustyHermit's BSD socket layer #107405

add support of RustyHermit's BSD socket layer #107405

Conversation

stlankes commented Jan 28, 2023

rustbot commented Jan 28, 2023

rustbot commented Jan 28, 2023

bjorn3 Jan 28, 2023

Choose a reason for hiding this comment

stlankes Jan 28, 2023

Choose a reason for hiding this comment

stlankes commented Jan 28, 2023

This comment has been minimized.

Mark-Simulacrum commented Jan 29, 2023

stlankes commented Jan 29, 2023

stlankes commented Jan 31, 2023

Mark-Simulacrum commented Jan 31, 2023

Mark-Simulacrum commented Feb 12, 2023

bjorn3 commented Feb 12, 2023

bors commented Feb 12, 2023

bors commented Feb 12, 2023

bors commented Feb 18, 2023

This comment has been minimized.

mkroening Feb 24, 2023

Choose a reason for hiding this comment

rustbot commented Feb 24, 2023

stlankes commented Feb 24, 2023

bjorn3 commented Feb 25, 2023

bors commented Feb 25, 2023

bors commented Feb 25, 2023

bors commented Feb 25, 2023

rust-timer commented Feb 26, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles