From a51b165c7aa6291ce90cfcc3a0602d6467d48b5d Mon Sep 17 00:00:00 2001 From: James Hawkins <jhawkins@google.com> Date: Fri, 20 Jan 2017 11:19:59 -0800 Subject: [PATCH] bootstat: Remove debug logging of bootstat_mtime_matches_content. Bug: 34507152 Test: bootstat_tests Change-Id: I97f84dd04eb44e6a5d00cf9a2f6b24a5b3e9297f --- bootstat/boot_event_record_store.cpp | 28 ----------------------- bootstat/boot_event_record_store_test.cpp | 8 ------- 2 files changed, 36 deletions(-) diff --git a/bootstat/boot_event_record_store.cpp b/bootstat/boot_event_record_store.cpp index 78be9445a..f902af337 100644 --- a/bootstat/boot_event_record_store.cpp +++ b/bootstat/boot_event_record_store.cpp @@ -46,24 +46,6 @@ bool ParseRecordEventTime(const std::string& path, int32_t* uptime) { *uptime = file_stat.st_mtime; - // The following code (till function exit) is a debug test to ensure the - // validity of the file mtime value, i.e., to check that the record file - // mtime values are not changed once set. - // TODO(jhawkins): Remove this code. - std::string content; - if (!android::base::ReadFileToString(path, &content)) { - PLOG(ERROR) << "Failed to read " << path; - return false; - } - - // Ignore existing bootstat records (which do not contain file content). - if (!content.empty()) { - int32_t value; - if (android::base::ParseInt(content, &value)) { - bootstat::LogHistogram("bootstat_mtime_matches_content", value == *uptime); - } - } - return true; } @@ -89,16 +71,6 @@ void BootEventRecordStore::AddBootEventWithValue( return; } - // Writing the value as content in the record file is a debug measure to - // ensure the validity of the file mtime value, i.e., to check that the record - // file mtime values are not changed once set. - // TODO(jhawkins): Remove this block. - if (!android::base::WriteStringToFd(std::to_string(value), record_fd)) { - PLOG(ERROR) << "Failed to write value to " << record_path; - close(record_fd); - return; - } - // Fill out the stat structure for |record_path| in order to get the atime to // set in the utime() call. struct stat file_stat; diff --git a/bootstat/boot_event_record_store_test.cpp b/bootstat/boot_event_record_store_test.cpp index 01c2cc105..90f6513e4 100644 --- a/bootstat/boot_event_record_store_test.cpp +++ b/bootstat/boot_event_record_store_test.cpp @@ -45,14 +45,6 @@ bool CreateEmptyBootEventRecord(const std::string& record_path, int32_t value) { return false; } - // Writing the value as content in the record file is a debug measure to - // ensure the validity of the file mtime value, i.e., to check that the record - // file mtime values are not changed once set. - // TODO(jhawkins): Remove this block. - if (!android::base::WriteStringToFd(std::to_string(value), record_fd)) { - return false; - } - // Set the |mtime| of the file to store the value of the boot event while // preserving the |atime|. struct timeval atime = {/* tv_sec */ 0, /* tv_usec */ 0};