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

Merge "Fix a race condition for temperature_logger"

Browse source 
am: 8e5fb46e87

Change-Id: If62d4548b541432963a4d3d41f299d19927c72d6
This commit is contained in:
Tianjie Xu 2017-06-09 01:01:03 +00:00 committed by android-build-merger
commit efa40b4827
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
install.cpp
View file

@ -27,6 +27,7 @@
#include <unistd.h> #include <unistd.h>
#include <algorithm> #include <algorithm>
#include <atomic>
#include <chrono> #include <chrono>
#include <condition_variable> #include <condition_variable>
#include <functional> #include <functional>
@ -294,11 +295,12 @@ int update_binary_command(const std::string& package, ZipArchiveHandle zip,
} }
#endif // !AB_OTA_UPDATER #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); CHECK(max_temperature != nullptr);
std::mutex mtx; std::mutex mtx;
std::unique_lock<std::mutex> lck(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()); *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]); 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; *wipe_cache = false;
bool retry_update = false; bool retry_update = false;
@ -467,6 +470,7 @@ static int try_update_binary(const std::string& package, ZipArchiveHandle zip, b
int status; int status;
waitpid(pid, &status, 0); waitpid(pid, &status, 0);
logger_finished.store(true);
finish_log_temperature.notify_one(); finish_log_temperature.notify_one();
temperature_logger.join(); temperature_logger.join();