commit 9b26a11b330665b67849b5c4b41065a4cb00e71b
author Googler <larsrc@google.com> Tue Feb 21 05:08:04 2023 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Feb 21 05:09:32 2023 -0800
tree 6b630421df4919f5761362d3eef30d263737fd18
parent 47fe4fb02a2f8b546eb58a52e25eecc06831ab94

Push the Linux implementation detail of user/system time being recorded in jiffies as far in as possible.

Also tests properly for whether /proc/self/stat can be read rather than throwing an exception.

PiperOrigin-RevId: 511169673
Change-Id: I098005ceca78fa2c2074adb5ce611bd588ec52c3

src/main/java/com/google/devtools/build/lib/util/ResourceUsage.java

diff --git a/src/main/java/com/google/devtools/build/lib/util/ResourceUsage.java b/src/main/java/com/google/devtools/build/lib/util/ResourceUsage.java
index e0b56a0..e775b4c 100644
--- a/src/main/java/com/google/devtools/build/lib/util/ResourceUsage.java
+++ b/src/main/java/com/google/devtools/build/lib/util/ResourceUsage.java
@@ -123,19 +123,20 @@
         readPressureStallIndicator("memory"),
         readPressureStallIndicator("io"),
         getAvailableMemory(),
-        getCurrentCpuUtilizationInJiffies());
+        getCurrentCpuUtilizationInMs());
   }
 
   /**
-   * Returns the current cpu utilization of the current process with the given id in jiffies. The
-   * returned array contains the following information: The 1st entry is the number of jiffies that
-   * the process has executed in user mode, and the 2nd entry is the number of jiffies that the
-   * process has executed in kernel mode. Reads /proc/self/stat to obtain this information.
+   * Returns the current cpu utilization of the current process with the given id in ms. The
+   * returned array contains the following information: The 1st entry is the number of ms that the
+   * process has executed in user mode, and the 2nd entry is the number of ms that the process has
+   * executed in kernel mode. Reads /proc/self/stat to obtain this information. The values may not
+   * have millisecond accuracy.
    */
-  private static long[] getCurrentCpuUtilizationInJiffies() {
+  private static long[] getCurrentCpuUtilizationInMs() {
     try {
       File file = new File("/proc/self/stat");
-      if (file.isDirectory()) {
+      if (file.isDirectory() || !file.canRead()) {
         return new long[2];
       }
       List<String> stat =
@@ -143,7 +144,8 @@
       if (stat.size() < 15) {
         return new long[2]; // Tolerate malformed input.
       }
-      return new long[] {Long.parseLong(stat.get(13)), Long.parseLong(stat.get(14))};
+      // /proc/self/stat contains values in jiffies, which are 10 ms.
+      return new long[] {Long.parseLong(stat.get(13)) * 10, Long.parseLong(stat.get(14)) * 10};
     } catch (NumberFormatException | IOException e) {
       return new long[2];
     }
@@ -206,7 +208,7 @@
     private final float memoryPressureLast10Sec;
     private final float ioPressureLast10Sec;
     private final long freePhysicalMemory;
-    private final long[] cpuUtilizationInJiffies;
+    private final long[] cpuUtilizationInMs;
 
     public Measurement(
         long heapMemoryUsed,
@@ -217,7 +219,7 @@
         float memoryPressureLast10Sec1,
         float ioPressureLast10Sec1,
         long freePhysicalMemory,
-        long[] cpuUtilizationInJiffies) {
+        long[] cpuUtilizationInMs) {
       super();
       timeInNanos = System.nanoTime();
       this.heapMemoryUsed = heapMemoryUsed;
@@ -228,7 +230,7 @@
       this.memoryPressureLast10Sec = memoryPressureLast10Sec1;
       this.ioPressureLast10Sec = ioPressureLast10Sec1;
       this.freePhysicalMemory = freePhysicalMemory;
-      this.cpuUtilizationInJiffies = cpuUtilizationInJiffies;
+      this.cpuUtilizationInMs = cpuUtilizationInMs;
     }
 
     /** Returns the time of the measurement in ms. */
@@ -311,7 +313,7 @@
      * mode. Reads /proc/self/stat to obtain this information.
      */
     public long[] getCpuUtilizationInMs() {
-      return new long[] {cpuUtilizationInJiffies[0] * 10, cpuUtilizationInJiffies[1] * 10};
+      return new long[] {cpuUtilizationInMs[0], cpuUtilizationInMs[1]};
     }
   }
 }