Report all system temperatures, not just CPU

chrome/browser/chromeos/policy/device_status_collector.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/policy/device_status_collector.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 149 matching lines @@
 // temp*_input contains CPU temperature in millidegree Celsius
 // temp*_label contains appropriate temperature channel label.
 std::vector<em::CPUTempInfo> ReadCPUTempInfo() {
   std::vector<em::CPUTempInfo> contents;
   // Get directories /sys/class/hwmon/hwmon*
   base::FileEnumerator hwmon_enumerator(base::FilePath(kHwmonDir), false,
                                         base::FileEnumerator::DIRECTORIES,
                                         kHwmonDirectoryPattern);
 
   for (base::FilePath hwmon_path = hwmon_enumerator.Next(); !hwmon_path.empty();
        hwmon_path = hwmon_enumerator.Next()) {

[Polina Bondarenko, 2016/07/01 15:22:26]

s/devices/device

-    // Get files /sys/class/hwmon/hwmon*/device/temp*_input
-    const base::FilePath hwmon_device_dir = hwmon_path.Append(kDeviceDir);
-    base::FileEnumerator enumerator(hwmon_device_dir, false,
-                                    base::FileEnumerator::FILES,
-                                    kCPUTempFilePattern);
+    // Get temp*_input files in hwmon*/ and hwmon*/devices/
+    if (base::PathExists(hwmon_path.Append(kDeviceDir))) {
+      hwmon_path = hwmon_path.Append(kDeviceDir);
+    }
+    base::FileEnumerator enumerator(
+        hwmon_path, false, base::FileEnumerator::FILES, kCPUTempFilePattern);
     for (base::FilePath temperature_path = enumerator.Next();
          !temperature_path.empty(); temperature_path = enumerator.Next()) {
       // Get appropriate temp*_label file.
       std::string label_path = temperature_path.MaybeAsASCII();
       if (label_path.empty()) {
         LOG(WARNING) << "Unable to parse a path to temp*_input file as ASCII";
         continue;
       }
       base::ReplaceSubstringsAfterOffset(&label_path, 0, "input", "label");
+      base::FilePath name_path = hwmon_path.Append("name");
 
-      // Read label.
+      // Get the label describing this temperature. Use temp*_label
+      // if present, fall back on name file or blank.
       std::string label;
-      if (!base::PathExists(base::FilePath(label_path)) ||
-          !base::ReadFileToString(base::FilePath(label_path), &label)) {
+      if (base::PathExists(base::FilePath(label_path))) {
+        base::ReadFileToString(base::FilePath(label_path), &label);
+      } else if (base::PathExists(base::FilePath(name_path))) {
+        base::ReadFileToString(name_path, &label);
+      } else {
         label = std::string();
       }
 
       // Read temperature in millidegree Celsius.
       std::string temperature_string;
       int32_t temperature = 0;
       if (base::ReadFileToString(temperature_path, &temperature_string) &&
           sscanf(temperature_string.c_str(), "%d", &temperature) == 1) {
         // CPU temp in millidegree Celsius to Celsius

[Polina Bondarenko, 2016/07/01 15:22:26]

Are added temperatures still in Millicelsius e.g.for link?

         temperature /= 1000;
 
         em::CPUTempInfo info;
         info.set_cpu_label(label);
         info.set_cpu_temp(temperature);
         contents.push_back(info);
       } else {
         LOG(WARNING) << "Unable to read CPU temp from "
                      << temperature_path.MaybeAsASCII();
       }
@@ skipping 842 matching lines @@
   ScheduleGeolocationUpdateRequest();
 }
 
 void DeviceStatusCollector::ReceiveVolumeInfo(
     const std::vector<em::VolumeInfo>& info) {
   if (report_hardware_status_)
     volume_info_ = info;
 }
 
 }  // namespace policy