Skip to content

Commit

Permalink
fusefs: minor refactor in the tests
Browse files Browse the repository at this point in the history
Do more work in MockFS's constructor's member initializer list, instead
of the body of the constructor.  It's easier to read this way.

Sponsored by:	ConnectWise
  • Loading branch information
asomers committed Dec 24, 2024
1 parent 2ed24e2 commit 3f83f32
Showing 1 changed file with 12 additions and 18 deletions.
30 changes: 12 additions & 18 deletions tests/sys/fs/fusefs/mockfs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -421,28 +421,25 @@ MockFS::MockFS(int max_readahead, bool allow_other, bool default_permissions,
uint32_t kernel_minor_version, uint32_t max_write, bool async,
bool noclusterr, unsigned time_gran, bool nointr, bool noatime,
const char *fsname, const char *subtype)
: m_uniques(new std::unordered_set<uint64_t>)
: m_daemon_id(NULL),
m_kernel_minor_version(kernel_minor_version),
m_kq(pm == KQ ? kqueue() : -1),
m_maxreadahead(max_readahead),
m_pid(getpid()),
m_uniques(new std::unordered_set<uint64_t>),
m_pm(pm),
m_time_gran(time_gran),
m_child_pid(-1),
m_maxwrite(MIN(max_write, max_max_write)),
m_nready(-1),
m_quit(false)
{
struct sigaction sa;
struct iovec *iov = NULL;
int iovlen = 0;
char fdstr[15];
const bool trueval = true;

m_daemon_id = NULL;
m_kernel_minor_version = kernel_minor_version;
m_maxreadahead = max_readahead;
m_maxwrite = MIN(max_write, max_max_write);
m_nready = -1;
m_pm = pm;
m_time_gran = time_gran;
m_quit = false;

if (m_pm == KQ)
m_kq = kqueue();
else
m_kq = -1;

/*
* Kyua sets pwd to a testcase-unique tempdir; no need to use
* mkdtemp
Expand All @@ -467,9 +464,6 @@ MockFS::MockFS(int max_readahead, bool allow_other, bool default_permissions,
throw(std::system_error(errno, std::system_category(),
"Couldn't open /dev/fuse"));

m_pid = getpid();
m_child_pid = -1;

build_iovec(&iov, &iovlen, "fstype", __DECONST(void *, "fusefs"), -1);
build_iovec(&iov, &iovlen, "fspath",
__DECONST(void *, "mountpoint"), -1);
Expand Down

0 comments on commit 3f83f32

Please sign in to comment.