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.

Sign up for GitHub

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

Jump to bottom

Use an RAII wrapper for stdio redirection #260

Merged
merged 2 commits into from
Aug 23, 2023
Merged

Use an RAII wrapper for stdio redirection #260

merged 2 commits into from
Aug 23, 2023

Conversation

jprendes
Copy link
Collaborator

This PR introduces an RAII wrapper to hande stdio redirection.
The wrapper handles the lifetime of the file descriptors involved.
It also introduces Windows support for stdio redirection.

@jprendes jprendes marked this pull request as ready for review August 21, 2023 22:01
@jprendes jprendes force-pushed the stdio branch 2 times, most recently from 394b86c to 439c34f Compare August 21, 2023 22:50
Mossaka
Mossaka previously approved these changes Aug 21, 2023
View reviewed changes
Copy link
Member

@Mossaka Mossaka left a comment

Choose a reason for hiding this comment

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

LGTM! Asked a few questions

crates/containerd-shim-wasm/src/sandbox/sys/unix/stdio.rs Outdated Show resolved Hide resolved
crates/containerd-shim-wasm/src/sandbox/stdio.rs Show resolved Hide resolved
jsturtevant
jsturtevant reviewed Aug 21, 2023
View reviewed changes
crates/containerd-shim-wasm/src/sandbox/sys/windows/stdio.rs Outdated Show resolved Hide resolved
crates/containerd-shim-wasm/src/sandbox/sys/unix/stdio.rs Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

I put the sys folder up at the /src/ folder level in #238. thoughts on which level it should be on?

crates/containerd-shim-wasm/src/sandbox/sys/windows/stdio.rs Outdated Show resolved Hide resolved
@jprendes jprendes closed this Aug 22, 2023
@jprendes jprendes reopened this Aug 22, 2023
Mossaka
Mossaka previously approved these changes Aug 22, 2023
View reviewed changes
@Mossaka
Copy link
Member

Mossaka commented Aug 22, 2023

Need a rebase

Mossaka
Mossaka previously approved these changes Aug 22, 2023
View reviewed changes
Copy link
Member

@Mossaka Mossaka left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks

@jsturtevant
Copy link
Contributor

is #260 (comment) the location we want? otherwise lgtm

@jprendes
Copy link
Collaborator Author

is #260 (comment) the location we want? otherwise lgtm

I'll fix that tomorrow. I'm AFK.

@jprendes jprendes force-pushed the stdio branch 2 times, most recently from 4d249b0 to cd56547 Compare August 23, 2023 13:33
@jprendes
remorganize sys mod
7a63fd2 
Signed-off-by: Jorge Prendes <[email protected]>
@jprendes
Copy link
Collaborator Author

jprendes commented Aug 23, 2023 •
edited
Loading

I moved the stio within the sys module from #238 . I also took the opportunity to split up the sys modules into smaller submodules and make it only pub(crate).

@jprendes jprendes force-pushed the stdio branch 2 times, most recently from 436c505 to 569f8e3 Compare August 23, 2023 15:03
@Mossaka Mossaka merged commit 153fbc3 into containerd:main Aug 23, 2023
9 checks passed
@jprendes jprendes mentioned this pull request Aug 29, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mossaka Mossaka Mossaka approved these changes

@jsturtevant jsturtevant Awaiting requested review from jsturtevant

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jprendes @Mossaka @jsturtevant