snapuserd: consolidate args to struct
Test: th
Change-Id: I46a1f0be5862a73e47435c39055b2d32d19de656
diff --git a/fs_mgr/libsnapshot/snapuserd/snapuserd_daemon.cpp b/fs_mgr/libsnapshot/snapuserd/snapuserd_daemon.cpp
index caef022..cc08a07 100644
--- a/fs_mgr/libsnapshot/snapuserd/snapuserd_daemon.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/snapuserd_daemon.cpp
@@ -21,6 +21,7 @@
#include <snapuserd/snapuserd_client.h>
#include <storage_literals/storage_literals.h>
+#include "user-space-merge/snapuserd_core.h"
#include "snapuserd_daemon.h"
@@ -35,7 +36,8 @@
DEFINE_bool(io_uring, false, "If true, io_uring feature is enabled");
DEFINE_bool(o_direct, false, "If true, enable direct reads on source device");
DEFINE_int32(cow_op_merge_size, 0, "number of operations to be processed at once");
-DEFINE_int32(worker_count, 4, "number of worker threads used to serve I/O requests to dm-user");
+DEFINE_int32(worker_count, android::snapshot::kNumWorkerThreads,
+ "number of worker threads used to serve I/O requests to dm-user");
DEFINE_int32(verify_block_size, 1_MiB, "block sized used during verification of snapshots");
DEFINE_int32(num_verify_threads, 3, "number of threads used during verification phase");
@@ -101,9 +103,6 @@
MaskAllSignalsExceptIntAndTerm();
user_server_.SetServerRunning();
- if (FLAGS_io_uring) {
- user_server_.SetIouringEnabled();
- }
if (FLAGS_socket_handoff) {
return user_server_.RunForSocketHandoff();
@@ -116,14 +115,19 @@
}
for (int i = arg_start; i < argc; i++) {
auto parts = android::base::Split(argv[i], ",");
-
if (parts.size() != 4) {
LOG(ERROR) << "Malformed message, expected at least four sub-arguments.";
return false;
}
- auto handler = user_server_.AddHandler(
- parts[0], parts[1], parts[2], parts[3], FLAGS_worker_count, FLAGS_o_direct,
- FLAGS_cow_op_merge_size, FLAGS_verify_block_size, FLAGS_num_verify_threads);
+ HandlerOptions options = {
+ .num_worker_threads = FLAGS_worker_count,
+ .use_iouring = FLAGS_io_uring,
+ .o_direct = FLAGS_o_direct,
+ .cow_op_merge_size = static_cast<uint32_t>(FLAGS_cow_op_merge_size),
+ .verify_block_size = static_cast<uint32_t>(FLAGS_verify_block_size),
+ .num_verification_threads = static_cast<uint32_t>(FLAGS_num_verify_threads),
+ };
+ auto handler = user_server_.AddHandler(parts[0], parts[1], parts[2], parts[3], options);
if (!handler || !user_server_.StartHandler(parts[0])) {
return false;
}
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/extractor.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/extractor.cpp
index 6e5eed8..c15ac6b 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/extractor.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/extractor.cpp
@@ -40,8 +40,9 @@
bool Extractor::Init() {
auto opener = factory_.CreateTestOpener(control_name_);
+ HandlerOptions options;
handler_ = std::make_shared<SnapshotHandler>(control_name_, cow_path_, base_path_, base_path_,
- opener, 1, false, false, false, 0, 0, 0);
+ opener, options);
if (!handler_->InitCowDevice()) {
return false;
}
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/handler_manager.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/handler_manager.cpp
index 4e96d09..6b6f071 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/handler_manager.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/handler_manager.cpp
@@ -52,13 +52,9 @@
std::shared_ptr<HandlerThread> SnapshotHandlerManager::AddHandler(
const std::string& misc_name, const std::string& cow_device_path,
const std::string& backing_device, const std::string& base_path_merge,
- std::shared_ptr<IBlockServerOpener> opener, int num_worker_threads, bool use_iouring,
- bool o_direct, uint32_t cow_op_merge_size, uint32_t verify_block_size,
- uint32_t num_verification_threads) {
- auto snapuserd = std::make_shared<SnapshotHandler>(
- misc_name, cow_device_path, backing_device, base_path_merge, opener, num_worker_threads,
- use_iouring, perform_verification_, o_direct, cow_op_merge_size, verify_block_size,
- num_verification_threads);
+ std::shared_ptr<IBlockServerOpener> opener, HandlerOptions options) {
+ auto snapuserd = std::make_shared<SnapshotHandler>(misc_name, cow_device_path, backing_device,
+ base_path_merge, opener, options);
if (!snapuserd->InitCowDevice()) {
LOG(ERROR) << "Failed to initialize Snapuserd";
return nullptr;
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/handler_manager.h b/fs_mgr/libsnapshot/snapuserd/user-space-merge/handler_manager.h
index 410dca1..31f8f32 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/handler_manager.h
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/handler_manager.h
@@ -27,6 +27,15 @@
namespace android {
namespace snapshot {
+struct HandlerOptions {
+ int num_worker_threads{};
+ bool use_iouring{};
+ bool o_direct{};
+ uint32_t cow_op_merge_size{};
+ uint32_t verify_block_size{};
+ uint32_t num_verification_threads{};
+};
+
class SnapshotHandler;
class HandlerThread {
@@ -53,12 +62,12 @@
virtual ~ISnapshotHandlerManager() {}
// Add a new snapshot handler but do not start serving requests yet.
- virtual std::shared_ptr<HandlerThread> AddHandler(
- const std::string& misc_name, const std::string& cow_device_path,
- const std::string& backing_device, const std::string& base_path_merge,
- std::shared_ptr<IBlockServerOpener> opener, int num_worker_threads, bool use_iouring,
- bool o_direct, uint32_t cow_op_merge_size, uint32_t verify_block_size,
- uint32_t num_verification_threads) = 0;
+ virtual std::shared_ptr<HandlerThread> AddHandler(const std::string& misc_name,
+ const std::string& cow_device_path,
+ const std::string& backing_device,
+ const std::string& base_path_merge,
+ std::shared_ptr<IBlockServerOpener> opener,
+ HandlerOptions options) = 0;
// Start serving requests on a snapshot handler.
virtual bool StartHandler(const std::string& misc_name) = 0;
@@ -98,12 +107,12 @@
class SnapshotHandlerManager final : public ISnapshotHandlerManager {
public:
SnapshotHandlerManager();
- std::shared_ptr<HandlerThread> AddHandler(
- const std::string& misc_name, const std::string& cow_device_path,
- const std::string& backing_device, const std::string& base_path_merge,
- std::shared_ptr<IBlockServerOpener> opener, int num_worker_threads, bool use_iouring,
- bool o_direct, uint32_t cow_op_merge_size, uint32_t verify_block_size,
- uint32_t num_verification_threads) override;
+ std::shared_ptr<HandlerThread> AddHandler(const std::string& misc_name,
+ const std::string& cow_device_path,
+ const std::string& backing_device,
+ const std::string& base_path_merge,
+ std::shared_ptr<IBlockServerOpener> opener,
+ HandlerOptions options) override;
bool StartHandler(const std::string& misc_name) override;
bool DeleteHandler(const std::string& misc_name) override;
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp
index bf12588..1f3d3a0 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp
@@ -37,29 +37,21 @@
SnapshotHandler::SnapshotHandler(std::string misc_name, std::string cow_device,
std::string backing_device, std::string base_path_merge,
- std::shared_ptr<IBlockServerOpener> opener, int num_worker_threads,
- bool use_iouring, bool perform_verification, bool o_direct,
- uint32_t cow_op_merge_size, uint32_t verify_block_size,
- uint32_t num_verification_threads) {
+ std::shared_ptr<IBlockServerOpener> opener,
+ HandlerOptions options) {
misc_name_ = std::move(misc_name);
cow_device_ = std::move(cow_device);
backing_store_device_ = std::move(backing_device);
block_server_opener_ = std::move(opener);
base_path_merge_ = std::move(base_path_merge);
- num_worker_threads_ = num_worker_threads;
- is_io_uring_enabled_ = use_iouring;
- perform_verification_ = perform_verification;
- o_direct_ = o_direct;
- cow_op_merge_size_ = cow_op_merge_size;
- verify_block_size_ = verify_block_size;
- num_verification_threads_ = num_verification_threads;
+ handler_options_ = options;
}
bool SnapshotHandler::InitializeWorkers() {
for (int i = 0; i < num_worker_threads_; i++) {
auto wt = std::make_unique<ReadWorker>(cow_device_, backing_store_device_, misc_name_,
base_path_merge_, GetSharedPtr(),
- block_server_opener_, o_direct_);
+ block_server_opener_, handler_options_.o_direct);
if (!wt->Init()) {
SNAP_LOG(ERROR) << "Thread initialization failed";
return false;
@@ -67,14 +59,16 @@
worker_threads_.push_back(std::move(wt));
}
- merge_thread_ = std::make_unique<MergeWorker>(cow_device_, misc_name_, base_path_merge_,
- GetSharedPtr(), cow_op_merge_size_);
+ merge_thread_ =
+ std::make_unique<MergeWorker>(cow_device_, misc_name_, base_path_merge_, GetSharedPtr(),
+ handler_options_.cow_op_merge_size);
- read_ahead_thread_ = std::make_unique<ReadAhead>(cow_device_, backing_store_device_, misc_name_,
- GetSharedPtr(), cow_op_merge_size_);
+ read_ahead_thread_ =
+ std::make_unique<ReadAhead>(cow_device_, backing_store_device_, misc_name_,
+ GetSharedPtr(), handler_options_.cow_op_merge_size);
- update_verify_ = std::make_unique<UpdateVerify>(misc_name_, verify_block_size_,
- num_verification_threads_);
+ update_verify_ = std::make_unique<UpdateVerify>(misc_name_, handler_options_.verify_block_size,
+ handler_options_.num_verification_threads);
return true;
}
@@ -435,7 +429,7 @@
// During selinux init transition, libsnapshot will propagate the
// status of io_uring enablement. As properties are not initialized,
// we cannot query system property.
- if (is_io_uring_enabled_) {
+ if (handler_options_.use_iouring) {
return true;
}
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h
index ba32da5..9c5d58b 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h
@@ -44,6 +44,7 @@
#include <snapuserd/snapuserd_kernel.h>
#include <storage_literals/storage_literals.h>
#include <system/thread_defs.h>
+#include <user-space-merge/handler_manager.h>
#include "snapuserd_readahead.h"
#include "snapuserd_verify.h"
@@ -100,9 +101,7 @@
public:
SnapshotHandler(std::string misc_name, std::string cow_device, std::string backing_device,
std::string base_path_merge, std::shared_ptr<IBlockServerOpener> opener,
- int num_workers, bool use_iouring, bool perform_verification, bool o_direct,
- uint32_t cow_op_merge_size, uint32_t verify_block_sze,
- uint32_t num_verification_threads);
+ HandlerOptions options);
bool InitCowDevice();
bool Start();
@@ -245,16 +244,12 @@
bool merge_initiated_ = false;
bool merge_monitored_ = false;
bool attached_ = false;
- bool is_io_uring_enabled_ = false;
bool scratch_space_ = false;
int num_worker_threads_ = kNumWorkerThreads;
bool perform_verification_ = true;
bool resume_merge_ = false;
bool merge_complete_ = false;
- bool o_direct_ = false;
- uint32_t cow_op_merge_size_ = 0;
- uint32_t verify_block_size_ = 0;
- uint32_t num_verification_threads_ = 0;
+ HandlerOptions handler_options_;
std::unique_ptr<UpdateVerify> update_verify_;
std::shared_ptr<IBlockServerOpener> block_server_opener_;
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp
index 1f6729c..227b23c 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp
@@ -35,6 +35,7 @@
#include <snapuserd/dm_user_block_server.h>
#include <snapuserd/snapuserd_client.h>
#include "snapuserd_server.h"
+#include "user-space-merge/handler_manager.h"
#include "user-space-merge/snapuserd_core.h"
namespace android {
@@ -126,7 +127,8 @@
return Sendmsg(fd, "fail");
}
- auto handler = AddHandler(out[1], out[2], out[3], out[4], std::nullopt);
+ HandlerOptions options;
+ auto handler = AddHandler(out[1], out[2], out[3], out[4], options);
if (!handler) {
return Sendmsg(fd, "fail");
}
@@ -348,11 +350,11 @@
SetTerminating();
}
-std::shared_ptr<HandlerThread> UserSnapshotServer::AddHandler(
- const std::string& misc_name, const std::string& cow_device_path,
- const std::string& backing_device, const std::string& base_path_merge,
- std::optional<uint32_t> num_worker_threads, const bool o_direct, uint32_t cow_op_merge_size,
- uint32_t verify_block_size, uint32_t num_verification_threads) {
+std::shared_ptr<HandlerThread> UserSnapshotServer::AddHandler(const std::string& misc_name,
+ const std::string& cow_device_path,
+ const std::string& backing_device,
+ const std::string& base_path_merge,
+ HandlerOptions options) {
// We will need multiple worker threads only during
// device boot after OTA. For all other purposes,
// one thread is sufficient. We don't want to consume
@@ -361,11 +363,8 @@
//
// During boot up, we need multiple threads primarily for
// update-verification.
- if (!num_worker_threads.has_value()) {
- num_worker_threads = kNumWorkerThreads;
- }
if (is_socket_present_) {
- num_worker_threads = 1;
+ options.num_worker_threads = 1;
}
if (android::base::EndsWith(misc_name, "-init") || is_socket_present_ ||
@@ -376,8 +375,7 @@
auto opener = block_server_factory_->CreateOpener(misc_name);
return handlers_->AddHandler(misc_name, cow_device_path, backing_device, base_path_merge,
- opener, num_worker_threads.value(), io_uring_enabled_, o_direct,
- cow_op_merge_size, verify_block_size, num_verification_threads);
+ opener, options);
}
bool UserSnapshotServer::WaitForSocket() {
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.h b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.h
index c3e5a82..73ce7b2 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.h
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.h
@@ -51,7 +51,6 @@
std::vector<struct pollfd> watched_fds_;
bool is_socket_present_ = false;
bool is_server_running_ = false;
- bool io_uring_enabled_ = false;
std::unique_ptr<ISnapshotHandlerManager> handlers_;
std::unique_ptr<IBlockServerFactory> block_server_factory_;
@@ -87,18 +86,13 @@
const std::string& cow_device_path,
const std::string& backing_device,
const std::string& base_path_merge,
- std::optional<uint32_t> num_worker_threads,
- bool o_direct = false, uint32_t cow_op_merge_size = 0,
- uint32_t verify_block_size = 0,
- uint32_t num_verification_threads = 0);
+ HandlerOptions options);
bool StartHandler(const std::string& misc_name);
void SetTerminating() { terminating_ = true; }
void ReceivedSocketSignal() { received_socket_signal_ = true; }
void SetServerRunning() { is_server_running_ = true; }
bool IsServerRunning() { return is_server_running_; }
- void SetIouringEnabled() { io_uring_enabled_ = true; }
- bool IsIouringEnabled() { return io_uring_enabled_; }
};
} // namespace snapshot
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp
index bf55830..f3795a1 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp
@@ -731,10 +731,17 @@
auto opener = factory->CreateOpener(system_device_ctrl_name_);
handlers_->DisableVerification();
const TestParam params = GetParam();
- auto handler = handlers_->AddHandler(
- system_device_ctrl_name_, cow_system_->path, base_dev_->GetPath(), base_dev_->GetPath(),
- opener, 1, params.io_uring, params.o_direct, params.cow_op_merge_size,
- params.verification_block_size, params.num_verification_threads);
+ HandlerOptions options = {
+ .num_worker_threads = params.num_threads,
+ .use_iouring = params.io_uring,
+ .o_direct = params.o_direct,
+ .cow_op_merge_size = params.cow_op_merge_size,
+ .verify_block_size = params.verification_block_size,
+ .num_verification_threads = params.num_verification_threads,
+ };
+ auto handler =
+ handlers_->AddHandler(system_device_ctrl_name_, cow_system_->path, base_dev_->GetPath(),
+ base_dev_->GetPath(), opener, options);
ASSERT_NE(handler, nullptr);
ASSERT_NE(handler->snapuserd(), nullptr);
#ifdef __ANDROID__
@@ -1274,10 +1281,17 @@
ASSERT_NE(opener_, nullptr);
const TestParam params = GetParam();
- handler_ = std::make_shared<SnapshotHandler>(
- system_device_ctrl_name_, cow_system_->path, base_dev_->GetPath(), base_dev_->GetPath(),
- opener_, 1, false, false, params.o_direct, params.cow_op_merge_size,
- params.verification_block_size, params.num_verification_threads);
+ HandlerOptions options = {
+ .num_worker_threads = params.num_threads,
+ .use_iouring = params.io_uring,
+ .o_direct = params.o_direct,
+ .cow_op_merge_size = params.cow_op_merge_size,
+ .verify_block_size = params.verification_block_size,
+ .num_verification_threads = params.num_verification_threads,
+ };
+ handler_ = std::make_shared<SnapshotHandler>(system_device_ctrl_name_, cow_system_->path,
+ base_dev_->GetPath(), base_dev_->GetPath(),
+ opener_, options);
ASSERT_TRUE(handler_->InitCowDevice());
ASSERT_TRUE(handler_->InitializeWorkers());