You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by wo...@apache.org on 2004/03/16 04:49:53 UTC
cvs commit: jakarta-jmeter/src/monitor/components/org/apache/jmeter/visualizers MonitorAccumModel.java MonitorHealthVisualizer.java
woolfel 2004/03/15 19:49:53
Modified: src/monitor/components/org/apache/jmeter/monitor/util
Stats.java
src/monitor/components/org/apache/jmeter/visualizers
MonitorAccumModel.java MonitorHealthVisualizer.java
Log:
just noticed my typo when I commited ObjectFactory. The custom
parse is fully implemented, it just needs logging added.
MonitorAccumModel now uses the new classes.
peter lin
Revision Changes Path
1.4 +4 -27 jakarta-jmeter/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java
Index: Stats.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Stats.java 13 Mar 2004 23:16:07 -0000 1.3
+++ Stats.java 16 Mar 2004 03:49:53 -0000 1.4
@@ -16,8 +16,8 @@
*/
package org.apache.jmeter.monitor.util;
-import javax.xml.bind.*;
-import org.apache.jorphan.tomcat.manager.*;
+import org.apache.jmeter.monitor.model.Connector;
+import org.apache.jmeter.monitor.model.Status;
/**
*
@@ -90,7 +90,7 @@
* <li> none of the above is dead
* </ol>
* @param stat
- * @return status
+ * @return
*/
public static int calculateStatus(Status stat){
if (stat != null){
@@ -151,27 +151,4 @@
return load;
}
- /**
- * Simple unit test to make sure it works correctly.
- * Will write a JUnit test later for this.
- * @param args
- */
- public static void main(String[] args)
- {
- try {
- JAXBContext jxbc = new ObjectFactory();
- // ObjectFactory.newInstance("org.apache.jorphan.tomcat.manager");
- Unmarshaller mar = jxbc.createUnmarshaller();
- Object ld = mar.unmarshal(new java.io.File("status3.xml"));
- System.out.println("successfully unmarshalled sample status");
- if (ld instanceof Status){
- System.out.println("status is " + calculateStatus((Status)ld));
- System.out.println("load is " + calculateLoad((Status)ld));
- System.out.println("mem load is " + calculateMemoryLoad((Status)ld));
- System.out.println("th load is " + calculateThreadLoad((Status)ld));
- }
- } catch (JAXBException e){
- e.printStackTrace();
- }
- }
}
1.4 +20 -39 jakarta-jmeter/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
Index: MonitorAccumModel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MonitorAccumModel.java 13 Mar 2004 23:16:07 -0000 1.3
+++ MonitorAccumModel.java 16 Mar 2004 03:49:53 -0000 1.4
@@ -16,7 +16,6 @@
*/
package org.apache.jmeter.visualizers;
-import java.io.ByteArrayInputStream;
import java.io.Serializable;
import java.net.URL;
import java.util.ArrayList;
@@ -25,12 +24,10 @@
import java.util.List;
import java.util.LinkedList;
-import javax.xml.bind.*;
-import javax.xml.transform.stream.StreamSource;
-
import org.apache.jmeter.samplers.Clearable;
import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jorphan.tomcat.manager.*;
+import org.apache.jmeter.monitor.model.ObjectFactory;
+import org.apache.jmeter.monitor.model.Status;
import org.apache.jmeter.monitor.util.Stats;
import org.apache.jmeter.protocol.http.sampler.HTTPSampleResult;
@@ -139,39 +136,23 @@
String rescontent = new String(sample.getResponseData());
if (sample.getResponseCode().equals("200") &&
((HTTPSampleResult)sample).isMonitor()){
- try {
- JAXBContext jxbc = new ObjectFactory();
- Unmarshaller mar = jxbc.createUnmarshaller();
- String resdata = new String(sample.getResponseData());
- // we trim because SAX still has a problem if there
- // extra linebreaks at the beginning. That has been
- // around for a long time.
- resdata = resdata.trim();
- resdata = resdata.replaceAll("\"?\"","\"0\"");
- StreamSource ss = new StreamSource(
- new ByteArrayInputStream(resdata.getBytes()));
- Object ld =
- mar.unmarshal(ss);
- if (ld instanceof Status){
- Status st = (Status)ld;
- MonitorStats stat =
- new MonitorStats(Stats.calculateStatus(st),
- Stats.calculateLoad(st),
- 0,
- Stats.calculateMemoryLoad(st),
- Stats.calculateThreadLoad(st),
- surl.getHost(),
- String.valueOf(surl.getPort()),
- surl.getProtocol(),
- System.currentTimeMillis());
-
- MonitorModel mo = new MonitorModel(stat);
- this.addSample(mo);
- notifyListeners(mo);
- }
- } catch (JAXBException e){
- // we don't log the errors
- // e.printStackTrace();
+ ObjectFactory of = ObjectFactory.getInstance();
+ Status st = of.parseBytes(sample.getResponseData());
+ if (st != null){
+ MonitorStats stat =
+ new MonitorStats(Stats.calculateStatus(st),
+ Stats.calculateLoad(st),
+ 0,
+ Stats.calculateMemoryLoad(st),
+ Stats.calculateThreadLoad(st),
+ surl.getHost(),
+ String.valueOf(surl.getPort()),
+ surl.getProtocol(),
+ System.currentTimeMillis());
+ MonitorModel mo = new MonitorModel(stat);
+ this.addSample(mo);
+ notifyListeners(mo);
+ } else {
noResponse(surl);
}
} else if (((HTTPSampleResult)sample).isMonitor() ){
1.4 +1 -2 jakarta-jmeter/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
Index: MonitorHealthVisualizer.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MonitorHealthVisualizer.java 13 Mar 2004 22:45:15 -0000 1.3
+++ MonitorHealthVisualizer.java 16 Mar 2004 03:49:53 -0000 1.4
@@ -18,7 +18,6 @@
import java.awt.BorderLayout;
import java.awt.Container;
-import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org