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

Macos passthrough implementation #182

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Macos passthrough implementation #182

wants to merge 9 commits into from

Conversation

akitaSummer
Copy link
Contributor

No description provided.

@imeoer
Copy link
Collaborator

imeoer commented Jan 15, 2024

@akitaSummer Some CI tests failed, PTAL. :)

@akitaSummer
feat: init macos passthrough
0eb26a0 
Signed-off-by: akitaSummer <[email protected]>
@akitaSummer
feat: add mac mod ut
5101a36 
Signed-off-by: akitaSummer <[email protected]>
@akitaSummer
feat: add macos sync io
d33ff9c 
Signed-off-by: akitaSummer <[email protected]>
@akitaSummer
fix: fix CI
28f93e3 
Signed-off-by: akitaSummer <[email protected]>
@akitaSummer
Copy link
Contributor Author

@imeoer Please help me try CI again

@akitaSummer akitaSummer force-pushed the macos_passthrough branch 2 times, most recently from 92e4739 to fe23c44 Compare January 16, 2024 02:41
WeiZhang555
WeiZhang555 reviewed Jan 19, 2024
View reviewed changes
Copy link
Collaborator

@WeiZhang555 WeiZhang555 left a comment

Choose a reason for hiding this comment

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

There're lots of #[cfg(target_os = "macos")] here and there, spreading all across several files, is that possible to split them to different files?

Similar to

src/abi/
  |- fuse_abi_linux.rs
  |- fuse_abi_macos.rs

There should be a balance between code readability and code redundancy.

src/passthrough/inode_store.rs Outdated Show resolved Hide resolved
@akitaSummer akitaSummer force-pushed the macos_passthrough branch 2 times, most recently from e1ceb1d to 2318011 Compare January 20, 2024 17:13
@akitaSummer
refactor: split some logic
fbd70b9 
Signed-off-by: akitaSummer <[email protected]>
WeiZhang555
WeiZhang555 requested changes Jan 23, 2024
View reviewed changes
Copy link
Collaborator

@WeiZhang555 WeiZhang555 left a comment

Choose a reason for hiding this comment

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

Some comments, most part LGTM.

I'm not familiar with MacOS apis, it's better to involve more maintainers to do double check.

src/passthrough/file_handle.rs Outdated
use nix::unistd::getuid;
use std::ffi::CString;
#[cfg(target_os = "macos")]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Modification to this files seems unnecessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Copy link
Collaborator

Choose a reason for hiding this comment

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

getuid and Read was never used even on macos platform, so I think you can remove these two lines safely:

use nix::unistd::getuid;
use std::io::Read;

src/passthrough/passthrough_fs_linux.rs Outdated Show resolved Hide resolved
src/passthrough/passthrough_fs_linux.rs Outdated Show resolved Hide resolved
src/passthrough/passthrough_fs_linux.rs Outdated Show resolved Hide resolved
src/passthrough/passthrough_fs_linux.rs Show resolved Hide resolved
src/passthrough/passthrough_fs_macos.rs Outdated Show resolved Hide resolved
src/passthrough/passthrough_fs_macos.rs Outdated Show resolved Hide resolved
src/passthrough/sync_io_linux.rs Outdated Show resolved Hide resolved
src/passthrough/sync_io_macos.rs Outdated Show resolved Hide resolved
src/passthrough/sync_io_macos.rs Outdated Show resolved Hide resolved
@akitaSummer
fix: fix cr
6e88bd8 
Signed-off-by: akitaSummer <[email protected]>
WeiZhang555
WeiZhang555 reviewed Feb 6, 2024
View reviewed changes
src/passthrough/file_handle.rs Outdated
use nix::unistd::getuid;
use std::ffi::CString;
#[cfg(target_os = "macos")]
Copy link
Collaborator

Choose a reason for hiding this comment

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

getuid and Read was never used even on macos platform, so I think you can remove these two lines safely:

use nix::unistd::getuid;
use std::io::Read;

src/passthrough/stat.rs
@@ -0,0 +1,40 @@
use std::{
Copy link
Collaborator

Choose a reason for hiding this comment

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

Missing lisence header.

src/passthrough/sync_io_linux.rs
@@ -0,0 +1,137 @@
use std::{
Copy link
Collaborator

Choose a reason for hiding this comment

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

Missing lisence header

src/passthrough/sync_io_macos.rs
@@ -0,0 +1,120 @@
use std::{
Copy link
Collaborator

Choose a reason for hiding this comment

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

Missing lisence header.

@akitaSummer akitaSummer force-pushed the macos_passthrough branch 2 times, most recently from 8aba2cd to e4980d0 Compare February 17, 2024 15:12
@akitaSummer
fix: fix readdir libc bug
85fe445 
Signed-off-by: akitaSummer <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WeiZhang555 WeiZhang555 WeiZhang555 requested changes

@bergwolf bergwolf Awaiting requested review from bergwolf bergwolf is a code owner

@imeoer imeoer Awaiting requested review from imeoer imeoer is a code owner

@jiangliu jiangliu Awaiting requested review from jiangliu

@liubogithub liubogithub Awaiting requested review from liubogithub liubogithub is a code owner

@eryugey eryugey Awaiting requested review from eryugey eryugey is a code owner

Requested changes must be addressed to merge this pull request.

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
@akitaSummer @imeoer @WeiZhang555