openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Stops the loop when all files are closed."

This commit is contained in:
Treehugger Robot 2016-11-17 02:49:05 +00:00 committed by Gerrit Code Review
parent e631e470e0 30e6808895
commit d8d7fc6717
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libappfuse/FuseBridgeLoop.cc
View File

@ -26,6 +26,7 @@ bool FuseBridgeLoop::Start(
base::unique_fd dev_fd(raw_dev_fd);
base::unique_fd proxy_fd(raw_proxy_fd);
fuse::FuseBuffer buffer;
size_t open_count = 0;
LOG(DEBUG) << "Start fuse loop.";
while (true) {
@ -71,8 +72,26 @@ bool FuseBridgeLoop::Start(
return false;
}
if (opcode == FUSE_INIT) {
callback->OnMount();
switch (opcode) {
case FUSE_INIT:
callback->OnMount();
break;
case FUSE_OPEN:
if (buffer.response.header.error == fuse::kFuseSuccess) {
open_count++;
}
break;
case FUSE_RELEASE:
if (open_count != 0) {
open_count--;
} else {
LOG(WARNING) << "Unexpected FUSE_RELEASE before opening a file.";
break;
}
if (open_count == 0) {
return true;
}
break;
}
}
}

9
libappfuse/tests/FuseBridgeLoopTest.cc
View File

@ -200,11 +200,16 @@ TEST_F(FuseBridgeLoopTest, FuseNotImpl) {
TEST_F(FuseBridgeLoopTest, Proxy) {
CheckProxy(FUSE_LOOKUP);
CheckProxy(FUSE_GETATTR);
CheckProxy(FUSE_OPEN);
CheckProxy(FUSE_READ);
CheckProxy(FUSE_WRITE);
CheckProxy(FUSE_RELEASE);
CheckProxy(FUSE_FSYNC);
// Invoke FUSE_OPEN and FUSE_RELEASE at last as the loop will exit when all files are closed.
CheckProxy(FUSE_OPEN);
CheckProxy(FUSE_RELEASE);
// Ensure the loop exits.
Close();
}
} // namespace fuse