[jboss-cvs] jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/model ...
Takuro Okada
t2-okada at nri.co.jp
Tue Oct 31 06:27:51 EST 2006
User: tokada
Date: 06/10/31 06:27:51
Modified: java/src/expansion/org/jboss/profiler/exp/agent/collector/model
Tag: JBossProfiler_Expansion StackMetric.java
Metric.java MetricName.java ThreadMetric.java
TimeScaleMetric.java ScaleMetric.java
Log:
Added some interfaces for the persistor.
Revision Changes Path
No revision
No revision
1.1.2.2 +14 -0 jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/model/Attic/StackMetric.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: StackMetric.java
===================================================================
RCS file: /cvsroot/jboss/jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/model/Attic/StackMetric.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- StackMetric.java 26 Oct 2006 08:58:56 -0000 1.1.2.1
+++ StackMetric.java 31 Oct 2006 11:27:51 -0000 1.1.2.2
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
/**
*
@@ -56,4 +57,17 @@
this.stacks = stacks;
}
+ public Object toProperties() {
+ // TODO implement
+ return null;
+ }
+
+ public void fromProperties(Map<String, String> properties) {
+ // TODO implement
+ }
+
+ public void merge(Metric metric) {
+ // TODO implement
+ }
+
}
1.1.2.2 +19 -0 jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/model/Attic/Metric.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Metric.java
===================================================================
RCS file: /cvsroot/jboss/jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/model/Attic/Metric.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- Metric.java 26 Oct 2006 08:58:56 -0000 1.1.2.1
+++ Metric.java 31 Oct 2006 11:27:51 -0000 1.1.2.2
@@ -23,6 +23,7 @@
package org.jboss.profiler.exp.agent.collector.model;
import java.io.Serializable;
+import java.util.Map;
/**
* The entity object for metric value.
@@ -46,4 +47,22 @@
*/
void reset();
+ /**
+ * Merges the metric data
+ * @param metric
+ */
+ void merge(Metric metric);
+
+ /**
+ * Converts to properties expression.
+ * @return properties expression (Map / List of Map)
+ */
+ Object toProperties();
+
+ /**
+ * Converts to metric value.
+ * @param properties - properties expression
+ */
+ void fromProperties(Map<String, String> properties);
+
}
\ No newline at end of file
1.1.2.2 +4 -4 jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/model/Attic/MetricName.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MetricName.java
===================================================================
RCS file: /cvsroot/jboss/jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/model/Attic/MetricName.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- MetricName.java 26 Oct 2006 08:58:56 -0000 1.1.2.1
+++ MetricName.java 31 Oct 2006 11:27:51 -0000 1.1.2.2
@@ -52,16 +52,16 @@
USER_CPU_TIME_PASSAGE_DETAIL("Elapsed CPU Time (User)"),
REAL_TIME_PASSAGE_DETAIL("Elapsed Time");
- private String name = null;
+ private String expression = null;
- private MetricName(String name) {
- this.name = name;
+ private MetricName(String expression) {
+ this.expression = expression;
}
/**
* Returns a string representation.
*/
public String toString() {
- return this.name;
+ return this.expression;
}
}
\ No newline at end of file
1.1.2.2 +40 -0 jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/model/Attic/ThreadMetric.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ThreadMetric.java
===================================================================
RCS file: /cvsroot/jboss/jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/model/Attic/ThreadMetric.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- ThreadMetric.java 26 Oct 2006 08:58:56 -0000 1.1.2.1
+++ ThreadMetric.java 31 Oct 2006 11:27:51 -0000 1.1.2.2
@@ -25,7 +25,9 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
*
@@ -57,6 +59,44 @@
return entries;
}
+ public void merge(Metric metric) {
+ ThreadMetric target = (ThreadMetric)metric;
+ List<Entry> entries = target.getEntries();
+ if(entries.size()>0) {
+ this.entries.addAll(entries);
+ }
+ }
+
+ public Object toProperties() {
+ List<Map> mapList = new ArrayList<Map>(entries.size());
+ for(Entry entry : this.entries) {
+ Map<String, String> expression = new HashMap<String, String>();
+ expression.put("methodName", entry.getMethodName());
+ expression.put("timestamp", String.valueOf(entry.getTimestamp()));
+ expression.put("value", String.valueOf(entry.getValue()));
+ expression.put("caller", String.valueOf(entry.getCaller()));
+ expression.put("addition", String.valueOf(entry.getAddition()));
+ mapList.add(expression);
+ }
+ return mapList;
+ }
+
+ public void fromProperties(Map<String, String> properties) {
+ if(properties.containsKey("methodName") &&
+ properties.containsKey("timestamp") &&
+ properties.containsKey("value") &&
+ properties.containsKey("caller") &&
+ properties.containsKey("addition")) {
+ reset();
+ Entry entry = new Entry(properties.get("methodName"),
+ Long.valueOf(properties.get("timestamp")),
+ Long.valueOf(properties.get("value")),
+ properties.get("caller"),
+ properties.get("addition"));
+ entries.add(entry);
+ }
+ }
+
public class Entry implements Serializable, Comparable<Entry> {
private String methodName = null;
private long timestamp = 0L;
1.1.2.2 +14 -0 jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/model/Attic/TimeScaleMetric.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TimeScaleMetric.java
===================================================================
RCS file: /cvsroot/jboss/jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/model/Attic/TimeScaleMetric.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- TimeScaleMetric.java 26 Oct 2006 08:58:56 -0000 1.1.2.1
+++ TimeScaleMetric.java 31 Oct 2006 11:27:51 -0000 1.1.2.2
@@ -25,6 +25,7 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
*
@@ -55,6 +56,19 @@
return entries;
}
+ public Object toProperties() {
+ // TODO implement
+ return null;
+ }
+
+ public void fromProperties(Map<String, String> properties) {
+ // TODO implement
+ }
+
+ public void merge(Metric metric) {
+ // TODO implement
+ }
+
public class Entry implements Serializable, Comparable<Entry> {
private long timestamp = 0L;
private long value = 0L;
1.1.2.2 +52 -0 jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/model/Attic/ScaleMetric.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ScaleMetric.java
===================================================================
RCS file: /cvsroot/jboss/jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/model/Attic/ScaleMetric.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- ScaleMetric.java 26 Oct 2006 08:58:56 -0000 1.1.2.1
+++ ScaleMetric.java 31 Oct 2006 11:27:51 -0000 1.1.2.2
@@ -22,6 +22,9 @@
package org.jboss.profiler.exp.agent.collector.model;
+import java.util.HashMap;
+import java.util.Map;
+
/**
*
* @see org.jboss.profiler.production.service.OperationMetric
@@ -63,6 +66,22 @@
count = 0L;
}
+ public void merge(Metric metric) {
+ ScaleMetric target = (ScaleMetric)metric;
+ count += target.getCount();
+ if(count==0) return;
+ long high = target.getHigh();
+ if(high > this.high) {
+ this.high = high;
+ }
+ long low = target.getLow();
+ if(low < this.low || this.count==1) {
+ this.low = low;
+ }
+ total += target.getTotal();
+ average = total / count;
+ }
+
@Override
public Metric clone() {
ScaleMetric clone = new ScaleMetric();
@@ -75,6 +94,35 @@
return clone;
}
+ public Object toProperties() {
+ Map<String, String> expression = new HashMap<String, String>();
+ expression.put("high", String.valueOf(this.high));
+ expression.put("low", String.valueOf(this.low));
+ expression.put("average", String.valueOf(this.average));
+ expression.put("last", String.valueOf(this.last));
+ expression.put("total", String.valueOf(this.total));
+ expression.put("count", String.valueOf(this.count));
+ return expression;
+ }
+
+ public void fromProperties(Map<String, String> properties) {
+ if(properties.containsKey("high") &&
+ properties.containsKey("low") &&
+ properties.containsKey("average") &&
+ properties.containsKey("last") &&
+ properties.containsKey("total") &&
+ properties.containsKey("count")) {
+ reset();
+ this.high = Long.valueOf(properties.get("high"));
+ this.low = Long.valueOf(properties.get("low"));
+ this.average = Long.valueOf(properties.get("average"));
+ this.last = Long.valueOf(properties.get("last"));
+ this.total = Long.valueOf(properties.get("total"));
+ this.count = Long.valueOf(properties.get("count"));
+ }
+
+ }
+
public long getAverage() {
return average;
}
@@ -95,4 +143,8 @@
return count;
}
+ public long getTotal() {
+ return total;
+ }
+
}
More information about the jboss-cvs-commits
mailing list