Skip to content

Fix proc stat file reading for blanked comm column #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix proc stat file reading for blanked comm column #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions metrics/src/main/java/com/facebook/battery/metrics/core/ProcFileReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@ public void skipSpaces() {
skipPast(' ');
}

public void skipRightBrace() {
skipPast(')');
}

public void skipLine() {
skipPast('\n');
}
Expand Down
4 changes: 3 additions & 1 deletion metrics/src/main/java/com/facebook/battery/metrics/cpu/CpuMetricsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ public boolean getSnapshot(CpuMetrics snapshot) {
return false;
}

reader.skipRightBrace();

int index = 0;
while (index < PROC_USER_TIME_FIELD) {
while (index < PROC_USER_TIME_FIELD - 1) {
reader.skipSpaces();
index++;
}
Expand Down
16 changes: 16 additions & 0 deletions metrics/src/test/java/com/facebook/battery/metrics/cpu/CpuMetricsCollectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,22 @@ public void testRealProcfile() throws Exception {
assertThat(snapshot.childSystemTimeS).isEqualTo(11.0 / 100);
}

@Test
public void testRealProcfileWithBlankedComm() throws Exception {
String stat =
"21031 (facebook.blank katana) S 354 354 0 0 -1 1077952832 227718 1446 318 0 9852 889 6 11 20 0 133 0 502496 2050461696 70553 4294967295 1 1 0 0 0 0 4608 0 1166120188 4294967295 0 0 17 0 0 0 0 0 0 0 0 0 0 0 0 0 0";
TestableCpuMetricsCollector collector =
new TestableCpuMetricsCollector().setPath(createFile(stat));

CpuMetrics snapshot = new CpuMetrics();
assertThat(collector.getSnapshot(snapshot)).isTrue();

assertThat(snapshot.userTimeS).isEqualTo(9852.0 / 100);
assertThat(snapshot.systemTimeS).isEqualTo(889.0 / 100);
assertThat(snapshot.childUserTimeS).isEqualTo(6.0 / 100);
assertThat(snapshot.childSystemTimeS).isEqualTo(11.0 / 100);
}

@Test
public void testSaneProcFile() throws Exception {
StringBuilder testStringBuilder = new StringBuilder();
Expand Down