some cleanup
This commit is contained in:
parent
cb332cccdc
commit
69158c8553
|
@ -1,5 +1,6 @@
|
|||
package net.hyperic.sigar.cmd;
|
||||
|
||||
import net.hyperic.sigar.CpuInfo;
|
||||
import net.hyperic.sigar.OperatingSystem;
|
||||
import net.hyperic.sigar.SigarException;
|
||||
|
||||
|
@ -20,60 +21,56 @@ public class SysInfo extends SigarCommandBase {
|
|||
return "Display system information";
|
||||
}
|
||||
|
||||
private static boolean contains(String value, String substr) {
|
||||
//matches does not work w/ jre 1.3
|
||||
//value.toLowerCase().matches(".*" + substr + ".*");
|
||||
return value.toLowerCase().indexOf(substr) != -1;
|
||||
private String getJavaProp(String name) {
|
||||
return System.getProperty("java." + name);
|
||||
}
|
||||
|
||||
public void output(String[] args) throws SigarException {
|
||||
String osName = System.getProperty("os.name");
|
||||
|
||||
/**
|
||||
* OS info
|
||||
*/
|
||||
OperatingSystem os = OperatingSystem.getInstance();
|
||||
|
||||
this.out.println(os.getName() + " " +
|
||||
os.getVersion() + " " +
|
||||
os.getArch());
|
||||
println(os.getName() + " " +
|
||||
os.getVersion() + " " +
|
||||
os.getArch());
|
||||
|
||||
if (osName.equals("Linux")) {
|
||||
if (os.getName().equals("Linux")) {
|
||||
println(os.getVendor() + " " + os.getVendorVersion());
|
||||
}
|
||||
|
||||
/**
|
||||
* JVM info
|
||||
*/
|
||||
this.out.println(System.getProperty("java.vm.name") + " - " +
|
||||
System.getProperty("java.vm.vendor") + " [" +
|
||||
System.getProperty("java.vm.version") + "]");
|
||||
this.out.println(System.getProperty("java.specification.vendor") + " " +
|
||||
System.getProperty("java.specification.name") + " " +
|
||||
System.getProperty("java.specification.version"));
|
||||
this.out.println("JAVA_HOME=" + System.getProperty("java.home"));
|
||||
this.out.println("");
|
||||
println(getJavaProp("vm.name") + " - " +
|
||||
getJavaProp("vm.vendor") + " [" +
|
||||
getJavaProp("vm.version") + "]");
|
||||
|
||||
println(getJavaProp("specification.vendor") + " " +
|
||||
getJavaProp("specification.name") + " " +
|
||||
getJavaProp("specification.version"));
|
||||
println("JAVA_HOME=" + getJavaProp("home"));
|
||||
println("");
|
||||
|
||||
/**
|
||||
* uptime
|
||||
*/
|
||||
new Uptime(this.shell).output(args);
|
||||
this.out.println("");
|
||||
println("");
|
||||
|
||||
/**
|
||||
* CPU info
|
||||
*/
|
||||
net.hyperic.sigar.CpuInfo[] infos =
|
||||
this.sigar.getCpuInfoList();
|
||||
CpuInfo[] infos = this.sigar.getCpuInfoList();
|
||||
for (int i=0; i<infos.length; i++) {
|
||||
net.hyperic.sigar.CpuInfo info = infos[i];
|
||||
this.out.println("CPU " + i + ":");
|
||||
this.out.println(" Vendor........" + info.getVendor());
|
||||
this.out.println(" Model........." + info.getModel());
|
||||
this.out.println(" Mhz..........." + info.getMhz());
|
||||
this.out.println(" Cache size...." + info.getCacheSize());
|
||||
CpuInfo info = infos[i];
|
||||
println("CPU " + i + ":");
|
||||
println(" Vendor........" + info.getVendor());
|
||||
println(" Model........." + info.getModel());
|
||||
println(" Mhz..........." + info.getMhz());
|
||||
println(" Cache size...." + info.getCacheSize());
|
||||
}
|
||||
this.out.println("");
|
||||
println("");
|
||||
|
||||
/**
|
||||
* memory info
|
||||
|
|
Loading…
Reference in New Issue