-
Notifications
You must be signed in to change notification settings - Fork 7
feat: add V2/INVALIDATE_PATH socket message for cache invalidation #48
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
Open
flash7777
wants to merge
2
commits into
opencloud-eu:main
Choose a base branch
from
flash7777:feature/invalidate-entry
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -147,6 +147,9 @@ std::string getcallername(fuse_context *context) | |
| static SharedMap _jobs; | ||
| static SocketThread _socketThread("SocketThread", _jobs); | ||
|
|
||
| // Global fuse pointer for invalidation from socket thread | ||
| static struct fuse *_fuseInstance = nullptr; | ||
|
|
||
| static int _transfer_id{12}; | ||
|
|
||
|
|
||
|
|
@@ -178,6 +181,12 @@ static void *openVFSfuse_init(struct fuse_conn_info *, fuse_config *) | |
| { | ||
| openvfsfuse_log("/path", "_init", 1, "**** INIT called"); | ||
|
|
||
| // Store fuse instance for invalidation from socket thread | ||
| auto *ctx = fuse_get_context(); | ||
| if (ctx) { | ||
| _fuseInstance = ctx->fuse; | ||
| } | ||
|
|
||
| return NULL; | ||
| } | ||
|
|
||
|
|
@@ -725,6 +734,22 @@ static int openVFSfuse_removexattr(const char *orig_path, const char *name) | |
| return Xattr::removexattr(path, name); | ||
| } | ||
|
|
||
| void openvfsfuse_invalidate_path(const std::string &path) | ||
| { | ||
| auto *ctx = fuse_get_context(); | ||
| if (!ctx || !ctx->fuse) { | ||
| return; | ||
| } | ||
| const auto fusePath = getInternalPath(path); | ||
| std::string fuseStr = "/" + fusePath.string(); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you please put that behind a function |
||
| int res = fuse_invalidate_path(ctx->fuse, fuseStr.c_str()); | ||
| if (res == 0 || res == -ENOENT) { | ||
| openvfsfuse_log(fuseStr, "invalidate", 0, "path invalidated"); | ||
| } else { | ||
| openvfsfuse_log(fuseStr, "invalidate", res, "invalidate failed"); | ||
| } | ||
| } | ||
|
|
||
| int initializeOpenVFSFuse(openVFSfuse_Args &openVFSArgs) | ||
| { | ||
| const auto contextInstance = std::make_unique<VFSFuseContext>(openVFSArgs); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't you completely get rid of the
_fuseInstancevar by callingfuse_get_context()->fuse?