Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4961 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf doc packaging/deb packaging/rpm samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store

Subject: perfsonar development work

List archive

perfsonar: r4961 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf doc packaging/deb packaging/rpm samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4961 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf doc packaging/deb packaging/rpm samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
  • Date: Wed, 11 Feb 2009 07:18:36 -0500
Author: roman
Date: 2009-02-11 07:18:36 -0500 (Wed, 11 Feb 2009)
New Revision: 4961

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-iperf.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Interface_Specification.doc
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java

branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
Log:
merged with the trunk (-r 4945:4960)


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2009-02-11 11:40:16 UTC (rev 4960)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2009-02-11 12:18:36 UTC (rev 4961)
@@ -45,10 +45,10 @@
<target name="copy-dep-service-jars"
depends="copy-dep-base-service-jars">

- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090203/perfsonar-base-1.0.20090203.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090210/perfsonar-base-1.0.20090210.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.3c/perfsonar-web-admin-0.9.3c.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20090210/nmwg-1.0.20090210.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

<copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/com/ibatis/ibatis-sqlmap/2.1.7.597/ibatis-sqlmap-2.1.7.597.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
@@ -288,10 +288,10 @@

<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>

- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090203/perfsonar-base-1.0.20090203.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090210/perfsonar-base-1.0.20090210.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.3c/perfsonar-web-admin-0.9.3c.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20090210/nmwg-1.0.20090210.jar"
todir="${tmpdir}/WEB-INF/lib"/>

<copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/com/ibatis/ibatis-sqlmap/2.1.7.597/ibatis-sqlmap-2.1.7.597.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2009-02-11 11:40:16 UTC (rev 4960)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2009-02-11 12:18:36 UTC (rev 4961)
@@ -54,10 +54,10 @@

<artifact:dependencies>

- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20090203"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20090210"/>
<dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.3c"/>
<dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="3.1"/>
- <dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080630"/>
+ <dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20090210"/>

<dependency groupId="rrdjtool" artifactId="rrdjtool"
version="1.0"/>
<dependency groupId="com.ibatis" artifactId="ibatis-sqlmap"
version="2.1.7.597"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2009-02-11 11:40:16 UTC (rev 4960)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2009-02-11 12:18:36 UTC (rev 4961)
@@ -80,10 +80,10 @@

<!-- copy jar files -->
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090203/perfsonar-base-1.0.20090203.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090210/perfsonar-base-1.0.20090210.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.3c/perfsonar-web-admin-0.9.3c.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20090210/nmwg-1.0.20090210.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/com/ibatis/ibatis-sqlmap/2.1.7.597/ibatis-sqlmap-2.1.7.597.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/mysql/mysql-connector-java/5.0.3/mysql-connector-java-5.0.3.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-iperf.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-iperf.xml 2009-02-11
11:40:16 UTC (rev 4960)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-iperf.xml 2009-02-11
12:18:36 UTC (rev 4961)
@@ -23,6 +23,9 @@
<result property="numBytesUnits" column="numBytesUnits" />
<result property="time" column="time" />
<result property="interv" column="interv" />
+ <result property="throughput" column="throughput" />
+ <result property="jitter" column="jitter" />
+ <result property="loss" column="loss" />
</resultMap>


@@ -36,7 +39,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select value, valueUnits, numBytes, numBytesUnits, time, interv
+ select value, valueUnits, numBytes, numBytesUnits, time, interv,
throughput, jitter, loss
from perfsonar_iperf
where metadataId = ?
and time >= ?
@@ -56,7 +59,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select value, valueUnits, numBytes, numBytesUnits, time, interv
+ select value, valueUnits, numBytes, numBytesUnits, time, interv,
throughput, jitter, loss
from perfsonar_iperf
where metadataId = ?
and time = (select MAX(time) from perfsonar_iperf where metadataId =
?)
@@ -77,14 +80,17 @@
<parameter property="numBytesUnits" />
<parameter property="time" />
<parameter property="interv" />
+ <parameter property="throughput" />
+ <parameter property="jitter" />
+ <parameter property="loss" />
</parameterMap>


