Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix some typos #145

Merged
merged 1 commit into from Jun 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -214,11 +214,11 @@ You can now access the files in SHARED_DIRECTORY under the virtiofs tag like `/m

## Use RustyHermit for C/C++, Go, and Fortran applications

If you are interested to build C/C++, Go, and Fortran applications on top of a Rust-based library operating systen, please take a look at [https://github.com/hermitcore/hermit-playground](https://github.com/hermitcore/hermit-playground).
If you are interested to build C/C++, Go, and Fortran applications on top of a Rust-based library operating system, please take a look at [https://github.com/hermitcore/hermit-playground](https://github.com/hermitcore/hermit-playground).

## Missing features

* Multikernel support (might be comming)
* Multikernel support (might be coming)
* Virtio support (partly available)
* Network support (partly available)

Expand Down
8 changes: 4 additions & 4 deletions benches/netbench/README.md
Expand Up @@ -28,13 +28,13 @@ For both programs, you can run them the same way. We will use `bw` as example. T
#### Instructions

1) Run server
- Go on the machine where you wanna launch the server (or ssh into it)
- Go on the machine where you want to launch the server (or ssh into it)
- Open a terminal
- `cd` into the inner `code` folder
- Run `cargo run --bin server-bw --release` (or compile and run, meaning `cargo build --bin server-bw --release` and once compiled `./target/release/server-bw`). You can specify the port you wanna listen on with `-p <port_number>`.
- Run `cargo run --bin server-bw --release` (or compile and run, meaning `cargo build --bin server-bw --release` and once compiled `./target/release/server-bw`). You can specify the port you want to listen on with `-p <port_number>`.

2) Run client
- Go on the machine where you wanna launch the client (or ssh into it)
- Go on the machine where you want to launch the client (or ssh into it)
- Open a terminal
- `cd` into the inner `code` folder
- Run `cargo run --bin client-bw --release` (or compile and run, meaning `cargo build --bin client-bw --release` and once compiled `./target/release/client-bw`). You can specify a bunch of parameters. Run the program with the `-h` option to see available params. Make sure you specify the right address and port to connect to the server, using parameters `-a <address> -p <port>`.
Expand All @@ -52,7 +52,7 @@ The config file is important because it will contain a bunch of things like mach

#### Prerequisites

- Make sure you can ssh into the machines you wanna use for your benchmark
- Make sure you can ssh into the machines you want to use for your benchmark.
- Make sure you have set up the ssh connections correctly and have the machines in your known host and have the ssh keys somewhere in your pc (or the machine you will start the script from).

#### Instructions
Expand Down
6 changes: 3 additions & 3 deletions benches/netbench/src/config.rs
Expand Up @@ -32,7 +32,7 @@ pub fn parse_config() -> Config {
.short("p")
.long("port")
.value_name("port")
.help("port to connect to, like port 7878 if you wanna connect to 127.0.0.1:7878")
.help("port to connect to, like port 7878 if you want to connect to 127.0.0.1:7878")
.takes_value(true)
.default_value("7878"),
)
Expand Down Expand Up @@ -113,14 +113,14 @@ pub fn parse_config() -> Config {
// Don't kill machines
if n_bytes > 100_000_000 {
panic!(
"More than 100 MB per round is probably too much data you wanna send, \
"More than 100 MB per round is probably too much data you want to send, \
you may kill one of the machines. Try with maybe 100MB but more rounds"
)
}

// Very improbable case error handling
if (n_bytes * 1000000) as u128 * n_rounds as u128 > u64::max_value().into() {
panic!("There's gonna be too much data. Make sure n_bytes * n_rounds is < u128::MAX")
panic!("There's going to be too much data. Make sure n_bytes * n_rounds is < u128::MAX")
}

Config {
Expand Down
2 changes: 1 addition & 1 deletion hermit-abi/src/lib.rs
Expand Up @@ -119,7 +119,7 @@ pub fn isatty(_fd: libc::c_int) -> bool {
false
}

/// intialize the network stack
/// initialize the network stack
pub fn network_init() -> i32 {
unsafe { sys_network_init() }
}
Expand Down
2 changes: 1 addition & 1 deletion hermit-sys/Cargo.toml
Expand Up @@ -15,7 +15,7 @@ documentation = "https://hermitcore.github.io/rusty-hermit/hermit_sys"

[features]
default = ["pci", "acpi", "smp", "fsgsbase"]
# controlls whether RustyHermit is build with -Z instrument-mcount
# controls whether RustyHermit is build with -Z instrument-mcount
instrument = ["rftrace"]
trace = []
fsgsbase = []
Expand Down
2 changes: 1 addition & 1 deletion hermit-sys/build.rs
Expand Up @@ -190,7 +190,7 @@ fn rename_symbol(symbol: impl AsRef<OsStr>, lib: impl AsRef<Path>) {
.arg(lib.as_ref())
.status()
.expect("failed to execute llvm-objcopy");
assert!(status.success(), "llvm-objcopy was not sucessful");
assert!(status.success(), "llvm-objcopy was not successful");
}

#[cfg(all(not(feature = "rustc-dep-of-std"), not(feature = "with_submodule")))]
Expand Down