TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-14 06:48:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle exceptions safely in FUSE driver

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2020-12-15 10:12:46 +01:00
parent 3c0b78e61f
commit ddf52b2a44
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/dwarfs.cpp
View File

@ -582,11 +582,7 @@ int run_fuse(struct fuse_args& args, char* mountpoint, int mt, int fg) {
#endif #endif
} // namespace dwarfs int run_dwarfs(int argc, char* argv[]) {
int main(int argc, char* argv[]) {
using namespace dwarfs;
struct fuse_args args = FUSE_ARGS_INIT(argc, argv); struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
s_opts.progname = argv[0]; s_opts.progname = argv[0];
@ -618,28 +614,34 @@ int main(int argc, char* argv[]) {
} }
#endif #endif
// TODO: foreground mode, stderr vs. syslog? try {
s_opts.debuglevel = s_opts.debuglevel_str // TODO: foreground mode, stderr vs. syslog?
? logger::parse_level(s_opts.debuglevel_str) s_opts.debuglevel = s_opts.debuglevel_str
: logger::INFO; ? logger::parse_level(s_opts.debuglevel_str)
: logger::INFO;
s_lgr.set_threshold(s_opts.debuglevel); s_lgr.set_threshold(s_opts.debuglevel);
s_lgr.set_with_context(s_opts.debuglevel >= logger::DEBUG); s_lgr.set_with_context(s_opts.debuglevel >= logger::DEBUG);
LOG_PROXY(debug_logger_policy, s_lgr); LOG_PROXY(debug_logger_policy, s_lgr);
s_opts.cachesize = s_opts.cachesize_str s_opts.cachesize = s_opts.cachesize_str
? parse_size_with_unit(s_opts.cachesize_str) ? parse_size_with_unit(s_opts.cachesize_str)
: (static_cast<size_t>(512) << 20); : (static_cast<size_t>(512) << 20);
s_opts.workers = s_opts.workers =
s_opts.workers_str ? folly::to<size_t>(s_opts.workers_str) : 2; s_opts.workers_str ? folly::to<size_t>(s_opts.workers_str) : 2;
s_opts.lock_mode = s_opts.lock_mode = s_opts.mlock_str ? parse_mlock_mode(s_opts.mlock_str)
s_opts.mlock_str ? parse_mlock_mode(s_opts.mlock_str) : mlock_mode::NONE; : mlock_mode::NONE;
s_opts.decompress_ratio = s_opts.decompress_ratio_str s_opts.decompress_ratio =
? folly::to<double>(s_opts.decompress_ratio_str) s_opts.decompress_ratio_str
: 0.8; ? folly::to<double>(s_opts.decompress_ratio_str)
: 0.8;
LOG_INFO << "dwarfs (" << DWARFS_VERSION << ", fuse version " LOG_INFO << "dwarfs (" << DWARFS_VERSION << ", fuse version "
<< FUSE_USE_VERSION << ")"; << FUSE_USE_VERSION << ")";
} catch (runtime_error const& e) {
std::cerr << "error: " << e.what() << std::endl;
return 1;
}
if (!s_opts.seen_mountpoint) { if (!s_opts.seen_mountpoint) {
usage(s_opts.progname); usage(s_opts.progname);
@ -653,3 +655,9 @@ int main(int argc, char* argv[]) {
return run_fuse(args, mountpoint, mt, fg); return run_fuse(args, mountpoint, mt, fg);
#endif #endif
} }
} // namespace dwarfs
int main(int argc, char* argv[]) {
return dwarfs::safe_main([&] { return dwarfs::run_dwarfs(argc, argv); });
}