perfsonar development work

Author: ilias
Date: 2008-02-06 07:29:57 -0500 (Wed, 06 Feb 2008)
New Revision: 3313

Added:
   trunk/geant2_java-rrd-ma/contrib/perf-client/README.txt
   
trunk/geant2_java-rrd-ma/contrib/perf-client/create_setupdata_requests_CNM.pl
   trunk/geant2_java-rrd-ma/contrib/perf-client/helper/
   trunk/geant2_java-rrd-ma/contrib/perf-client/helper/conf.txt
   trunk/geant2_java-rrd-ma/contrib/perf-client/helper/create_metadata_file.pl
   trunk/geant2_java-rrd-ma/contrib/perf-client/requests/CNM/
Modified:
   trunk/geant2_java-rrd-ma/contrib/perf-client/perf-client.pl
Log:


Added: trunk/geant2_java-rrd-ma/contrib/perf-client/README.txt

Added: 
trunk/geant2_java-rrd-ma/contrib/perf-client/create_setupdata_requests_CNM.pl

Added: trunk/geant2_java-rrd-ma/contrib/perf-client/helper/conf.txt

Added: 
trunk/geant2_java-rrd-ma/contrib/perf-client/helper/create_metadata_file.pl

Modified: trunk/geant2_java-rrd-ma/contrib/perf-client/perf-client.pl
===================================================================
--- trunk/geant2_java-rrd-ma/contrib/perf-client/perf-client.pl 2008-02-06 
11:32:06 UTC (rev 3312)
+++ trunk/geant2_java-rrd-ma/contrib/perf-client/perf-client.pl 2008-02-06 
12:29:57 UTC (rev 3313)
@@ -12,6 +12,8 @@
 # perl perf-client.pl retrieve-all <interfaces_configured>
 # perl perf-client.pl refresh <interfaces_configured> 
<number_of_interfaces_to_be_polled>
 # perl perf-client.pl user-selection <interfaces_configured> 
<interface_to_be_polled>
+# perl perf-client.pl cnm-direct <interfaces_configured>
+# perl perf-client.pl cnm-indirect <interfaces_configured>
 #
 
 use threads;
@@ -80,6 +82,31 @@
     ";
 }
 
+if ($type =~ /CNM-indirect/){
+
+    $requests = $interfaces;
+    @out =`perl create_setupdata_requests_CNM.pl $interfaces indirect`;
+    print @out;
+    $polling_time = clientpart(1, "cnm-indirect" , $requests);
+
+    print "
+    Time used:
+    All interfaces using CNM indirect:  $polling_time
+    ";
+}
+if ($type =~ /CNM-direct/){
+
+    $requests = $interfaces;
+    @out =`perl create_setupdata_requests_CNM.pl $interfaces direct`;
+    $polling_time = clientpart(1, "cnm-direct" , $requests);
+
+    print "
+    Time used:
+    All interfaces using CNM direct:  $polling_time
+    ";
+}
+
+
 #clientpart (number_of_threads , setupdata / singlesetup / refresh / 
metadata , number_of_requests)
 sub clientpart{
 
@@ -118,8 +145,21 @@
         $DataQueue->enqueue("requests/refresh/setupDataRequest-$i.xml");
       }
     }
+    if ($type =~ /cnm-indirect/){
+      for ($i = 0 ; $i< $requests ; $i++){   
+        $DataQueue->enqueue("requests/CNM/metadataDataRequest-in-$i.xml");
+        $DataQueue->enqueue("requests/CNM/setupDataRequest-in-$i.xml");
+        $DataQueue->enqueue("requests/CNM/metadataDataRequest-out-$i.xml");
+        $DataQueue->enqueue("requests/CNM/setupDataRequest-out-$i.xml");
+      }
+    }
+    if ($type =~ /cnm-direct/){
+      for ($i = 0 ; $i< $requests ; $i++){
+        $DataQueue->enqueue("requests/CNM/setupDataRequest-in-$i.xml");   
+        $DataQueue->enqueue("requests/CNM/setupDataRequest-out-$i.xml");   
+      }
+    }  
 
-
     #Provide as many undefs as the threads spawned
     #This way we break the infinite while in the make_request sub
 
@@ -179,6 +219,7 @@
           my $result = $httpResponse->as_string(2);
       ### We got a result. We can throw it away now :)
       ### When we get out of scope, $result is no longer a concern for perl
+      print "$result\n\n\n";
     }
   return 1;
 }