summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-06-09 03:03:02 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-06-09 03:03:02 +0200
commit54138462b4e919cba335263a76783615ea3fa1fc (patch)
tree5f49fb9b7547c77723c831e15b14dc63aa25a716
parentMerge "kill package_extract_dir" am: 99e7216907 am: 49f9c969eb (diff)
parentMerge "Fix a race condition for temperature_logger" (diff)
downloadandroid_bootable_recovery-54138462b4e919cba335263a76783615ea3fa1fc.tar
android_bootable_recovery-54138462b4e919cba335263a76783615ea3fa1fc.tar.gz
android_bootable_recovery-54138462b4e919cba335263a76783615ea3fa1fc.tar.bz2
android_bootable_recovery-54138462b4e919cba335263a76783615ea3fa1fc.tar.lz
android_bootable_recovery-54138462b4e919cba335263a76783615ea3fa1fc.tar.xz
android_bootable_recovery-54138462b4e919cba335263a76783615ea3fa1fc.tar.zst
android_bootable_recovery-54138462b4e919cba335263a76783615ea3fa1fc.zip
-rw-r--r--install.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/install.cpp b/install.cpp
index a1f2e4fbd..db4ba9373 100644
--- a/install.cpp
+++ b/install.cpp
@@ -27,6 +27,7 @@
#include <unistd.h>
#include <algorithm>
+#include <atomic>
#include <chrono>
#include <condition_variable>
#include <functional>
@@ -294,11 +295,12 @@ int update_binary_command(const std::string& package, ZipArchiveHandle zip,
}
#endif // !AB_OTA_UPDATER
-static void log_max_temperature(int* max_temperature) {
+static void log_max_temperature(int* max_temperature, const std::atomic<bool>& logger_finished) {
CHECK(max_temperature != nullptr);
std::mutex mtx;
std::unique_lock<std::mutex> lck(mtx);
- while (finish_log_temperature.wait_for(lck, 20s) == std::cv_status::timeout) {
+ while (!logger_finished.load() &&
+ finish_log_temperature.wait_for(lck, 20s) == std::cv_status::timeout) {
*max_temperature = std::max(*max_temperature, GetMaxValueFromThermalZone());
}
}
@@ -403,7 +405,8 @@ static int try_update_binary(const std::string& package, ZipArchiveHandle zip, b
}
close(pipefd[1]);
- std::thread temperature_logger(log_max_temperature, max_temperature);
+ std::atomic<bool> logger_finished(false);
+ std::thread temperature_logger(log_max_temperature, max_temperature, std::ref(logger_finished));
*wipe_cache = false;
bool retry_update = false;
@@ -467,6 +470,7 @@ static int try_update_binary(const std::string& package, ZipArchiveHandle zip, b
int status;
waitpid(pid, &status, 0);
+ logger_finished.store(true);
finish_log_temperature.notify_one();
temperature_logger.join();