Add support to disable multi-threaded compression at install time
Test: th
Bug: 313962438
Change-Id: Ifccc955e82acb7ad26479e012db91fd0ce866c49
diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc
index 8350825..8a820f9 100644
--- a/payload_consumer/delta_performer.cc
+++ b/payload_consumer/delta_performer.cc
@@ -530,7 +530,7 @@
if (install_plan_->enable_threading) {
manifest_.mutable_dynamic_partition_metadata()
->mutable_vabc_feature_set()
- ->set_threaded(true);
+ ->set_threaded(install_plan_->enable_threading.value());
LOG(INFO) << "Attempting to enable multi-threaded compression for VABC";
}
if (install_plan_->batched_writes) {
diff --git a/payload_consumer/delta_performer_unittest.cc b/payload_consumer/delta_performer_unittest.cc
index 0f48da1..e90bb7c 100644
--- a/payload_consumer/delta_performer_unittest.cc
+++ b/payload_consumer/delta_performer_unittest.cc
@@ -17,7 +17,6 @@
#include "update_engine/payload_consumer/delta_performer.h"
#include <endian.h>
-#include <inttypes.h>
#include <time.h>
#include <algorithm>
@@ -43,7 +42,6 @@
#include "update_engine/common/fake_boot_control.h"
#include "update_engine/common/fake_hardware.h"
#include "update_engine/common/fake_prefs.h"
-#include "update_engine/common/hardware_interface.h"
#include "update_engine/common/hash_calculator.h"
#include "update_engine/common/mock_download_action.h"
#include "update_engine/common/test_utils.h"
diff --git a/payload_consumer/install_plan.h b/payload_consumer/install_plan.h
index bad34a0..dbbe4b2 100644
--- a/payload_consumer/install_plan.h
+++ b/payload_consumer/install_plan.h
@@ -204,7 +204,7 @@
bool batched_writes = false;
// Whether to enable multi-threaded compression on COW writes
- bool enable_threading = false;
+ std::optional<bool> enable_threading;
};
class InstallPlanAction;