perfsonar development work

Author: mac
Date: 2006-09-08 08:26:14 -0400 (Fri, 08 Sep 2006)
New Revision: 1626

Added:
   trunk/perfsonar/contrib/benchmarking/ls/config.props
   trunk/perfsonar/contrib/benchmarking/ls/test1
Modified:
   trunk/perfsonar/contrib/benchmarking/ls/benchmark
   trunk/perfsonar/contrib/benchmarking/ls/generateDB.pl
   trunk/perfsonar/contrib/benchmarking/ls/generate_files
   trunk/perfsonar/contrib/benchmarking/ls/runclient
Log:
generateDB - one simple bug, XML definition was inside '' and \n character 
wasn't parsed but printed and XML wasn not well-formed

Other files are for benchmarking



Modified: trunk/perfsonar/contrib/benchmarking/ls/benchmark
===================================================================
--- trunk/perfsonar/contrib/benchmarking/ls/benchmark   2006-09-08 12:19:33 
UTC (rev 1625)
+++ trunk/perfsonar/contrib/benchmarking/ls/benchmark   2006-09-08 12:26:14 
UTC (rev 1626)
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-runclient query1.xml
-runclient query2.xml
-#...
+./test1
+#./test2
+#./test3.

Added: trunk/perfsonar/contrib/benchmarking/ls/config.props

Modified: trunk/perfsonar/contrib/benchmarking/ls/generateDB.pl
===================================================================
--- trunk/perfsonar/contrib/benchmarking/ls/generateDB.pl       2006-09-08 
12:19:33 UTC (rev 1625)
+++ trunk/perfsonar/contrib/benchmarking/ls/generateDB.pl       2006-09-08 
12:26:14 UTC (rev 1626)
@@ -193,7 +193,7 @@
 my @hnames = $wl->get_words($defaults{'NUMSERVICES'});
 
 if($defaults{'TYPE'} eq "store"){
-    print '<?xml version="1.0" encoding="UTF-8"?>\n';
+    print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 }
 
 print << "HEADER";

Modified: trunk/perfsonar/contrib/benchmarking/ls/generate_files
===================================================================
--- trunk/perfsonar/contrib/benchmarking/ls/generate_files      2006-09-08 
12:19:33 UTC (rev 1625)
+++ trunk/perfsonar/contrib/benchmarking/ls/generate_files      2006-09-08 
12:26:14 UTC (rev 1626)
@@ -11,7 +11,11 @@
 for i in $LIST
 do  
     echo Generate [1] service [$i] interfaces
-    perl ./generateDB.pl -s 1 -i $i -t message  > 
$STORAGE_DIR/test1_msg_s1i$i.xml
+    FILENAME=$STORAGE_DIR/test1_msg_s1i$i.xml
+    #generate
+    perl ./generateDB.pl -s 1 -I $i -t message  > $FILENAME
+    #check
+    echo  - generated [$(cat $FILENAME | grep \<nmwg:data | wc -l)] data 
elements
 done
 
 echo DONE.
\ No newline at end of file

Modified: trunk/perfsonar/contrib/benchmarking/ls/runclient
===================================================================
--- trunk/perfsonar/contrib/benchmarking/ls/runclient   2006-09-08 12:19:33 
UTC (rev 1625)
+++ trunk/perfsonar/contrib/benchmarking/ls/runclient   2006-09-08 12:26:14 
UTC (rev 1626)
@@ -5,15 +5,14 @@
 
 # ------ settings -----------------------------------------------------------
 
-JAVA=/usr/java/java/bin/java
+. config.props
 
 CLASSPATH=/projects/sonar/perfsonar/build
 CLIENT=org.perfsonar.client.testHarness.SOAPClient
-#LOOKUP_SERVICE=http://loco4.man.poznan.pl:8090/axis/services/LookupService
-LOOKUP_SERVICE=http://localhost:8080/axis/services/LookupService
 
-INPUT_FILE=$1
-OUTPUT_FILE=out.xml
+LOOKUP_SERVICE=$1
+INPUT_FILE=$2
+OUTPUT_FILE=$3
 
 # ------ run client ---------------------------------------------------------
 
@@ -21,4 +20,4 @@
 
 # ------ build CLASSPATH ----------------------------------------------------
 
-$JAVA -classpath $CLASSPATH $CLIENT $LOOKUP_SERVICE $INPUT_FILE $OUTPUT_FILE 
| grep "time taken"
+$JAVA -classpath $CLASSPATH $CLIENT $LOOKUP_SERVICE $INPUT_FILE $OUTPUT_FILE 
| grep "time taken" | sed "s/^.*\:\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/"

Added: trunk/perfsonar/contrib/benchmarking/ls/test1


Property changes on: trunk/perfsonar/contrib/benchmarking/ls/test1
___________________________________________________________________
Name: svn:executable
   + *