Author: fmeschbe
Date: Tue Apr 20 13:37:50 2010
New Revision: 935915
URL: http://svn.apache.org/viewvc?rev=935915&view=rev
Log:
FELIX-2291 Provide number of processors available to the Java VM in the System
Information tab
Modified:
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatPlugin.java
felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
felix/trunk/webconsole/src/main/resources/templates/vmstat.html
Modified:
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatPlugin.java
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatPlugin.java?rev=935915&r1=935914&r2=935915&view=diff
==============================================================================
---
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatPlugin.java
(original)
+++
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatPlugin.java
Tue Apr 20 13:37:50 2010
@@ -109,7 +109,7 @@ public class VMStatPlugin extends Simple
System.gc();
System.gc(); // twice for sure
}
- else if ( request.getParameter( PARAM_SHUTDOWN_TIMER ) == null )
+ else if ( request.getParameter( PARAM_SHUTDOWN_TIMER ) == null )
{
// whether to stop or restart the framework
@@ -206,6 +206,7 @@ public class VMStatPlugin extends Simple
json.put( "jvm", System.getProperty( "java.vm.name" ) + "(build "
+ System.getProperty( "java.vm.version" )
+ ", " + System.getProperty( "java.vm.info" ) + ")" );
json.put( "shutdownTimer", shutdownTimer );
+ json.put( "processors", Runtime.getRuntime().availableProcessors()
);
json.put( "mem_total", totalMem );
json.put( "mem_free", freeMem );
json.put( "mem_used", usedMem );
Modified:
felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties?rev=935915&r1=935914&r2=935915&view=diff
==============================================================================
---
felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties
[UTF-8] (original)
+++
felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties
[UTF-8] Tue Apr 20 13:37:50 2010
@@ -61,6 +61,7 @@ vmstat.shutdown.in=Stoppe in
vmstat.java.title=Java Information:
vmstat.java.runtime=Java Runtime
vmstat.java.jvm=Java Virtual Machine
+vmstat.processors=Anzahl Prozessoren
vmstat.mem.total=Total Hauptspeicher
vmstat.mem.used=Benutzter Hauptspeicher
vmstat.mem.free=Freier Hauptspeicher
Modified:
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties?rev=935915&r1=935914&r2=935915&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
(original)
+++ felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
Tue Apr 20 13:37:50 2010
@@ -62,6 +62,7 @@ vmstat.shutdown.in=Shutdown in
vmstat.java.title=Java Information:
vmstat.java.runtime=Java Runtime
vmstat.java.jvm=Java Virtual Machine
+vmstat.processors=Number of Processors
vmstat.mem.total=Total Memory
vmstat.mem.used=Used Memory
vmstat.mem.free=Free Memory
Modified: felix/trunk/webconsole/src/main/resources/templates/vmstat.html
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/vmstat.html?rev=935915&r1=935914&r2=935915&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/vmstat.html [UTF-8]
(original)
+++ felix/trunk/webconsole/src/main/resources/templates/vmstat.html [UTF-8] Tue
Apr 20 13:37:50 2010
@@ -82,6 +82,10 @@ var statData = ${startData};
<td>${vmstat.java.jvm}</td>
<td id="jvm">-</td>
</tr>
+ <tr>
+ <td>${vmstat.processors}</td>
+ <td id="processors">-</td>
+ </tr>
<tr>
<td>${vmstat.mem.total}</td>
<td id="mem_total">-</td>
