Skip to content

Get the CPU frequency from the "cpu MHz" field in /proc/cpuinfo instead of by parsing the model field. #26

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
jamesjer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Get the CPU frequency from the "cpu MHz" field in /proc/cpuinfo instead of by parsing the model field. #26

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
21 changes: 3 additions & 18 deletions src/main/java/com/jezhumble/javasysmon/LinuxMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand All @@ -28,7 +27,7 @@ class LinuxMonitor implements Monitor {
private static final Pattern NUM_CPU_PATTERN =
Pattern.compile("processor\\s+:\\s+(\\d+)", Pattern.MULTILINE);
private static final Pattern CPU_FREQ_PATTERN =
Pattern.compile("model name[^@]*@\\s+([0-9.A-Za-z]*)", Pattern.MULTILINE);
Pattern.compile("cpu MHz\\s+:\\s+([0-9.]*)", Pattern.MULTILINE);
private static final Pattern UPTIME_PATTERN =
Pattern.compile("([\\d]*).*");
private static final Pattern PID_PATTERN =
Expand Down Expand Up @@ -98,10 +97,8 @@ public int numCpus() {

public long cpuFrequencyInHz() {
String cpuFrequencyAsString = fileUtils.runRegexOnFile(CPU_FREQ_PATTERN, "/proc/cpuinfo");
int strLen = cpuFrequencyAsString.length();
BigDecimal cpuFrequency = new BigDecimal(cpuFrequencyAsString.substring(0, strLen - 3));
long multiplier = getMultiplier(cpuFrequencyAsString.charAt(strLen - 3));
return cpuFrequency.multiply(new BigDecimal(Long.toString(multiplier))).longValue();
double mhz = Double.parseDouble(cpuFrequencyAsString);
return (long)(mhz * 1000000.0);
}

public long uptimeInSeconds() {
Expand Down Expand Up @@ -157,18 +154,6 @@ public void killProcess(int pid) {
}
}

private long getMultiplier(char multiplier) {
switch (multiplier) {
case 'G':
return 1000000000;
case 'M':
return 1000000;
case 'k':
return 1000;
}
return 0;
}

private long toMillis(long jiffies) {
int multiplier = 1000 / userHz;
return jiffies * multiplier;
Expand Down