Merge "Fix a race condition for temperature_logger" am: 8e5fb46e

#include <unistd.h>

#include <algorithm>

#include <atomic>

#include <chrono>

#include <condition_variable>

#include <functional>

}

#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());

  }

}

  }

  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;

  int status;

  waitpid(pid, &status, 0);

  logger_finished.store(true);

  finish_log_temperature.notify_one();

  temperature_logger.join();