Skip to content

Conversation

riking
Copy link
Contributor

@riking riking commented Nov 30, 2021

The protocol uses leases, the Rust code uses borrows.

Copy link
Collaborator

@cbiffle cbiffle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello! Thanks for fixing some stuff! I'm going to merge 2/3 of this. Comments below.

@@ -272,7 +272,7 @@ A concrete mapping of these operations to IPCs might go as follows.

- Message is a four-byte struct containing `fd` as a little-endian `u32`. Borrow
0 is `buffer` and must be writable.
- Data will be written to a prefix of borrow 0, starting at offset 0.
- Data will be written to a prefix of lease 0, starting at offset 0.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both are technically correct here, since "borrow" is the term used at the server side, while "lease" is from the client's perspective. I'm happy to accept this change though since this section is a little informal, and the old usage clearly surprised you.

@@ -309,7 +309,7 @@ fn read(task: TaskId, fd: u32, buffer: &mut [u8]) -> Result<usize, IoError> {
let (rc, len) = sys_send(
task,
0,
&u32.to_le_bytes(),
&fd.to_le_bytes(),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heh, nice.

doc/timers.adoc Outdated
@@ -35,7 +35,7 @@ Each task gets a timer. The timer has three properties:
- A _notification set._

At periodic intervals (ticks), if the enable bit is set, the kernel checks the
deadline to see if it is in the future. If not (it is `<=` the current time),
deadline to see if it is in the future. If not (it is \<=; the current time),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry to round trip this again, but, \<=; produces &lt;=; in the HTML output -- this needs to be just \<= without the semicolon.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops. Done

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might want to keep the backticks here.
See this example: https://gist.github.com/fernandogmo/34032124e94c6b383277decd8631c687

@cbiffle cbiffle merged commit f955b9c into oxidecomputer:master Dec 7, 2021
@riking riking deleted the patchh-1 branch December 29, 2021 02:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants