diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-05-13 21:26:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-13 21:26:12 +0000 |
| commit | 0a3e95fc03f967856731626833d69fa64b0a3366 (patch) | |
| tree | 1b94cd80ad575be46fef4f042e32791cbd5d3319 | |
| parent | d121fd12e157c55f8cd29aac840cf19711fcdc84 (diff) | |
| parent | d9ff8385fe7fc3206373ee1455d160cb8fadd499 (diff) | |
| download | update_engine-0a3e95fc03f967856731626833d69fa64b0a3366.tar.gz | |
Fix some lint/style error am: 1d99ae1932 am: d9ff8385fe
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1706025
Change-Id: I76acacf4ab3ab9c6645e4e02c6c13dd864d91591
| -rw-r--r-- | common/scoped_task_id.h | 6 | ||||
| -rw-r--r-- | payload_consumer/filesystem_verifier_action.cc | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/common/scoped_task_id.h b/common/scoped_task_id.h index 5c899351..91a29860 100644 --- a/common/scoped_task_id.h +++ b/common/scoped_task_id.h @@ -31,6 +31,10 @@ class ScopedTaskId { using MessageLoop = brillo::MessageLoop; public: + // Move only type similar to unique_ptr. + ScopedTaskId(const ScopedTaskId&) = delete; + ScopedTaskId& operator=(const ScopedTaskId&) = delete; + constexpr ScopedTaskId() = default; constexpr ScopedTaskId(ScopedTaskId&& other) noexcept { @@ -86,8 +90,6 @@ class ScopedTaskId { } private: - ScopedTaskId(const ScopedTaskId&) = delete; - ScopedTaskId& operator=(const ScopedTaskId&) = delete; template <typename Callable> [[nodiscard]] bool PostTask(const base::Location& from_here, Callable&& callback, diff --git a/payload_consumer/filesystem_verifier_action.cc b/payload_consumer/filesystem_verifier_action.cc index bec5acaf..22c8e0bd 100644 --- a/payload_consumer/filesystem_verifier_action.cc +++ b/payload_consumer/filesystem_verifier_action.cc @@ -78,7 +78,7 @@ namespace chromeos_update_engine { namespace { const off_t kReadFileBufferSize = 128 * 1024; -constexpr float VERITY_PROGRESS_PERCENT = 0.6; +constexpr float kVerityProgressPercent = 0.6; } // namespace void FilesystemVerifierAction::PerformAction() { @@ -136,9 +136,9 @@ void FilesystemVerifierAction::UpdateProgress(double progress) { } void FilesystemVerifierAction::UpdatePartitionProgress(double progress) { - // WE don't consider sizes of each partition. Every partition + // We don't consider sizes of each partition. Every partition // has the same length on progress bar. - // TODO(zhangkelvin) Take sizes of each partition into account + // TODO(b/186087589): Take sizes of each partition into account. UpdateProgress((progress + partition_index_) / install_plan_.partitions.size()); } @@ -213,7 +213,7 @@ void FilesystemVerifierAction::WriteVerityAndHashPartition( return; } if (dynamic_control_->UpdateUsesSnapshotCompression()) { - // spin up snapuserd to read fs + // Spin up snapuserd to read fs. if (!InitializeFdVABC(false)) { LOG(ERROR) << "Failed to map all partitions"; Cleanup(ErrorCode::kFilesystemVerifierError); @@ -245,7 +245,7 @@ void FilesystemVerifierAction::WriteVerityAndHashPartition( return; } UpdatePartitionProgress((start_offset + bytes_read) * 1.0f / partition_size_ * - VERITY_PROGRESS_PERCENT); + kVerityProgressPercent); CHECK(pending_task_id_.PostTask( FROM_HERE, base::BindOnce(&FilesystemVerifierAction::WriteVerityAndHashPartition, @@ -290,8 +290,8 @@ void FilesystemVerifierAction::HashPartition(FileDescriptorPtr fd, return; } const auto progress = (start_offset + bytes_read) * 1.0f / partition_size_; - UpdatePartitionProgress(progress * (1 - VERITY_PROGRESS_PERCENT) + - VERITY_PROGRESS_PERCENT); + UpdatePartitionProgress(progress * (1 - kVerityProgressPercent) + + kVerityProgressPercent); CHECK(pending_task_id_.PostTask( FROM_HERE, base::BindOnce(&FilesystemVerifierAction::HashPartition, |