hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Since our threads now work well with fork(), we can remove the workarounds

Browse Source
This commit is contained in:
Sebastian Messmer 2015-10-28 15:27:30 +01:00
parent bac18cfbfc
commit dd4c9cbf4b
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main.cpp
View File

@ -44,7 +44,6 @@ using boost::none;
//TODO Did deadlock in bonnie++ second run (in the create files sequentially) - maybe also in a later run or different step? //TODO Did deadlock in bonnie++ second run (in the create files sequentially) - maybe also in a later run or different step?
//TODO Improve error message when root blob wasn't found. //TODO Improve error message when root blob wasn't found.
//TODO Replace ASSERTs with other error handling when it is not a programming error but an environment influence (e.g. a block is missing) //TODO Replace ASSERTs with other error handling when it is not a programming error but an environment influence (e.g. a block is missing)
//TODO When creating a new filesystem, we need 2x kill to kill the process (probably because we access random values before daemonizing)
//TODO Fuse error messages like "fuse: bad mount point `...': Transport endpoint is not connected" go missing when running in background //TODO Fuse error messages like "fuse: bad mount point `...': Transport endpoint is not connected" go missing when running in background
void showVersion() { void showVersion() {
@ -109,9 +108,11 @@ CryConfigFile loadOrCreateConfig(const ProgramOptions &options) {
void runFilesystem(const ProgramOptions &options) { void runFilesystem(const ProgramOptions &options) {
auto config = loadOrCreateConfig(options); auto config = loadOrCreateConfig(options);
//TODO This daemonize causes error messages from CryDevice initialization to get lost. auto blockStore = make_unique_ref<OnDiskBlockStore>(bf::path(options.baseDir()));
// However, initializing CryDevice might (?) already spawn threads and we have to do daemonization before that CryDevice device(std::move(config), std::move(blockStore));
// because it doesn't fork threads. What to do? fspp::FilesystemImpl fsimpl(&device);
fspp::fuse::Fuse fuse(&fsimpl);
if (!options.foreground()) { if (!options.foreground()) {
cpputils::daemonize(); cpputils::daemonize();
if (options.logFile() == none) { if (options.logFile() == none) {
@ -119,10 +120,6 @@ void runFilesystem(const ProgramOptions &options) {
cpputils::logging::setLogger(spdlog::syslog_logger("cryfs", "cryfs", LOG_PID)); cpputils::logging::setLogger(spdlog::syslog_logger("cryfs", "cryfs", LOG_PID));
} }
} }
auto blockStore = make_unique_ref<OnDiskBlockStore>(bf::path(options.baseDir()));
CryDevice device(std::move(config), std::move(blockStore));
fspp::FilesystemImpl fsimpl(&device);
fspp::fuse::Fuse fuse(&fsimpl);
vector<char*> fuseOptions = options.fuseOptions(); vector<char*> fuseOptions = options.fuseOptions();
std::cout << "\nFilesystem is running." << std::endl; std::cout << "\nFilesystem is running." << std::endl;

10
test/program_options/ParserTest.cpp
View File

@ -13,30 +13,28 @@ public:
} }
}; };
class ProgramOptionsParserDeathTest: public ProgramOptionsParserTest {}; TEST_F(ProgramOptionsParserTest, MissingAllOptions) {
TEST_F(ProgramOptionsParserDeathTest, MissingAllOptions) {
EXPECT_DEATH( EXPECT_DEATH(
parse({"./myExecutable"}), parse({"./myExecutable"}),
"Usage:" "Usage:"
); );
} }
TEST_F(ProgramOptionsParserDeathTest, MissingDir) { TEST_F(ProgramOptionsParserTest, MissingDir) {
EXPECT_DEATH( EXPECT_DEATH(
parse({"./myExecutable", "/home/user/baseDir"}), parse({"./myExecutable", "/home/user/baseDir"}),
"Usage:" "Usage:"
); );
} }
TEST_F(ProgramOptionsParserDeathTest, HelpLongOption) { TEST_F(ProgramOptionsParserTest, HelpLongOption) {
EXPECT_DEATH( EXPECT_DEATH(
parse({"./myExecutable", "--help"}), parse({"./myExecutable", "--help"}),
"Usage:" "Usage:"
); );
} }
TEST_F(ProgramOptionsParserDeathTest, HelpShortOption) { TEST_F(ProgramOptionsParserTest, HelpShortOption) {
EXPECT_DEATH( EXPECT_DEATH(
parse({"./myExecutable", "-h"}), parse({"./myExecutable", "-h"}),
"Usage:" "Usage:"