PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "update_verifier: Fix the wrong computation with group_range_count."

Browse Source 
am: 011af6e1a9

Change-Id: Id9829bc924741a57fc4e175677f235d2221482f2
This commit is contained in:
Tao Bao
2017-10-30 17:47:14 +00:00
committed by android-build-merger
parent 450918158d 011af6e1a9
commit 78fa902920
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
update_verifier/update_verifier.cpp
+5 -3
View File
@@ -137,11 +137,12 @@ static bool read_blocks(const std::string& partition, const std::string& range_s
LOG(ERROR) << "Error in parsing range string."; LOG(ERROR) << "Error in parsing range string.";
return false; return false;
} }
range_count /= 2;
std::vector<std::future<bool>> threads; std::vector<std::future<bool>> threads;
size_t thread_num = std::thread::hardware_concurrency() ?: 4; size_t thread_num = std::thread::hardware_concurrency() ?: 4;
thread_num = std::min(thread_num, range_count / 2); thread_num = std::min(thread_num, range_count);
size_t group_range_count = range_count / thread_num; size_t group_range_count = (range_count + thread_num - 1) / thread_num;
for (size_t t = 0; t < thread_num; t++) { for (size_t t = 0; t < thread_num; t++) {
auto thread_func = [t, group_range_count, &dm_block_device, &ranges, &partition]() { auto thread_func = [t, group_range_count, &dm_block_device, &ranges, &partition]() {
@@ -154,7 +155,8 @@ static bool read_blocks(const std::string& partition, const std::string& range_s
return false; return false;
} }
for (size_t i = 1 + group_range_count * t; i < group_range_count * (t + 1) + 1; i += 2) { for (size_t i = group_range_count * 2 * t + 1;
i < std::min(group_range_count * 2 * (t + 1) + 1, ranges.size()); i += 2) {
unsigned int range_start, range_end; unsigned int range_start, range_end;
bool parse_status = android::base::ParseUint(ranges[i], &range_start); bool parse_status = android::base::ParseUint(ranges[i], &range_start);
parse_status = parse_status && android::base::ParseUint(ranges[i + 1], &range_end); parse_status = parse_status && android::base::ParseUint(ranges[i + 1], &range_end);