perfsonar development work

Author: dfn.calim
Date: 2012-12-13 14:15:26 +0000 (Thu, 13 Dec 2012)
New Revision: 782

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:
fix the unsync problem in OWAMP MP

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-07 11:07:46 UTC (rev 781)
+++ branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc      
2012-12-13 14:15:26 UTC (rev 782)
@@ -111,10 +111,10 @@
        element owamp:datum {
                attribute sequenceNumber { xsd:unsignedInt } &
                attribute packetTTL { xsd:unsignedInt } &
-               attribute sendTime { xsd:int } &
+               attribute sendTime { xsd:unsignedLong } &
                attribute sendSynchronized { xsd:int } &
                attribute sendTimeError { xsd:float } &
-               attribute receiveTime { xsd:int } &
+               attribute receiveTime { xsd:unsignedLong } &
                attribute receiveSynchronized { xsd:int } &
                attribute receiveTimeError { xsd:float } &
        }
@@ -122,7 +122,12 @@
 
 ############################################
 #### Summary data datum from OWAMP MP   ####
-############################################
+#### Note: Some informaton about       ####
+#### attribute values:                 ####
+#### maxError: Sometimes ntp is not    ####
+####           synchronieds. For thsi  ####
+####           the value is set to Nan. ####
+#############################################
 SummaryDatum =
         element summary:datum {
                attribute sender { xsd:string } &

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-07 
11:07:46 UTC (rev 781)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm  2012-12-13 
14:15:26 UTC (rev 782)
@@ -186,7 +186,7 @@
     my $time = time;
     my @datalines = ();
    
-    #$self->{LOGGER}->info("@result");    
+    $self->{LOGGER}->info("@result");    
  
     if ($self->{OUTPUTTYPE} eq  "raw"){
        foreach my $resultline (@result){
@@ -284,14 +284,23 @@
            $data_hash{"endTime"} = $endTime;
             } elsif ($resultline =~
                 #one-way delay min/median/max = 0.202/0.4/0.582 ms, 
(err=0.628 ms)
-                /one-way delay min\/median\/max = 
(\S+\/\S+\/\S+)\s+(\w+),\s+\(err=(.+)\s+(\w+)/){
+                #/one-way delay min\/median\/max = 
(\S+\/\S+\/\S+)\s+(\w+),\s+\(err=(.+)\s+(\w+)/){
+               /one-way delay min\/median\/max = 
(\S+\/\S+\/\S+)\s+(\w+),\s+\((.+)\)/){
                 my $delay = $1;
                 my ($min,$med,$max) = split ("/", $delay);
                 $data_hash{"min_delay"} = $min;
                 $data_hash{"med_delay"} = $med;
                 $data_hash{"max_delay"} = $max;
                 $data_hash{"timeType"} = $2;
-                $data_hash{"maxError"} = $3;
+               if ( $3 =~
+               # unsynchronized
+               /unsync/ ){
+                       $data_hash{"maxError"} = "NaN";
+               }elsif (  $3 =~
+               #err=0.628 ms
+               /err=(.+)\s+(\w+)/){
+                       $data_hash{"maxError"} = $1;
+               }
                 #$data_hash{"error_units"} = $4;
                 #push @datalines, \%data_hash;
             }elsif ($resultline =~