<insert id="setResults"
parameterMap="insert-parameters">
<![CDATA[
- insert into perfsonar_iperf (metadataId, value, valueUnits,
numBytes, numBytesUnits, time, interv, ts)
- values (?, ?, ?, ?, ?, ?, ?, default)
+ insert into perfsonar_iperf (metadataId, value, valueUnits,
numBytes, numBytesUnits, time, interv, throughput, jitter, loss, ts)
+ values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, default)
]]>
</insert>


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
2009-02-11 11:40:16 UTC (rev 4960)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
2009-02-11 12:18:36 UTC (rev 4961)
@@ -90,13 +90,16 @@
CREATE TABLE
perfsonar_iperf
(metadataId VARCHAR(30) NOT NULL,
- value FLOAT (16,4) NOT NULL,
+ value FLOAT (16,4) NULL,
valueUnits VARCHAR(30) NULL,
+ throughput FLOAT (16,4) NULL,
+ jitter FLOAT (16,4) NULL,
+ loss VARCHAR(15) NULL,
numBytes INT NULL,
numBytesUnits VARCHAR(15) NULL,
+ interv VARCHAR(30) NULL,
time INT NOT NULL,
format VARCHAR(30) NULL,
- interv VARCHAR(30) NULL,
protocol VARCHAR(10) NULL,
bufferLength INT NULL,
windowSize INT NULL,
@@ -274,11 +277,11 @@

INSERT
INTO perfsonar_iperf
- VALUES ('meta1-iperf-test', 93938560, 'bits/sec', 23484640, 'Bytes',
1197642642, NULL, NULL, 'TCP', NULL, NULL, NULL, NULL, NULL, NULL, default);
+ VALUES ('meta1-iperf-test', NULL, 'bits/sec', 2.88, 1.830, '0/837',
23484640, 'Bytes', NULL, 1197642642, NULL, 'TCP', NULL, NULL, NULL, NULL,
NULL, NULL, default);

INSERT
INTO perfsonar_iperf
- VALUES ('meta2-iperf-test', 93938560, 'bits/sec', 23484640, 'Bytes',
1197642662, NULL, NULL, 'UDP', NULL, NULL, NULL, NULL, NULL, NULL, default);
+ VALUES ('meta2-iperf-test', NULL, 'bits/sec', 1.45, 1.806, '5/851',
23484640, 'Bytes', NULL, 1197642662, NULL, 'UDP', NULL, NULL, NULL, NULL,
NULL, NULL, default);




Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
2009-02-11 11:40:16 UTC (rev 4960)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
2009-02-11 12:18:36 UTC (rev 4961)
@@ -105,13 +105,16 @@
create table
perfsonar_iperf
(metadataId varchar(30) not null,
- value double precision not null,
+ value double precision null,
valueUnits varchar(30) null,
+ throughput double precision null,
+ jitter double precision null,
+ loss varchar(15) null,
numBytes integer null,
numBytesUnits varchar(15) null,
+ interv varchar(30) null,
time integer not null,
format varchar(30) null,
- interv varchar(30) null,
protocol varchar(10) null,
bufferLength integer null,
windowSize integer null,
@@ -220,11 +223,11 @@

insert
into perfsonar_iperf
- values ('meta1-iperf-test', 93938560, 'bits/sec', 23484640, 'Bytes',
1197642642, null, null, 'TCP', null, null, null, null, null, null, default);
+ values ('meta1-iperf-test', null, 'bits/sec', 2.88, 1.830, '0/837',
23484640, 'Bytes', null, 1197642642, null, 'TCP', null, null, null, null,
null, null, default);

insert
into perfsonar_iperf
- values ('meta2-iperf-test', 93938560, 'bits/sec', 23484640, 'Bytes',
1197642662, null, null, 'UDP', null, null, null, null, null, null, default);
+ values ('meta2-iperf-test', null, 'bits/sec', 1.45, 1.806, '5/851',
23484640, 'Bytes', null, 1197642662, null, 'UDP', null, null, null, null,
null, null, default);


-- insert statements for testing clmp_ping table

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2009-02-11
11:40:16 UTC (rev 4960)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2009-02-11
12:18:36 UTC (rev 4961)
@@ -1,11 +1,13 @@
Relational Database MA

-2009-02-03 Version 2.1.1
+2009-02-10 Version 2.1.1
- New: support for iperf/nmwg metadata and data
- Change: xquery statements ("fetch all") for utilization, discards and
errors metadata elements updated
- Change: admin guide document updated (v1.2)
- Change: dealing with ping data updated and officially supported
- - Change: use of pSbase v1.0.20090203
+ - Change: use of pSbase v1.0.20090210
+ - Change: use of nmwg v1.0.20090210
+ - Change: register interval time in seconds


2008-10-01 Version 2.1

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Interface_Specification.doc
===================================================================
(Binary files differ)

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog 2009-02-11
11:40:16 UTC (rev 4960)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog 2009-02-11
12:18:36 UTC (rev 4961)
@@ -4,9 +4,11 @@
* Change: xquery statements ("fetch all") for utilization, discards and
errors metadata elements updated
* Change: admin guide document updated (v1.2)
* Change: dealing with ping data updated and officially supported
- * Change: use of pSbase v1.0.20090203
+ * Change: use of pSbase v1.0.20090210
+ * Change: use of nmwg v1.0.20090210
+ * Change: register interval time in seconds

- -- Roman Lapacz
<>
Wed, 03 Feb 2009 12:00:00 +0200
+ -- Roman Lapacz
<>
Wed, 11 Feb 2009 12:00:00 +0200

geant2-java-sql-ma (2.1-1) stable; urgency=low


Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
2009-02-11 11:40:16 UTC (rev 4960)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
2009-02-11 12:18:36 UTC (rev 4961)
@@ -116,12 +116,14 @@


%changelog
-* Wed Feb 03 2009 Roman Lapacz
<>
2.1.1-1
+* Wed Feb 11 2009 Roman Lapacz
<>
2.1.1-1
- New: support for iperf/nmwg metadata and data
- Change: xquery statements ("fetch all") for utilization, discards and
errors metadata elements updated
- Change: admin guide document updated (v1.2)
- Change: dealing with ping data updated and officially supported
-- Change: use of pSbase v1.0.20090203
+- Change: use of pSbase v1.0.20090210
+- Change: use of nmwg v1.0.20090210
+- Change: register interval time in seconds

* Wed Oct 01 2008 Roman Lapacz
<>
2.1-1
- New: ibatisConfig parameter can be moved from store requests to
eventType-map configuration file

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2009-02-11 11:40:16 UTC (rev
4960)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2009-02-11 12:18:36 UTC (rev
4961)
@@ -128,7 +128,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-base</artifactId>
- <version>1.0.20090203</version>
+ <version>1.0.20090210</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml
2009-02-11 11:40:16 UTC (rev 4960)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml
2009-02-11 12:18:36 UTC (rev 4961)
@@ -38,9 +38,9 @@


<nmwg:data id="1" metadataIdRef="iperf-metadata">
- <iperf:datum numBytesUnits="Bytes" timeValue="1233919273"
numBytes="23484640" value="93938560" valueUnits="bits/sec"/>
- <iperf:datum numBytesUnits="Bytes" timeValue="1233919274"
numBytes="23525896" value="94103581" valueUnits="bits/sec"/>
- <iperf:datum numBytesUnits="Bytes" timeValue="1233919275"
numBytes="58851328" value="93840272" valueUnits="bits/sec"/>
+ <iperf:datum throughput="1.03" jitter="1.23" loss="0/837"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273826" valueUnits="bits/sec"/>
+ <iperf:datum throughput="4.46" jitter="1.11" loss="3/835"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273836" valueUnits="bits/sec"/>
+ <iperf:datum throughput="3.22" jitter="1.42" loss="5/855"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273846" valueUnits="bits/sec"/>
</nmwg:data>



Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml
2009-02-11 11:40:16 UTC (rev 4960)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml
2009-02-11 12:18:36 UTC (rev 4961)
@@ -17,9 +17,9 @@
</nmwg:metadata>

<nmwg:data id="d1" metadataIdRef="m1">
- <iperf:datum numBytesUnits="Bytes" timeValue="1233919574"
numBytes="23484640" value="93938565" valueUnits="bits/sec"/>
- <iperf:datum numBytesUnits="Bytes" timeValue="1233919575"
numBytes="23525896" value="94103586" valueUnits="bits/sec"/>
- <iperf:datum numBytesUnits="Bytes" timeValue="1233919576"
numBytes="58851328" value="93840277" valueUnits="bits/sec"/>
+ <iperf:datum throughput="1.03" jitter="1.23" loss="0/837"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273826" valueUnits="bits/sec"/>
+ <iperf:datum throughput="4.46" jitter="1.11" loss="3/835"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273836" valueUnits="bits/sec"/>
+ <iperf:datum throughput="3.22" jitter="1.42" loss="5/855"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273846" valueUnits="bits/sec"/>
</nmwg:data>



Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
2009-02-11 11:40:16 UTC (rev 4960)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
2009-02-11 12:18:36 UTC (rev 4961)
@@ -87,6 +87,12 @@
datum.addAttr("timeType", "unix", null);
} else if (column.equals("interv"))
datum.addAttr("interval", strValue, null);
+ else if (column.equals("throughput"))
+ datum.addAttr("throughput", strValue, null);
+ else if (column.equals("jitter"))
+ datum.addAttr("jitter", strValue, null);
+ else if (column.equals("loss"))
+ datum.addAttr("loss", strValue, null);

//logger.debug("IperfResponseGenerator.getResponse: "
// + "column: " + column + ", value: " + strValue );

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
2009-02-11 11:40:16 UTC (rev 4960)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
2009-02-11 12:18:36 UTC (rev 4961)
@@ -45,27 +45,46 @@
String numBytes = ((Datum)datum).getNumBytes();
String numBytesUnits = ((Datum)datum).getNumBytesUnits();
String interval = ((Datum)datum).getInterval();
+ String throughput = ((Datum)datum).getThroughput();
+ String jitter = ((Datum)datum).getJitter();
+ String loss = ((Datum)datum).getLoss();

if (valueUnits.trim().equals("")) valueUnits = null;
if (numBytes.trim().equals("")) numBytes = null;
if (numBytesUnits.trim().equals("")) numBytesUnits = null;
if (interval.trim().equals("")) interval = null;
+ if (loss.trim().equals("")) loss = null;

ibatisParams.put("valueUnits", valueUnits);
ibatisParams.put("time", Integer.parseInt(timeValue));
ibatisParams.put("numBytes", numBytes);
ibatisParams.put("numBytesUnits", numBytesUnits);
ibatisParams.put("interv", interval);
+ ibatisParams.put("loss", loss);

try {
- // or a float
ibatisParams.put("value", Float.parseFloat(strValue));
} catch (Exception ex) {
//logger.debug("IperfStoreRequestProcess.store: " +
ex.toString());
// value is a string ...
- ibatisParams.put("value", strValue);
+ //ibatisParams.put("value", strValue);
+ ibatisParams.put("value", null);
}

+ try {
+ ibatisParams.put("throughput", Float.parseFloat(throughput));
+ } catch (Exception ex) {
+ //logger.debug("IperfStoreRequestProcess.store: " +
ex.toString());
+ ibatisParams.put("throughput", null);
+ }
+
+ try {
+ ibatisParams.put("jitter", Float.parseFloat(jitter));
+ } catch (Exception ex) {
+ //logger.debug("IperfStoreRequestProcess.store: " +
ex.toString());
+ ibatisParams.put("jitter", null);
+ }
+
return ibatisParams;

}


  • perfsonar: r4961 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf doc packaging/deb packaging/rpm samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store, svnlog, 02/11/2009

Archive powered by MHonArc 2.6.16.

Top of Page