perfsonar development work

Author: dfn.calim
Date: 2012-12-20 11:56:02 +0000 (Thu, 20 Dec 2012)
New Revision: 785

Modified:
   branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc
   branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm
Log:
add new data type for jitter in owamp mp and schema

Modified: branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc      
2012-12-19 12:26:21 UTC (rev 784)
+++ branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc      
2012-12-20 11:56:02 UTC (rev 785)
@@ -143,7 +143,7 @@
                attribute startTime { string } &
                attribute endTime { string }
                attribute maxError { xsd:float } &
-               attribute jitter { xsd:unsignedInt } &
+               attribute jitter { xsd:float } &
                attribute hops { xsd:unsignedInt } &
                
 

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm  2012-12-19 
12:26:21 UTC (rev 784)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm  2012-12-20 
11:56:02 UTC (rev 785)
@@ -310,7 +310,9 @@
             }elsif ($resultline =~
             #one-way jitter = 0.1 ms (P95-P50)
             /one-way jitter\s+=\s+([0-9.]+)\s+(\w+)\s\(P95-P50\)/){
-                $data_hash{"jitter"} = $1;
+               my $jitter = $1;
+               $jitter = "NaN" if $jitter =~ m/nan/;
+                $data_hash{"jitter"} = $jitter;
                 #$data_hash{"jitter_units"} = $2;            
            }elsif ($resultline =~
             #Hops = 12 (consistently)