Mercurial > hg > release > thermostat-0.6

changeset 21:f495dd894e0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include main-class in the information extracted from a target vm
author Omair Majid <omajid@redhat.com>
date Fri, 16 Dec 2011 14:45:29 -0500
parents 51fb566e27dc
children ddf0d119f249
files src/com/redhat/thermostat/backend/system/JvmStatDataExtractor.java src/com/redhat/thermostat/backend/system/JvmStatHostListener.java src/com/redhat/thermostat/common/VmInfo.java
diffstat 3 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/com/redhat/thermostat/backend/system/JvmStatDataExtractor.java	Tue Dec 13 11:56:52 2011 -0500
+++ b/src/com/redhat/thermostat/backend/system/JvmStatDataExtractor.java	Fri Dec 16 14:45:29 2011 -0500
@@ -35,6 +35,10 @@
         return MonitoredVmUtil.commandLine(vm);
     }
 
+    public String getMainClass() throws MonitorException {
+        return MonitoredVmUtil.mainClass(vm, true);
+    }
+
     public String getJavaVersion() throws MonitorException {
         return (String) vm.findByName("java.property.java.version").getValue();
     }
--- a/src/com/redhat/thermostat/backend/system/JvmStatHostListener.java	Tue Dec 13 11:56:52 2011 -0500
+++ b/src/com/redhat/thermostat/backend/system/JvmStatHostListener.java	Fri Dec 16 14:45:29 2011 -0500
@@ -90,7 +90,8 @@
                 Map<String, String> environment = new HashMap<String, String>();
                 List<String> loadedNativeLibraries = new ArrayList<String>();
                 info = new VmInfo(vmId, startTime, stopTime,
-                        extractor.getJavaVersion(), extractor.getJavaHome(), extractor.getCommandLine(),
+                        extractor.getJavaVersion(), extractor.getJavaHome(),
+                        extractor.getMainClass(), extractor.getCommandLine(),
                         extractor.getVmName(), extractor.getVmInfo(), extractor.getVmVersion(), extractor.getVmArguments(),
                         properties, environment, loadedNativeLibraries);
                 // FIXME storage.addVmInfo(info);
--- a/src/com/redhat/thermostat/common/VmInfo.java	Tue Dec 13 11:56:52 2011 -0500
+++ b/src/com/redhat/thermostat/common/VmInfo.java	Fri Dec 16 14:45:29 2011 -0500
@@ -12,6 +12,7 @@
     private String javaVersion = "unknown";
     private String javaHome = "unknown";
     private String javaCommandLine = "unknown";
+    private String mainClass = "unknown";
     private String vmName = "unknown";
     private String vmInfo = "unknown";
     private String vmVersion = "unknown";
@@ -25,7 +26,8 @@
     }
 
     public VmInfo(int vmPid, long startTime, long stopTime,
-            String javaVersion, String javaHome, String commandLine,
+            String javaVersion, String javaHome,
+            String mainClass, String commandLine,
             String vmName, String vmInfo, String vmVersion, String vmArguments,
             Map<String, String> properties, Map<String, String> environment, List<String> loadedNativeLibraries) {
         this.vmPid = vmPid;
@@ -33,6 +35,7 @@
         this.stopTime = stopTime;
         this.javaVersion = javaVersion;
         this.javaHome = javaHome;
+        this.mainClass = mainClass;
         this.javaCommandLine = commandLine;
         this.vmName = vmName;
         this.vmInfo = vmInfo;
@@ -67,6 +70,10 @@
         return javaHome;
     }
 
+    public String getMainClass() {
+        return mainClass;
+    }
+
     public String getJavaCommandLine() {
         return javaCommandLine;
     }