fixed formatting (tabs to spaces, version from 1.4 to 1.5, general formatting)
added MBean for "LoadAverage"
This commit is contained in:
parent
3471b84099
commit
6662294a7f
|
@ -43,7 +43,7 @@ import org.hyperic.sigar.SigarProxyCache;
|
|||
* implement subset of them.
|
||||
*
|
||||
* @author Bjoern Martin
|
||||
* @since 1.4 (2007-04)
|
||||
* @since 1.5
|
||||
*/
|
||||
public abstract class AbstractMBean implements DynamicMBean, MBeanRegistration {
|
||||
|
||||
|
@ -128,18 +128,15 @@ public abstract class AbstractMBean implements DynamicMBean, MBeanRegistration {
|
|||
|
||||
} else if (cacheMode == CACHED_500MS) {
|
||||
// 500ms cached version (for 1/sec queries)
|
||||
this.sigar = SigarProxyCache.newInstance(this.sigarImpl,
|
||||
500);
|
||||
this.sigar = SigarProxyCache.newInstance(this.sigarImpl, 500);
|
||||
|
||||
} else if (cacheMode == CACHED_5SEC) {
|
||||
// 5sec cached version (for avg'd queries)
|
||||
this.sigar = SigarProxyCache.newInstance(this.sigarImpl,
|
||||
5000);
|
||||
this.sigar = SigarProxyCache.newInstance(this.sigarImpl, 5000);
|
||||
|
||||
} else /* if (cacheMode == CACHED_30SEC) */{
|
||||
// 30sec (default) cached version (for info and long term queries)
|
||||
this.sigar = SigarProxyCache.newInstance(this.sigarImpl,
|
||||
30000);
|
||||
this.sigar = SigarProxyCache.newInstance(this.sigarImpl, 30000);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -216,8 +213,6 @@ public abstract class AbstractMBean implements DynamicMBean, MBeanRegistration {
|
|||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// -------
|
||||
// Implementation of the MBeanRegistration interface
|
||||
// -------
|
||||
|
@ -231,7 +226,8 @@ public abstract class AbstractMBean implements DynamicMBean, MBeanRegistration {
|
|||
*
|
||||
* @see MBeanRegistration#preRegister(MBeanServer, ObjectName)
|
||||
*/
|
||||
public ObjectName preRegister(MBeanServer server, ObjectName name) throws Exception {
|
||||
public ObjectName preRegister(MBeanServer server, ObjectName name)
|
||||
throws Exception {
|
||||
this.mbeanServer = server;
|
||||
return new ObjectName(getObjectName());
|
||||
}
|
||||
|
|
|
@ -30,11 +30,11 @@ import org.hyperic.sigar.Sigar;
|
|||
import org.hyperic.sigar.SigarException;
|
||||
|
||||
/**
|
||||
* Sigar JMX MBean implementation for the <code>Cpu</code> information package.
|
||||
* Provides an OpenMBean conform implementation.
|
||||
* Sigar JMX MBean implementation for the <code>Cpu</code> information
|
||||
* package. Provides an OpenMBean conform implementation.
|
||||
*
|
||||
* @author Bjoern Martin
|
||||
* @since 1.4 (2007-04)
|
||||
* @since 1.5
|
||||
*/
|
||||
public class SigarCpu extends AbstractMBean {
|
||||
|
||||
|
@ -65,74 +65,54 @@ public class SigarCpu extends AbstractMBean {
|
|||
private static MBeanParameterInfo MBEAN_PARAM_SIGAR;
|
||||
|
||||
static {
|
||||
MBEAN_ATTR_CPUINDEX = new MBeanAttributeInfo(
|
||||
"CpuIndex", "int",
|
||||
"The index of the CPU, typically starting at 0",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_IDLE = new MBeanAttributeInfo(
|
||||
"Idle", "long",
|
||||
"The idle time of the CPU, in [ms]",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_NICE = new MBeanAttributeInfo(
|
||||
"Nice", "long",
|
||||
"The time of the CPU spent on nice priority, in [ms]",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_SYS = new MBeanAttributeInfo(
|
||||
"Sys", "long",
|
||||
"The time of the CPU used by the system, in [ms]",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_TOTAL = new MBeanAttributeInfo(
|
||||
"Total", "long",
|
||||
"The total time of the CPU, in [ms]",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_USER = new MBeanAttributeInfo(
|
||||
"User", "long",
|
||||
"The time of the CPU used by user processes, in [ms]",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_WAIT = new MBeanAttributeInfo(
|
||||
"Wait", "long",
|
||||
MBEAN_ATTR_CPUINDEX = new MBeanAttributeInfo("CpuIndex", "int",
|
||||
"The index of the CPU, typically starting at 0", true, false,
|
||||
false);
|
||||
MBEAN_ATTR_IDLE = new MBeanAttributeInfo("Idle", "long",
|
||||
"The idle time of the CPU, in [ms]", true, false, false);
|
||||
MBEAN_ATTR_NICE = new MBeanAttributeInfo("Nice", "long",
|
||||
"The time of the CPU spent on nice priority, in [ms]", true,
|
||||
false, false);
|
||||
MBEAN_ATTR_SYS = new MBeanAttributeInfo("Sys", "long",
|
||||
"The time of the CPU used by the system, in [ms]", true, false,
|
||||
false);
|
||||
MBEAN_ATTR_TOTAL = new MBeanAttributeInfo("Total", "long",
|
||||
"The total time of the CPU, in [ms]", true, false, false);
|
||||
MBEAN_ATTR_USER = new MBeanAttributeInfo("User", "long",
|
||||
"The time of the CPU used by user processes, in [ms]", true,
|
||||
false, false);
|
||||
MBEAN_ATTR_WAIT = new MBeanAttributeInfo("Wait", "long",
|
||||
"The time the CPU had to wait for data to be loaded, in [ms]",
|
||||
true, false, false);
|
||||
MBEAN_PARAM_CPUINDEX = new MBeanParameterInfo(
|
||||
"cpuIndex", "int",
|
||||
"The index of the CPU to read data for. Must be >= 0 " +
|
||||
"and not exceed the CPU count of the system");
|
||||
MBEAN_PARAM_SIGAR = new MBeanParameterInfo(
|
||||
"sigar", Sigar.class.getName(),
|
||||
"The Sigar instance to use to fetch data from");
|
||||
MBEAN_CONSTR_CPUINDEX = new MBeanConstructorInfo(
|
||||
SigarCpu.class.getName(),
|
||||
"Creates a new instance for the CPU index specified, " +
|
||||
"using a new Sigar instance to fetch the data. " +
|
||||
"Fails if the CPU index is out of range.",
|
||||
new MBeanParameterInfo[]{
|
||||
MBEAN_PARAM_CPUINDEX});
|
||||
MBEAN_PARAM_CPUINDEX = new MBeanParameterInfo("cpuIndex", "int",
|
||||
"The index of the CPU to read data for. Must be >= 0 "
|
||||
+ "and not exceed the CPU count of the system");
|
||||
MBEAN_PARAM_SIGAR = new MBeanParameterInfo("sigar", Sigar.class
|
||||
.getName(), "The Sigar instance to use to fetch data from");
|
||||
MBEAN_CONSTR_CPUINDEX = new MBeanConstructorInfo(SigarCpu.class
|
||||
.getName(),
|
||||
"Creates a new instance for the CPU index specified, "
|
||||
+ "using a new Sigar instance to fetch the data. "
|
||||
+ "Fails if the CPU index is out of range.",
|
||||
new MBeanParameterInfo[] { MBEAN_PARAM_CPUINDEX });
|
||||
MBEAN_CONSTR_CPUINDEX_SIGAR = new MBeanConstructorInfo(
|
||||
SigarCpu.class.getName(),
|
||||
"Creates a new instance for the CPU index specified, " +
|
||||
"using the Sigar instance specified to fetch the data. " +
|
||||
"Fails if the CPU index is out of range.",
|
||||
new MBeanParameterInfo[]{
|
||||
MBEAN_PARAM_SIGAR,
|
||||
"Creates a new instance for the CPU index specified, "
|
||||
+ "using the Sigar instance specified to fetch the data. "
|
||||
+ "Fails if the CPU index is out of range.",
|
||||
new MBeanParameterInfo[] { MBEAN_PARAM_SIGAR,
|
||||
MBEAN_PARAM_CPUINDEX });
|
||||
MBEAN_INFO = new MBeanInfo(
|
||||
SigarCpu.class.getName(),
|
||||
"Sigar CPU MBean. Provides raw timing data for a single " +
|
||||
"CPU. The data is cached for 500ms, meaning each request " +
|
||||
"(and as a result each block request to all parameters) " +
|
||||
"within half a second is satisfied from the same dataset.",
|
||||
new MBeanAttributeInfo[]{
|
||||
MBEAN_ATTR_CPUINDEX,
|
||||
MBEAN_ATTR_IDLE,
|
||||
MBEAN_ATTR_NICE,
|
||||
MBEAN_ATTR_SYS,
|
||||
MBEAN_ATTR_TOTAL,
|
||||
MBEAN_ATTR_USER,
|
||||
MBEAN_ATTR_WAIT},
|
||||
new MBeanConstructorInfo[]{
|
||||
MBEAN_CONSTR_CPUINDEX,
|
||||
MBEAN_CONSTR_CPUINDEX_SIGAR},
|
||||
null, null);
|
||||
"Sigar CPU MBean. Provides raw timing data for a single "
|
||||
+ "CPU. The data is cached for 500ms, meaning each request "
|
||||
+ "(and as a result each block request to all parameters) "
|
||||
+ "within half a second is satisfied from the same dataset.",
|
||||
new MBeanAttributeInfo[] { MBEAN_ATTR_CPUINDEX,
|
||||
MBEAN_ATTR_IDLE, MBEAN_ATTR_NICE, MBEAN_ATTR_SYS,
|
||||
MBEAN_ATTR_TOTAL, MBEAN_ATTR_USER, MBEAN_ATTR_WAIT },
|
||||
new MBeanConstructorInfo[] { MBEAN_CONSTR_CPUINDEX,
|
||||
MBEAN_CONSTR_CPUINDEX_SIGAR }, null, null);
|
||||
|
||||
}
|
||||
|
||||
|
@ -151,11 +131,13 @@ public class SigarCpu extends AbstractMBean {
|
|||
* Creates a new instance for the CPU index specified, using a new Sigar
|
||||
* instance to fetch the data. Fails if the CPU index is out of range.
|
||||
*
|
||||
* @param cpuIndex The index of the CPU to read data for. Must be
|
||||
* <code>>= 0</code> and not exceed the CPU count of the system.
|
||||
* @param cpuIndex
|
||||
* The index of the CPU to read data for. Must be <code>>= 0</code>
|
||||
* and not exceed the CPU count of the system.
|
||||
*
|
||||
* @throws IllegalArgumentException If the CPU index is out of range or
|
||||
* an unexpected Sigar error occurs
|
||||
* @throws IllegalArgumentException
|
||||
* If the CPU index is out of range or an unexpected Sigar error
|
||||
* occurs.
|
||||
*/
|
||||
public SigarCpu(int cpuIndex) throws IllegalArgumentException {
|
||||
this(new Sigar(), cpuIndex);
|
||||
|
@ -163,15 +145,19 @@ public class SigarCpu extends AbstractMBean {
|
|||
|
||||
/**
|
||||
* Creates a new instance for the CPU index specified, using the Sigar
|
||||
* instance specified to fetch the data. Fails if the CPU index is out
|
||||
* of range.
|
||||
* instance specified to fetch the data. Fails if the CPU index is out of
|
||||
* range.
|
||||
*
|
||||
* @param sigar The Sigar instance to use to fetch data from
|
||||
* @param cpuIndex The index of the CPU to read data for. Must be
|
||||
* <code>>= 0</code> and not exceed the CPU count of the system.
|
||||
* @param sigar
|
||||
* The Sigar instance to use to fetch data from
|
||||
* @param cpuIndex
|
||||
* The index of the CPU to read data for. Must be
|
||||
* <code>>= 0</code> and not exceed the CPU count of the
|
||||
* system.
|
||||
*
|
||||
* @throws IllegalArgumentException If the CPU index is out of range or
|
||||
* an unexpected Sigar error occurs
|
||||
* @throws IllegalArgumentException
|
||||
* If the CPU index is out of range or an unexpected Sigar error
|
||||
* occurs
|
||||
*/
|
||||
public SigarCpu(Sigar sigar, int cpuIndex) throws IllegalArgumentException {
|
||||
super(sigar, CACHED_500MS);
|
||||
|
@ -184,7 +170,8 @@ public class SigarCpu extends AbstractMBean {
|
|||
int cpuCount;
|
||||
if ((cpuCount = sigar.getCpuList().length) < cpuIndex)
|
||||
throw new IllegalArgumentException(
|
||||
"CPU index out of range (found " + cpuCount + " CPU(s)): " + cpuIndex);
|
||||
"CPU index out of range (found " + cpuCount
|
||||
+ " CPU(s)): " + cpuIndex);
|
||||
|
||||
} catch (SigarException e) {
|
||||
throw unexpectedError(MBEAN_TYPE, e);
|
||||
|
@ -192,8 +179,8 @@ public class SigarCpu extends AbstractMBean {
|
|||
|
||||
// all fine
|
||||
this.cpuIndex = cpuIndex;
|
||||
this.objectName = SigarInvokerJMX.DOMAIN_NAME + ":"
|
||||
+ MBEAN_ATTR_TYPE + "=Cpu,"
|
||||
this.objectName = SigarInvokerJMX.DOMAIN_NAME + ":" + MBEAN_ATTR_TYPE
|
||||
+ "=Cpu,"
|
||||
+ MBEAN_ATTR_CPUINDEX.getName().substring(0, 1).toLowerCase()
|
||||
+ MBEAN_ATTR_CPUINDEX.getName().substring(1) + "=" + cpuIndex;
|
||||
}
|
||||
|
@ -279,14 +266,13 @@ public class SigarCpu extends AbstractMBean {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// -------
|
||||
// Implementation of the DynamicMBean interface
|
||||
// -------
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see DynamicMBean#getAttribute(String)
|
||||
*/
|
||||
public Object getAttribute(String attr) throws AttributeNotFoundException {
|
||||
|
@ -319,6 +305,7 @@ public class SigarCpu extends AbstractMBean {
|
|||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see DynamicMBean#setAttribute(Attribute)
|
||||
*/
|
||||
public void setAttribute(Attribute attr) throws AttributeNotFoundException {
|
||||
|
@ -327,14 +314,18 @@ public class SigarCpu extends AbstractMBean {
|
|||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see DynamicMBean#invoke(String, Object[], String[])
|
||||
*/
|
||||
public Object invoke(String actionName, Object[] params, String[] signature) throws ReflectionException {
|
||||
throw new ReflectionException(new NoSuchMethodException(actionName), actionName);
|
||||
public Object invoke(String actionName, Object[] params, String[] signature)
|
||||
throws ReflectionException {
|
||||
throw new ReflectionException(new NoSuchMethodException(actionName),
|
||||
actionName);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see DynamicMBean#getMBeanInfo()
|
||||
*/
|
||||
public MBeanInfo getMBeanInfo() {
|
||||
|
|
|
@ -34,7 +34,7 @@ import org.hyperic.sigar.SigarException;
|
|||
* package. Provides an OpenMBean conform implementation.
|
||||
*
|
||||
* @author Bjoern Martin
|
||||
* @since 1.4 (2007-04)
|
||||
* @since 1.5
|
||||
*/
|
||||
public class SigarCpuInfo extends AbstractMBean {
|
||||
|
||||
|
@ -61,64 +61,47 @@ public class SigarCpuInfo extends AbstractMBean {
|
|||
private static final MBeanParameterInfo MBEAN_PARAM_SIGAR;
|
||||
|
||||
static {
|
||||
MBEAN_ATTR_CPUINDEX = new MBeanAttributeInfo(
|
||||
"CpuIndex", "int",
|
||||
"The index of the CPU, typically starting at 0",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_CACHESIZE = new MBeanAttributeInfo(
|
||||
"CacheSize", "long",
|
||||
"The cache size of the CPU, in [byte]",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_MHZ = new MBeanAttributeInfo(
|
||||
"Mhz", "int",
|
||||
"The clock speed of the CPU, in [MHz]",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_MODEL = new MBeanAttributeInfo(
|
||||
"Model", "java.lang.String",
|
||||
"The CPU model reported",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_VENDOR = new MBeanAttributeInfo(
|
||||
"Vendor", "java.lang.String",
|
||||
"The CPU vendor reported",
|
||||
true, false, false);
|
||||
MBEAN_PARAM_CPUINDEX = new MBeanParameterInfo(
|
||||
"cpuIndex", "int",
|
||||
"The index of the CPU to read data for. Must be >= 0 " +
|
||||
"and not exceed the CPU count of the system");
|
||||
MBEAN_PARAM_SIGAR = new MBeanParameterInfo(
|
||||
"sigar", Sigar.class.getName(),
|
||||
"The Sigar instance to use to fetch data from");
|
||||
MBEAN_CONSTR_CPUINDEX = new MBeanConstructorInfo(
|
||||
SigarCpuInfo.class.getName(),
|
||||
"Creates a new instance for the CPU index specified, " +
|
||||
"using a new Sigar instance to fetch the data. " +
|
||||
"Fails if the CPU index is out of range.",
|
||||
new MBeanParameterInfo[]{
|
||||
MBEAN_PARAM_CPUINDEX});
|
||||
MBEAN_ATTR_CPUINDEX = new MBeanAttributeInfo("CpuIndex", "int",
|
||||
"The index of the CPU, typically starting at 0", true, false,
|
||||
false);
|
||||
MBEAN_ATTR_CACHESIZE = new MBeanAttributeInfo("CacheSize", "long",
|
||||
"The cache size of the CPU, in [byte]", true, false, false);
|
||||
MBEAN_ATTR_MHZ = new MBeanAttributeInfo("Mhz", "int",
|
||||
"The clock speed of the CPU, in [MHz]", true, false, false);
|
||||
MBEAN_ATTR_MODEL = new MBeanAttributeInfo("Model", "java.lang.String",
|
||||
"The CPU model reported", true, false, false);
|
||||
MBEAN_ATTR_VENDOR = new MBeanAttributeInfo("Vendor",
|
||||
"java.lang.String", "The CPU vendor reported", true, false,
|
||||
false);
|
||||
MBEAN_PARAM_CPUINDEX = new MBeanParameterInfo("cpuIndex", "int",
|
||||
"The index of the CPU to read data for. Must be >= 0 "
|
||||
+ "and not exceed the CPU count of the system");
|
||||
MBEAN_PARAM_SIGAR = new MBeanParameterInfo("sigar", Sigar.class
|
||||
.getName(), "The Sigar instance to use to fetch data from");
|
||||
MBEAN_CONSTR_CPUINDEX = new MBeanConstructorInfo(SigarCpuInfo.class
|
||||
.getName(),
|
||||
"Creates a new instance for the CPU index specified, "
|
||||
+ "using a new Sigar instance to fetch the data. "
|
||||
+ "Fails if the CPU index is out of range.",
|
||||
new MBeanParameterInfo[] { MBEAN_PARAM_CPUINDEX });
|
||||
MBEAN_CONSTR_CPUINDEX_SIGAR = new MBeanConstructorInfo(
|
||||
SigarCpuInfo.class.getName(),
|
||||
"Creates a new instance for the CPU index specified, " +
|
||||
"using the Sigar instance specified to fetch the data. " +
|
||||
"Fails if the CPU index is out of range.",
|
||||
new MBeanParameterInfo[]{
|
||||
MBEAN_PARAM_SIGAR,
|
||||
"Creates a new instance for the CPU index specified, "
|
||||
+ "using the Sigar instance specified to fetch the data. "
|
||||
+ "Fails if the CPU index is out of range.",
|
||||
new MBeanParameterInfo[] { MBEAN_PARAM_SIGAR,
|
||||
MBEAN_PARAM_CPUINDEX });
|
||||
MBEAN_INFO = new MBeanInfo(
|
||||
SigarCpuInfo.class.getName(),
|
||||
"Sigar CPU Info MBean, provides overall information for a " +
|
||||
"single CPU. This information only changes if, for example, " +
|
||||
"a CPU is reducing its clock frequency or shutting down " +
|
||||
"part of its cache. Subsequent requests are satisfied from " +
|
||||
"within a cache that invalidates after 30 seconds.",
|
||||
new MBeanAttributeInfo[]{
|
||||
MBEAN_ATTR_CPUINDEX,
|
||||
MBEAN_ATTR_CACHESIZE,
|
||||
MBEAN_ATTR_MHZ,
|
||||
MBEAN_ATTR_MODEL,
|
||||
MBEAN_ATTR_VENDOR},
|
||||
new MBeanConstructorInfo[]{
|
||||
MBEAN_CONSTR_CPUINDEX,
|
||||
MBEAN_CONSTR_CPUINDEX_SIGAR},
|
||||
"Sigar CPU Info MBean, provides overall information for a "
|
||||
+ "single CPU. This information only changes if, for example, "
|
||||
+ "a CPU is reducing its clock frequency or shutting down "
|
||||
+ "part of its cache. Subsequent requests are satisfied from "
|
||||
+ "within a cache that invalidates after 30 seconds.",
|
||||
new MBeanAttributeInfo[] { MBEAN_ATTR_CPUINDEX,
|
||||
MBEAN_ATTR_CACHESIZE, MBEAN_ATTR_MHZ, MBEAN_ATTR_MODEL,
|
||||
MBEAN_ATTR_VENDOR }, new MBeanConstructorInfo[] {
|
||||
MBEAN_CONSTR_CPUINDEX, MBEAN_CONSTR_CPUINDEX_SIGAR },
|
||||
null, null);
|
||||
|
||||
}
|
||||
|
@ -171,7 +154,8 @@ public class SigarCpuInfo extends AbstractMBean {
|
|||
int cpuCount;
|
||||
if ((cpuCount = sigar.getCpuInfoList().length) < index)
|
||||
throw new IllegalArgumentException(
|
||||
"CPU index out of range (found " + cpuCount + " CPU(s)): " + index);
|
||||
"CPU index out of range (found " + cpuCount
|
||||
+ " CPU(s)): " + index);
|
||||
|
||||
} catch (SigarException e) {
|
||||
throw unexpectedError(MBEAN_TYPE, e);
|
||||
|
@ -179,8 +163,8 @@ public class SigarCpuInfo extends AbstractMBean {
|
|||
|
||||
// all fine
|
||||
this.cpuIndex = index;
|
||||
this.objectName = SigarInvokerJMX.DOMAIN_NAME + ":"
|
||||
+ MBEAN_ATTR_TYPE + "=CpuInfo,"
|
||||
this.objectName = SigarInvokerJMX.DOMAIN_NAME + ":" + MBEAN_ATTR_TYPE
|
||||
+ "=CpuInfo,"
|
||||
+ MBEAN_ATTR_CPUINDEX.getName().substring(0, 1).toLowerCase()
|
||||
+ MBEAN_ATTR_CPUINDEX.getName().substring(1) + "=" + cpuIndex;
|
||||
}
|
||||
|
@ -244,8 +228,6 @@ public class SigarCpuInfo extends AbstractMBean {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// -------
|
||||
// Implementation of the DynamicMBean interface
|
||||
// -------
|
||||
|
@ -288,8 +270,10 @@ public class SigarCpuInfo extends AbstractMBean {
|
|||
* (non-Javadoc)
|
||||
* @see DynamicMBean#invoke(String, Object[], String[])
|
||||
*/
|
||||
public Object invoke(String actionName, Object[] params, String[] signature) throws ReflectionException {
|
||||
throw new ReflectionException(new NoSuchMethodException(actionName), actionName);
|
||||
public Object invoke(String actionName, Object[] params, String[] signature)
|
||||
throws ReflectionException {
|
||||
throw new ReflectionException(new NoSuchMethodException(actionName),
|
||||
actionName);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -34,7 +34,7 @@ import org.hyperic.sigar.SigarException;
|
|||
* package. Provides an OpenMBean conform implementation.</p>
|
||||
*
|
||||
* @author Bjoern Martin
|
||||
* @since 1.4 (2007-04)
|
||||
* @since 1.5
|
||||
*/
|
||||
public class SigarCpuPerc extends AbstractMBean {
|
||||
|
||||
|
@ -65,76 +65,64 @@ public class SigarCpuPerc extends AbstractMBean {
|
|||
private static MBeanParameterInfo MBEAN_PARAM_SIGAR;
|
||||
|
||||
static {
|
||||
MBEAN_ATTR_CPUINDEX = new MBeanAttributeInfo(
|
||||
"CpuIndex", "int",
|
||||
"The index of the CPU, typically starting at 0",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_COMBINED = new MBeanAttributeInfo(
|
||||
"Combined", "double",
|
||||
"The total time of the CPU, as a fraction of 1",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_IDLE = new MBeanAttributeInfo(
|
||||
"Idle", "double",
|
||||
"The idle time of the CPU, as a fraction of 1",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_CPUINDEX = new MBeanAttributeInfo("CpuIndex", "int",
|
||||
"The index of the CPU, typically starting at 0", true, false,
|
||||
false);
|
||||
MBEAN_ATTR_COMBINED = new MBeanAttributeInfo("Combined", "double",
|
||||
"The total time of the CPU, as a fraction of 1", true, false,
|
||||
false);
|
||||
MBEAN_ATTR_IDLE = new MBeanAttributeInfo("Idle", "double",
|
||||
"The idle time of the CPU, as a fraction of 1", true, false,
|
||||
false);
|
||||
MBEAN_ATTR_NICE = new MBeanAttributeInfo(
|
||||
"Nice", "double",
|
||||
"Nice",
|
||||
"double",
|
||||
"The time of the CPU spent on nice priority, as a fraction of 1",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_SYS = new MBeanAttributeInfo(
|
||||
"Sys", "double",
|
||||
MBEAN_ATTR_SYS = new MBeanAttributeInfo("Sys", "double",
|
||||
"The time of the CPU used by the system, as a fraction of 1",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_USER = new MBeanAttributeInfo(
|
||||
"User", "double",
|
||||
"User",
|
||||
"double",
|
||||
"The time of the CPU used by user processes, as a fraction of 1",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_WAIT = new MBeanAttributeInfo(
|
||||
"Wait", "double",
|
||||
"Wait",
|
||||
"double",
|
||||
"The time the CPU had to wait for data to be loaded, as a fraction of 1",
|
||||
true, false, false);
|
||||
MBEAN_PARAM_CPUINDEX = new MBeanParameterInfo(
|
||||
"cpuIndex", "int",
|
||||
"The index of the CPU to read data for. Must be >= 0 " +
|
||||
"and not exceed the CPU count of the system");
|
||||
MBEAN_PARAM_SIGAR = new MBeanParameterInfo(
|
||||
"sigar", Sigar.class.getName(),
|
||||
"The Sigar instance to use to fetch data from");
|
||||
MBEAN_CONSTR_CPUINDEX = new MBeanConstructorInfo(
|
||||
SigarCpuPerc.class.getName(),
|
||||
"Creates a new instance for the CPU index specified, " +
|
||||
"using a new Sigar instance to fetch the data. " +
|
||||
"Fails if the CPU index is out of range.",
|
||||
new MBeanParameterInfo[]{
|
||||
MBEAN_PARAM_CPUINDEX});
|
||||
MBEAN_PARAM_CPUINDEX = new MBeanParameterInfo("cpuIndex", "int",
|
||||
"The index of the CPU to read data for. Must be >= 0 "
|
||||
+ "and not exceed the CPU count of the system");
|
||||
MBEAN_PARAM_SIGAR = new MBeanParameterInfo("sigar", Sigar.class
|
||||
.getName(), "The Sigar instance to use to fetch data from");
|
||||
MBEAN_CONSTR_CPUINDEX = new MBeanConstructorInfo(SigarCpuPerc.class
|
||||
.getName(),
|
||||
"Creates a new instance for the CPU index specified, "
|
||||
+ "using a new Sigar instance to fetch the data. "
|
||||
+ "Fails if the CPU index is out of range.",
|
||||
new MBeanParameterInfo[] { MBEAN_PARAM_CPUINDEX });
|
||||
MBEAN_CONSTR_CPUINDEX_SIGAR = new MBeanConstructorInfo(
|
||||
SigarCpuPerc.class.getName(),
|
||||
"Creates a new instance for the CPU index specified, " +
|
||||
"using the Sigar instance specified to fetch the data. " +
|
||||
"Fails if the CPU index is out of range.",
|
||||
new MBeanParameterInfo[]{
|
||||
MBEAN_PARAM_SIGAR,
|
||||
"Creates a new instance for the CPU index specified, "
|
||||
+ "using the Sigar instance specified to fetch the data. "
|
||||
+ "Fails if the CPU index is out of range.",
|
||||
new MBeanParameterInfo[] { MBEAN_PARAM_SIGAR,
|
||||
MBEAN_PARAM_CPUINDEX });
|
||||
MBEAN_INFO = new MBeanInfo(
|
||||
SigarCpuPerc.class.getName(),
|
||||
"Sigar CPU MBean. Provides percentage data for a single " +
|
||||
"CPU, averaged over the timeframe between the last and " +
|
||||
"the current measurement point. Two measurement points " +
|
||||
"can be as close as 5 seconds, meaning subsequent requests " +
|
||||
"for data within 5 seconds after the last executed call " +
|
||||
"will be satisfied from cached data.",
|
||||
new MBeanAttributeInfo[]{
|
||||
MBEAN_ATTR_CPUINDEX,
|
||||
MBEAN_ATTR_COMBINED,
|
||||
MBEAN_ATTR_IDLE,
|
||||
MBEAN_ATTR_NICE,
|
||||
MBEAN_ATTR_SYS,
|
||||
MBEAN_ATTR_USER,
|
||||
MBEAN_ATTR_WAIT},
|
||||
new MBeanConstructorInfo[]{
|
||||
MBEAN_CONSTR_CPUINDEX,
|
||||
MBEAN_CONSTR_CPUINDEX_SIGAR},
|
||||
null, null);
|
||||
"Sigar CPU MBean. Provides percentage data for a single "
|
||||
+ "CPU, averaged over the timeframe between the last and "
|
||||
+ "the current measurement point. Two measurement points "
|
||||
+ "can be as close as 5 seconds, meaning subsequent requests "
|
||||
+ "for data within 5 seconds after the last executed call "
|
||||
+ "will be satisfied from cached data.",
|
||||
new MBeanAttributeInfo[] { MBEAN_ATTR_CPUINDEX,
|
||||
MBEAN_ATTR_COMBINED, MBEAN_ATTR_IDLE, MBEAN_ATTR_NICE,
|
||||
MBEAN_ATTR_SYS, MBEAN_ATTR_USER, MBEAN_ATTR_WAIT },
|
||||
new MBeanConstructorInfo[] { MBEAN_CONSTR_CPUINDEX,
|
||||
MBEAN_CONSTR_CPUINDEX_SIGAR }, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -194,8 +182,8 @@ public class SigarCpuPerc extends AbstractMBean {
|
|||
|
||||
// all fine
|
||||
this.cpuIndex = index;
|
||||
this.objectName = SigarInvokerJMX.DOMAIN_NAME + ":"
|
||||
+ MBEAN_ATTR_TYPE + "=CpuPerc,"
|
||||
this.objectName = SigarInvokerJMX.DOMAIN_NAME + ":" + MBEAN_ATTR_TYPE
|
||||
+ "=CpuPerc,"
|
||||
+ MBEAN_ATTR_CPUINDEX.getName().substring(0, 1).toLowerCase()
|
||||
+ MBEAN_ATTR_CPUINDEX.getName().substring(1) + "=" + cpuIndex;
|
||||
}
|
||||
|
@ -281,8 +269,6 @@ public class SigarCpuPerc extends AbstractMBean {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// -------
|
||||
// Implementation of the DynamicMBean interface
|
||||
// -------
|
||||
|
@ -331,8 +317,10 @@ public class SigarCpuPerc extends AbstractMBean {
|
|||
* (non-Javadoc)
|
||||
* @see DynamicMBean#invoke(String, Object[], String[])
|
||||
*/
|
||||
public Object invoke(String actionName, Object[] params, String[] signature) throws ReflectionException {
|
||||
throw new ReflectionException(new NoSuchMethodException(actionName), actionName);
|
||||
public Object invoke(String actionName, Object[] params, String[] signature)
|
||||
throws ReflectionException {
|
||||
throw new ReflectionException(new NoSuchMethodException(actionName),
|
||||
actionName);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -0,0 +1,263 @@
|
|||
/*
|
||||
* Copyright (C) [2004, 2005, 2006, 2007], Hyperic, Inc.
|
||||
* This file is part of SIGAR.
|
||||
*
|
||||
* SIGAR is free software; you can redistribute it and/or modify
|
||||
* it under the terms version 2 of the GNU General Public License as
|
||||
* published by the Free Software Foundation. This program is distributed
|
||||
* in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
|
||||
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
* PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||
* details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
* USA.
|
||||
*/
|
||||
|
||||
package org.hyperic.sigar.jmx;
|
||||
|
||||
import javax.management.Attribute;
|
||||
import javax.management.AttributeNotFoundException;
|
||||
import javax.management.MBeanAttributeInfo;
|
||||
import javax.management.MBeanConstructorInfo;
|
||||
import javax.management.MBeanInfo;
|
||||
import javax.management.MBeanParameterInfo;
|
||||
import javax.management.ReflectionException;
|
||||
|
||||
import org.hyperic.sigar.Sigar;
|
||||
import org.hyperic.sigar.SigarException;
|
||||
import org.hyperic.sigar.SigarNotImplementedException;
|
||||
|
||||
/**
|
||||
* Sigar JMX MBean implementation for the <code>LoadAverage</code> information
|
||||
* package. Provides an OpenMBean conform implementation.
|
||||
*
|
||||
* @author Bjoern Martin
|
||||
* @since 1.5
|
||||
*/
|
||||
public class SigarLoadAverage extends AbstractMBean {
|
||||
|
||||
private static final String MBEAN_TYPE = "LoadAverage";
|
||||
|
||||
/**
|
||||
* Returned if {@link Sigar#getLoadAverage()}} is detected to be not
|
||||
* implemented on the platform.
|
||||
*
|
||||
* @see #notImplemented
|
||||
*/
|
||||
private static final double NOT_IMPLEMENTED_LOAD_VALUE = -1.0d;
|
||||
|
||||
private static final MBeanInfo MBEAN_INFO;
|
||||
|
||||
private static final MBeanAttributeInfo MBEAN_ATTR_LAST1MIN;
|
||||
|
||||
private static final MBeanAttributeInfo MBEAN_ATTR_LAST5MIN;
|
||||
|
||||
private static final MBeanAttributeInfo MBEAN_ATTR_LAST15MIN;
|
||||
|
||||
private static final MBeanConstructorInfo MBEAN_CONSTR_SIGAR;
|
||||
|
||||
private static MBeanParameterInfo MBEAN_PARAM_SIGAR;
|
||||
|
||||
static {
|
||||
MBEAN_ATTR_LAST1MIN = new MBeanAttributeInfo(
|
||||
"LastMinute",
|
||||
"double",
|
||||
"The load average in the last minute, as a fraction of 1, or "
|
||||
+ "-1.0 if the load cannot be determined on this platform",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_LAST5MIN = new MBeanAttributeInfo(
|
||||
"LastFiveMinutes",
|
||||
"double",
|
||||
"The load average over the last five minutes, as a fraction "
|
||||
+ "of 1, or -1.0 if the load cannot be determined on this platform",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_LAST15MIN = new MBeanAttributeInfo(
|
||||
"Last15Minutes",
|
||||
"double",
|
||||
"The load average over the last 15 minutes, as a fraction of "
|
||||
+ "1, or -1.0 if the load cannot be determined on this platform",
|
||||
true, false, false);
|
||||
|
||||
MBEAN_PARAM_SIGAR = new MBeanParameterInfo("sigar", Sigar.class
|
||||
.getName(), "The Sigar instance to use to fetch data from");
|
||||
|
||||
MBEAN_CONSTR_SIGAR = new MBeanConstructorInfo(
|
||||
SigarLoadAverage.class.getName(),
|
||||
"Creates a new instance, using the Sigar instance specified "
|
||||
+ "to fetch the data. Fails if the CPU index is out of range.",
|
||||
new MBeanParameterInfo[] { MBEAN_PARAM_SIGAR });
|
||||
MBEAN_INFO = new MBeanInfo(
|
||||
SigarLoadAverage.class.getName(),
|
||||
"Sigar load average MBean. Provides load averages of the "
|
||||
+ "system over the last one, five and 15 minutes. Due to the "
|
||||
+ "long term character of that information, the fetch is done "
|
||||
+ "using a Sigar proxy cache with a timeout of 30 seconds.",
|
||||
new MBeanAttributeInfo[] { MBEAN_ATTR_LAST1MIN,
|
||||
MBEAN_ATTR_LAST5MIN, MBEAN_ATTR_LAST15MIN },
|
||||
new MBeanConstructorInfo[] { MBEAN_CONSTR_SIGAR }, null, null);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Object name this instance will give itself when being registered to an
|
||||
* MBeanServer.
|
||||
*/
|
||||
private final String objectName;
|
||||
|
||||
/**
|
||||
* <p>Set <code>true</code> when the load average fetch failed with a
|
||||
* <code>SigarException</code> that indicates the method is not implemented.
|
||||
* Any subsequent call to this instance will then be answered with
|
||||
* {@link #NOT_IMPLEMENTED_LOAD_VALUE}.
|
||||
* </p>
|
||||
*
|
||||
* <p><b>FIXME</b> : This is a workaround and should be replaced by something
|
||||
* more stable, as the code setting this member <code>true</code> relies on
|
||||
* a substring being present within the exception. A proposal was made at
|
||||
* <a href="http://jira.hyperic.com/browse/SIGAR-52">issue SIGAR-52</a>.
|
||||
* </p>
|
||||
*/
|
||||
private boolean notImplemented;
|
||||
|
||||
/**
|
||||
* Creates a new instance, using a new Sigar instance to fetch the data.
|
||||
*
|
||||
* @throws IllegalArgumentException
|
||||
* If an unexpected Sigar error occurs.
|
||||
*/
|
||||
public SigarLoadAverage() throws IllegalArgumentException {
|
||||
this(new Sigar());
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new instance, using the Sigar instance specified to fetch the
|
||||
* data.
|
||||
*
|
||||
* @param sigar
|
||||
* The Sigar instance to use to fetch data from
|
||||
*
|
||||
* @throws IllegalArgumentException
|
||||
* If an unexpected Sigar error occurs
|
||||
*/
|
||||
public SigarLoadAverage(Sigar sigar) throws IllegalArgumentException {
|
||||
super(sigar, CACHED_30SEC);
|
||||
|
||||
// all fine
|
||||
this.objectName = SigarInvokerJMX.DOMAIN_NAME + ":" + MBEAN_ATTR_TYPE
|
||||
+ "=" + MBEAN_TYPE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Object name this instance will give itself when being registered to an
|
||||
* MBeanServer.
|
||||
*/
|
||||
public String getObjectName() {
|
||||
return this.objectName;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The load average in the last minute, as a fraction of 1, or
|
||||
* <code>-1.0d</code> if the load cannot be determined on this platform
|
||||
*/
|
||||
public double getLastMinute() {
|
||||
try {
|
||||
return sigarImpl.getLoadAverage()[0];
|
||||
|
||||
} catch (SigarNotImplementedException e) {
|
||||
return NOT_IMPLEMENTED_LOAD_VALUE;
|
||||
|
||||
} catch (SigarException e) {
|
||||
throw unexpectedError(MBEAN_TYPE, e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The load average over the last five minutes, as a fraction of 1,
|
||||
* or <code>-1.0d</code> if the load cannot be determined on this
|
||||
* platform
|
||||
*/
|
||||
public double getLastFiveMinutes() {
|
||||
try {
|
||||
return sigarImpl.getLoadAverage()[1];
|
||||
|
||||
} catch (SigarNotImplementedException e) {
|
||||
return NOT_IMPLEMENTED_LOAD_VALUE;
|
||||
|
||||
} catch (SigarException e) {
|
||||
throw unexpectedError(MBEAN_TYPE, e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The load average over the last 15 minutes, as a fraction of 1, or
|
||||
* <code>-1.0d</code> if the load cannot be determined on this platform
|
||||
*/
|
||||
public double getLast15Minutes() {
|
||||
try {
|
||||
return sigarImpl.getLoadAverage()[2];
|
||||
|
||||
} catch (SigarNotImplementedException e) {
|
||||
return NOT_IMPLEMENTED_LOAD_VALUE;
|
||||
|
||||
} catch (SigarException e) {
|
||||
throw unexpectedError(MBEAN_TYPE, e);
|
||||
}
|
||||
}
|
||||
|
||||
// -------
|
||||
// Implementation of the DynamicMBean interface
|
||||
// -------
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see DynamicMBean#getAttribute(String)
|
||||
*/
|
||||
public Object getAttribute(String attr) throws AttributeNotFoundException {
|
||||
|
||||
if (MBEAN_ATTR_LAST1MIN.getName().equals(attr)) {
|
||||
return new Double(getLastMinute());
|
||||
|
||||
} else if (MBEAN_ATTR_LAST5MIN.getName().equals(attr)) {
|
||||
return new Double(getLastFiveMinutes());
|
||||
|
||||
} else if (MBEAN_ATTR_LAST15MIN.getName().equals(attr)) {
|
||||
return new Double(getLast15Minutes());
|
||||
|
||||
} else {
|
||||
throw new AttributeNotFoundException(attr);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see DynamicMBean#setAttribute(Attribute)
|
||||
*/
|
||||
public void setAttribute(Attribute attr) throws AttributeNotFoundException {
|
||||
throw new AttributeNotFoundException(attr.getName());
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see DynamicMBean#invoke(String, Object[], String[])
|
||||
*/
|
||||
public Object invoke(String actionName, Object[] params, String[] signature)
|
||||
throws ReflectionException {
|
||||
throw new ReflectionException(new NoSuchMethodException(actionName),
|
||||
actionName);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see DynamicMBean#getMBeanInfo()
|
||||
*/
|
||||
public MBeanInfo getMBeanInfo() {
|
||||
return MBEAN_INFO;
|
||||
}
|
||||
}
|
|
@ -35,7 +35,7 @@ import org.hyperic.sigar.SigarException;
|
|||
* package. Provides an OpenMBean conform implementation.
|
||||
*
|
||||
* @author Bjoern Martin
|
||||
* @since 1.4 (2007-04)
|
||||
* @since 1.5
|
||||
*/
|
||||
public class SigarMem extends AbstractMBean {
|
||||
|
||||
|
@ -60,55 +60,34 @@ public class SigarMem extends AbstractMBean {
|
|||
private static MBeanParameterInfo MBEAN_PARAM_SIGAR;
|
||||
|
||||
static {
|
||||
MBEAN_ATTR_ACTUAL_FREE = new MBeanAttributeInfo(
|
||||
"ActualFree", "long",
|
||||
"TODO add proper description here",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_ACTUAL_USED = new MBeanAttributeInfo(
|
||||
"ActualUsed", "long",
|
||||
"TODO add proper description here",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_FREE = new MBeanAttributeInfo(
|
||||
"Free", "long",
|
||||
"TODO add proper description here",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_RAM = new MBeanAttributeInfo(
|
||||
"Ram", "long",
|
||||
"TODO add proper description here",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_TOTAL = new MBeanAttributeInfo(
|
||||
"Total", "long",
|
||||
"TODO add proper description here",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_USED = new MBeanAttributeInfo(
|
||||
"Used", "long",
|
||||
"TODO add proper description here",
|
||||
true, false, false);
|
||||
MBEAN_PARAM_SIGAR = new MBeanParameterInfo(
|
||||
"sigar", Sigar.class.getName(),
|
||||
"The Sigar instance to use to fetch data from");
|
||||
MBEAN_CONSTR_SIGAR = new MBeanConstructorInfo(
|
||||
SigarMem.class.getName(),
|
||||
"Creates a new instance, using the Sigar instance " +
|
||||
"specified to fetch the data.",
|
||||
new MBeanParameterInfo[]{
|
||||
MBEAN_PARAM_SIGAR});
|
||||
MBEAN_ATTR_ACTUAL_FREE = new MBeanAttributeInfo("ActualFree", "long",
|
||||
"TODO add proper description here", true, false, false);
|
||||
MBEAN_ATTR_ACTUAL_USED = new MBeanAttributeInfo("ActualUsed", "long",
|
||||
"TODO add proper description here", true, false, false);
|
||||
MBEAN_ATTR_FREE = new MBeanAttributeInfo("Free", "long",
|
||||
"TODO add proper description here", true, false, false);
|
||||
MBEAN_ATTR_RAM = new MBeanAttributeInfo("Ram", "long",
|
||||
"TODO add proper description here", true, false, false);
|
||||
MBEAN_ATTR_TOTAL = new MBeanAttributeInfo("Total", "long",
|
||||
"TODO add proper description here", true, false, false);
|
||||
MBEAN_ATTR_USED = new MBeanAttributeInfo("Used", "long",
|
||||
"TODO add proper description here", true, false, false);
|
||||
MBEAN_PARAM_SIGAR = new MBeanParameterInfo("sigar", Sigar.class
|
||||
.getName(), "The Sigar instance to use to fetch data from");
|
||||
MBEAN_CONSTR_SIGAR = new MBeanConstructorInfo(SigarMem.class.getName(),
|
||||
"Creates a new instance, using the Sigar instance "
|
||||
+ "specified to fetch the data.",
|
||||
new MBeanParameterInfo[] { MBEAN_PARAM_SIGAR });
|
||||
MBEAN_INFO = new MBeanInfo(
|
||||
SigarMem.class.getName(),
|
||||
"Sigar Memory MBean, provides raw data for the physical " +
|
||||
"memory installed on the system. Uses an internal cache " +
|
||||
"that invalidates within 500ms, allowing for bulk request " +
|
||||
"being satisfied with a single dataset fetch.",
|
||||
new MBeanAttributeInfo[]{
|
||||
MBEAN_ATTR_ACTUAL_FREE,
|
||||
MBEAN_ATTR_ACTUAL_USED,
|
||||
MBEAN_ATTR_FREE,
|
||||
MBEAN_ATTR_RAM,
|
||||
MBEAN_ATTR_TOTAL,
|
||||
MBEAN_ATTR_USED},
|
||||
new MBeanConstructorInfo[]{
|
||||
MBEAN_CONSTR_SIGAR},
|
||||
null, null);
|
||||
"Sigar Memory MBean, provides raw data for the physical "
|
||||
+ "memory installed on the system. Uses an internal cache "
|
||||
+ "that invalidates within 500ms, allowing for bulk request "
|
||||
+ "being satisfied with a single dataset fetch.",
|
||||
new MBeanAttributeInfo[] { MBEAN_ATTR_ACTUAL_FREE,
|
||||
MBEAN_ATTR_ACTUAL_USED, MBEAN_ATTR_FREE,
|
||||
MBEAN_ATTR_RAM, MBEAN_ATTR_TOTAL, MBEAN_ATTR_USED },
|
||||
new MBeanConstructorInfo[] { MBEAN_CONSTR_SIGAR }, null, null);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -57,32 +57,40 @@ import org.hyperic.sigar.SigarException;
|
|||
* it all down again.</p>
|
||||
*
|
||||
* @author Bjoern Martin
|
||||
* @since 1.4 (2007-04)
|
||||
* @since 1.5
|
||||
*/
|
||||
public class SigarRegistry extends AbstractMBean {
|
||||
|
||||
private static final String MBEAN_TYPE = "SigarRegistry";
|
||||
|
||||
private static final MBeanInfo MBEAN_INFO;
|
||||
|
||||
private static final MBeanConstructorInfo MBEAN_CONSTR_DEFAULT;
|
||||
|
||||
// private static final MBeanOperationInfo MBEAN_OPER_LISTPROCESSES;
|
||||
|
||||
static {
|
||||
MBEAN_CONSTR_DEFAULT = new MBeanConstructorInfo(
|
||||
SigarRegistry.class.getName(),
|
||||
"Creates a new instance of this class. Will create the Sigar " +
|
||||
"instance this class uses when constructing other MBeans",
|
||||
"Creates a new instance of this class. Will create the Sigar "
|
||||
+ "instance this class uses when constructing other MBeans",
|
||||
new MBeanParameterInfo[0]);
|
||||
// MBEAN_OPER_LISTPROCESSES = new MBeanOperationInfo("listProcesses",
|
||||
// "Executes a query returning the process IDs of all processes " +
|
||||
// "found on the system.",
|
||||
// null /* new MBeanParameterInfo[0] */,
|
||||
// String.class.getName(), MBeanOperationInfo.INFO);
|
||||
|
||||
MBEAN_INFO = new MBeanInfo(
|
||||
SigarRegistry.class.getName(),
|
||||
"Sigar MBean registry. Provides a central point for creation " +
|
||||
"and destruction of Sigar MBeans. Any Sigar MBean created via " +
|
||||
"this instance will automatically be cleaned up when this " +
|
||||
"instance is deregistered from the MBean server.",
|
||||
"Sigar MBean registry. Provides a central point for creation "
|
||||
+ "and destruction of Sigar MBeans. Any Sigar MBean created via "
|
||||
+ "this instance will automatically be cleaned up when this "
|
||||
+ "instance is deregistered from the MBean server.",
|
||||
null /*new MBeanAttributeInfo[0]*/,
|
||||
new MBeanConstructorInfo[]{
|
||||
MBEAN_CONSTR_DEFAULT},
|
||||
null, null);
|
||||
new MBeanConstructorInfo[] { MBEAN_CONSTR_DEFAULT },
|
||||
null /*new MBeanOperationInfo[0] */,
|
||||
null /*new MBeanNotificationInfo[0]*/);
|
||||
}
|
||||
|
||||
private final String objectName;
|
||||
|
@ -95,25 +103,40 @@ public class SigarRegistry extends AbstractMBean {
|
|||
*/
|
||||
public SigarRegistry() {
|
||||
super(new Sigar(), CACHELESS);
|
||||
this.objectName = SigarInvokerJMX.DOMAIN_NAME + ":"
|
||||
+ MBEAN_ATTR_TYPE + "=" + MBEAN_TYPE;
|
||||
this.objectName = SigarInvokerJMX.DOMAIN_NAME + ":" + MBEAN_ATTR_TYPE
|
||||
+ "=" + MBEAN_TYPE;
|
||||
this.managedBeans = new ArrayList();
|
||||
}
|
||||
|
||||
/*
|
||||
/* (non-Javadoc)
|
||||
* @see AbstractMBean#getObjectName()
|
||||
*/
|
||||
public String getObjectName() {
|
||||
return this.objectName;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see javax.management.DynamicMBean#getMBeanInfo()
|
||||
*/
|
||||
public MBeanInfo getMBeanInfo() {
|
||||
return MBEAN_INFO;
|
||||
/* public String listProcesses() {
|
||||
try {
|
||||
final long start = System.currentTimeMillis();
|
||||
long[] ids = sigar.getProcList();
|
||||
StringBuffer procNames = new StringBuffer();
|
||||
for (int i = 0; i < ids.length; i++) {
|
||||
try {
|
||||
procNames.append(ids[i] + ":" + sigar.getProcExe(ids[i]).getName()).append('\n');
|
||||
} catch (SigarException e) {
|
||||
procNames.append(ids[i] + ":" + e.getMessage()).append('\n');
|
||||
}
|
||||
}
|
||||
|
||||
final long end = System.currentTimeMillis();
|
||||
procNames.append("-- Took " + (end-start) + "ms");
|
||||
return procNames.toString();
|
||||
|
||||
} catch (SigarException e) {
|
||||
throw unexpectedError("ProcList", e);
|
||||
}
|
||||
}
|
||||
*/
|
||||
/* (non-Javadoc)
|
||||
* @see javax.management.DynamicMBean#getAttribute(java.lang.String)
|
||||
*/
|
||||
|
@ -133,11 +156,20 @@ public class SigarRegistry extends AbstractMBean {
|
|||
*/
|
||||
public Object invoke(String action, Object[] params, String[] signatures)
|
||||
throws MBeanException, ReflectionException {
|
||||
|
||||
/* if (MBEAN_OPER_LISTPROCESSES.getName().equals(action))
|
||||
return listProcesses();
|
||||
|
||||
else */
|
||||
throw new ReflectionException(new NoSuchMethodException(action), action);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see javax.management.DynamicMBean#getMBeanInfo()
|
||||
*/
|
||||
public MBeanInfo getMBeanInfo() {
|
||||
return MBEAN_INFO;
|
||||
}
|
||||
|
||||
// -------
|
||||
// Implementation of the MBeanRegistration interface
|
||||
|
@ -161,6 +193,9 @@ public class SigarRegistry extends AbstractMBean {
|
|||
|
||||
// get memory
|
||||
registerMemoryBeans();
|
||||
|
||||
// get system
|
||||
registerSystemBeans();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -177,8 +212,10 @@ public class SigarRegistry extends AbstractMBean {
|
|||
// add CPU bean
|
||||
SigarCpu nextCpu = new SigarCpu(sigarImpl, i);
|
||||
try {
|
||||
if (!mbeanServer.isRegistered(new ObjectName(nextCpu.getObjectName())))
|
||||
nextRegistered = mbeanServer.registerMBean(nextCpu, null);
|
||||
if (!mbeanServer.isRegistered(new ObjectName(nextCpu
|
||||
.getObjectName())))
|
||||
nextRegistered = mbeanServer.registerMBean(nextCpu,
|
||||
null);
|
||||
} catch (Exception e) { // ignore
|
||||
}
|
||||
// add MBean to set of managed beans
|
||||
|
@ -189,8 +226,10 @@ public class SigarRegistry extends AbstractMBean {
|
|||
// add CPU percentage bean
|
||||
SigarCpuPerc nextCpuPerc = new SigarCpuPerc(sigarImpl, i);
|
||||
try {
|
||||
if (!mbeanServer.isRegistered(new ObjectName(nextCpuPerc.getObjectName())))
|
||||
nextRegistered = mbeanServer.registerMBean(nextCpuPerc, null);
|
||||
if (!mbeanServer.isRegistered(new ObjectName(nextCpuPerc
|
||||
.getObjectName())))
|
||||
nextRegistered = mbeanServer.registerMBean(nextCpuPerc,
|
||||
null);
|
||||
} catch (Exception e) { // ignore
|
||||
}
|
||||
// add MBean to set of managed beans
|
||||
|
@ -201,8 +240,10 @@ public class SigarRegistry extends AbstractMBean {
|
|||
// add CPU info bean
|
||||
SigarCpuInfo nextCpuInfo = new SigarCpuInfo(sigarImpl, i);
|
||||
try {
|
||||
if (!mbeanServer.isRegistered(new ObjectName(nextCpuInfo.getObjectName())))
|
||||
nextRegistered = mbeanServer.registerMBean(nextCpuInfo, null);
|
||||
if (!mbeanServer.isRegistered(new ObjectName(nextCpuInfo
|
||||
.getObjectName())))
|
||||
nextRegistered = mbeanServer.registerMBean(nextCpuInfo,
|
||||
null);
|
||||
} catch (Exception e) { // ignore
|
||||
}
|
||||
// add MBean to set of managed beans
|
||||
|
@ -252,6 +293,29 @@ public class SigarRegistry extends AbstractMBean {
|
|||
nextRegistered = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers MBeans for the Sigar types <code>LoadAverage</code>...
|
||||
*/
|
||||
private void registerSystemBeans() {
|
||||
|
||||
ObjectInstance nextRegistered = null;
|
||||
|
||||
// add load average bean
|
||||
SigarLoadAverage loadAvg = new SigarLoadAverage(sigarImpl);
|
||||
|
||||
try {
|
||||
if (!mbeanServer.isRegistered(new ObjectName(loadAvg
|
||||
.getObjectName())))
|
||||
nextRegistered = mbeanServer.registerMBean(loadAvg, null);
|
||||
} catch (Exception e) { // ignore
|
||||
}
|
||||
|
||||
// add MBean to set of managed beans
|
||||
if (nextRegistered != null)
|
||||
managedBeans.add(nextRegistered.getObjectName());
|
||||
nextRegistered = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Deregisters all Sigar MBeans that were created and registered using this
|
||||
* instance. After doing so, a super call is made to satisfy {@link AbstractMBean}.
|
||||
|
|
|
@ -35,7 +35,7 @@ import org.hyperic.sigar.SigarException;
|
|||
* package. Provides an OpenMBean conform implementation.
|
||||
*
|
||||
* @author Bjoern Martin
|
||||
* @since 1.4 (2007-04)
|
||||
* @since 1.5
|
||||
*/
|
||||
public class SigarSwap extends AbstractMBean {
|
||||
|
||||
|
@ -54,39 +54,30 @@ public class SigarSwap extends AbstractMBean {
|
|||
private static MBeanParameterInfo MBEAN_PARAM_SIGAR;
|
||||
|
||||
static {
|
||||
MBEAN_ATTR_FREE = new MBeanAttributeInfo(
|
||||
"Free", "long",
|
||||
"The amount of free swap memory, in [bytes]",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_TOTAL = new MBeanAttributeInfo(
|
||||
"Total", "long",
|
||||
"The total amount of swap memory, in [bytes]",
|
||||
true, false, false);
|
||||
MBEAN_ATTR_USED = new MBeanAttributeInfo(
|
||||
"Used", "long",
|
||||
"The amount of swap memory in use, in [bytes]",
|
||||
true, false, false);
|
||||
MBEAN_PARAM_SIGAR = new MBeanParameterInfo(
|
||||
"sigar", Sigar.class.getName(),
|
||||
"The Sigar instance to use to fetch data from");
|
||||
MBEAN_ATTR_FREE = new MBeanAttributeInfo("Free", "long",
|
||||
"The amount of free swap memory, in [bytes]", true, false,
|
||||
false);
|
||||
MBEAN_ATTR_TOTAL = new MBeanAttributeInfo("Total", "long",
|
||||
"The total amount of swap memory, in [bytes]", true, false,
|
||||
false);
|
||||
MBEAN_ATTR_USED = new MBeanAttributeInfo("Used", "long",
|
||||
"The amount of swap memory in use, in [bytes]", true, false,
|
||||
false);
|
||||
MBEAN_PARAM_SIGAR = new MBeanParameterInfo("sigar", Sigar.class
|
||||
.getName(), "The Sigar instance to use to fetch data from");
|
||||
MBEAN_CONSTR_SIGAR = new MBeanConstructorInfo(
|
||||
SigarSwap.class.getName(),
|
||||
"Creates a new instance, using the Sigar instance " +
|
||||
"specified to fetch the data.",
|
||||
new MBeanParameterInfo[]{
|
||||
MBEAN_PARAM_SIGAR});
|
||||
"Creates a new instance, using the Sigar instance "
|
||||
+ "specified to fetch the data.",
|
||||
new MBeanParameterInfo[] { MBEAN_PARAM_SIGAR });
|
||||
MBEAN_INFO = new MBeanInfo(
|
||||
SigarSwap.class.getName(),
|
||||
"Sigar Swap MBean, provides raw data for the swap memory " +
|
||||
"configured on the system. Uses an internal cache that " +
|
||||
"invalidates within 5 seconds.",
|
||||
new MBeanAttributeInfo[]{
|
||||
MBEAN_ATTR_FREE,
|
||||
MBEAN_ATTR_TOTAL,
|
||||
"Sigar Swap MBean, provides raw data for the swap memory "
|
||||
+ "configured on the system. Uses an internal cache that "
|
||||
+ "invalidates within 5 seconds.",
|
||||
new MBeanAttributeInfo[] { MBEAN_ATTR_FREE, MBEAN_ATTR_TOTAL,
|
||||
MBEAN_ATTR_USED },
|
||||
new MBeanConstructorInfo[]{
|
||||
MBEAN_CONSTR_SIGAR},
|
||||
null, null);
|
||||
new MBeanConstructorInfo[] { MBEAN_CONSTR_SIGAR }, null, null);
|
||||
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue