tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "libsnapshot: resume_point_count" into main am: 3200697586

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2828451

Change-Id: I930a286449f30cf40a3b90e1c1b6666eeacf53fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng 2023-11-14 20:43:03 +00:00 committed by Automerger Merge Worker
commit c8107e4de5
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs_mgr/libsnapshot/include/libsnapshot/cow_format.h
View file

@ -107,8 +107,10 @@ static constexpr uint8_t kNumResumePoints = 4;
struct CowHeaderV3 : public CowHeader {
// Location of sequence buffer in COW.
uint64_t sequence_buffer_offset;
// number of currently written resume points
uint32_t resume_point_count;
// Size, in bytes, of the CowResumePoint buffer.
uint32_t resume_buffer_size;
uint32_t resume_point_max;
// Number of CowOperationV3 structs in the operation buffer, currently and total
// region size.
uint32_t op_count;

8
fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.cpp
View file

@ -75,10 +75,10 @@ bool CowParserV3::Parse(borrowed_fd fd, const CowHeaderV3& header, std::optional
}
bool CowParserV3::ReadResumeBuffer(borrowed_fd fd) {
resume_points_ = std::make_shared<std::vector<ResumePoint>>(header_.resume_buffer_size);
resume_points_ = std::make_shared<std::vector<ResumePoint>>(header_.resume_point_count);
return android::base::ReadFullyAtOffset(fd, resume_points_->data(),
header_.resume_buffer_size * sizeof(ResumePoint),
header_.resume_point_count * sizeof(ResumePoint),
header_.prefix.header_size + header_.buffer_size);
}
@ -96,7 +96,7 @@ std::optional<uint32_t> CowParserV3::FindResumeOp(const uint64_t label) {
off_t CowParserV3::GetDataOffset() const {
return sizeof(CowHeaderV3) + header_.buffer_size +
header_.resume_buffer_size * sizeof(ResumePoint) +
header_.resume_point_max * sizeof(ResumePoint) +
header_.op_count_max * sizeof(CowOperation);
}
@ -105,7 +105,7 @@ bool CowParserV3::ParseOps(borrowed_fd fd, const uint32_t op_index) {
ops_->resize(op_index);
const off_t offset = header_.prefix.header_size + header_.buffer_size +
header_.resume_buffer_size * sizeof(ResumePoint);
header_.resume_point_max * sizeof(ResumePoint);
if (!android::base::ReadFullyAtOffset(fd, ops_->data(), ops_->size() * sizeof(CowOperationV3),
offset)) {
PLOG(ERROR) << "read ops failed";

8
fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp
View file

@ -78,7 +78,8 @@ void CowWriterV3::SetupHeaders() {
// WIP: not quite sure how some of these are calculated yet, assuming buffer_size is determined
// during COW size estimation
header_.sequence_buffer_offset = 0;
header_.resume_buffer_size = kNumResumePoints;
header_.resume_point_count = 0;
header_.resume_point_max = kNumResumePoints;
header_.op_count = 0;
header_.op_count_max = 0;
header_.compression_algorithm = kCowCompressNone;
@ -296,12 +297,13 @@ bool CowWriterV3::EmitLabel(uint64_t label) {
resume_points_->end());
resume_points_->push_back({label, header_.op_count});
header_.resume_point_count++;
// remove the oldest resume point if resume_buffer is full
while (resume_points_->size() > header_.resume_buffer_size) {
while (resume_points_->size() > header_.resume_point_max) {
resume_points_->erase(resume_points_->begin());
}
CHECK_LE(resume_points_->size(), header_.resume_buffer_size);
CHECK_LE(resume_points_->size(), header_.resume_point_max);
if (!android::base::WriteFullyAtOffset(fd_, resume_points_->data(),
resume_points_->size() * sizeof(ResumePoint),

4
fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.h
View file

@ -52,12 +52,12 @@ class CowWriterV3 : public CowWriterBase {
off_t GetOpOffset(uint32_t op_index) const {
CHECK_LT(op_index, header_.op_count_max);
return header_.prefix.header_size + header_.buffer_size +
(header_.resume_buffer_size * sizeof(ResumePoint)) +
(header_.resume_point_max * sizeof(ResumePoint)) +
(op_index * sizeof(CowOperationV3));
}
off_t GetDataOffset() const {
return sizeof(CowHeaderV3) + header_.buffer_size +
(header_.resume_buffer_size * sizeof(ResumePoint)) +
(header_.resume_point_max * sizeof(ResumePoint)) +
header_.op_count_max * sizeof(CowOperation);
}
off_t GetResumeOffset() const { return sizeof(CowHeaderV3) + header_.buffer_size; }