svn commit: r417128 - in /incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool: reports/XmlFilePerfReportWriter.java sampler/plugins/LinuxCpuSamplerPlugin.java

[aco]

Author: aco
Date: Sun Jun 25 23:29:46 2006
New Revision: 417128

URL: http://svn.apache.org/viewvc?rev=417128&view=rev
Log:
- Modify delimiters for cpu sampler data

Modified:
    
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java
    
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/plugins/LinuxCpuSamplerPlugin.java

Modified: 
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java
URL: 
http://svn.apache.org/viewvc/incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java?rev=417128&r1=417127&r2=417128&view=diff
==============================================================================
--- 
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java
 (original)
+++ 
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java
 Sun Jun 25 23:29:46 2006
@@ -312,7 +312,7 @@
     }
 
     protected void parsePerfCsvData(String elementName, String csvData) {
-        StringTokenizer tokenizer = new StringTokenizer(csvData, ",");
+        StringTokenizer tokenizer = new StringTokenizer(csvData, ",;");
         String xmlElement;
 
         xmlElement = "<" + elementName;

Modified: 
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/plugins/LinuxCpuSamplerPlugin.java
URL: 
http://svn.apache.org/viewvc/incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/plugins/LinuxCpuSamplerPlugin.java?rev=417128&r1=417127&r2=417128&view=diff
==============================================================================
--- 
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/plugins/LinuxCpuSamplerPlugin.java
 (original)
+++ 
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/plugins/LinuxCpuSamplerPlugin.java
 Sun Jun 25 23:29:46 2006
@@ -7,19 +7,19 @@
 public class LinuxCpuSamplerPlugin implements CpuSamplerPlugin {
 
        private String vmstat = "vmstat";
-       
+
        public String getCpuUtilizationStats() {
                try {
                        Process p = Runtime.getRuntime().exec(vmstat);
                        BufferedReader br = new BufferedReader(new 
InputStreamReader(p.getInputStream()), 1024);
-                       
+
                        br.readLine(); // throw away the first line
-                       
+
                        String header = br.readLine();
                        String data   = br.readLine();
-                       
+
                        br.close();
-                       
+
                        // Convert to CSV of key=value pair
                        return convertToCSV(header, data);
                } catch (Exception e) {
@@ -35,16 +35,16 @@
        public void setVmstat(String vmstat) {
                this.vmstat = vmstat;
        }
-       
+
        protected String convertToCSV(String header, String data) {
                StringTokenizer headerTokens = new StringTokenizer(header, " ");
                StringTokenizer dataTokens   = new StringTokenizer(data, " ");
-               
+
                String csv = "";
                while (headerTokens.hasMoreTokens()) {
-                       csv += (headerTokens.nextToken() + "=" + 
dataTokens.nextToken() + ";");
+                       csv += (headerTokens.nextToken() + "=" + 
dataTokens.nextToken() + ",");
                }
-               
+
                return csv;
        }
 }