perfsonar development work

Author: mac
Date: 2007-04-27 05:34:42 -0400 (Fri, 27 Apr 2007)
New Revision: 2364

Added:
   trunk/perfsonar/contrib/benchmarking/ls/jar/copy-jars-from-lib
   trunk/perfsonar/contrib/benchmarking/ls/words
   trunk/perfsonar/contrib/benchmarking/ls/words_create
Modified:
   trunk/perfsonar/contrib/benchmarking/ls/config.props
   trunk/perfsonar/contrib/benchmarking/ls/generateDB.pl
   trunk/perfsonar/contrib/benchmarking/ls/generate_files
   trunk/perfsonar/contrib/benchmarking/ls/jar/required-jars
   trunk/perfsonar/contrib/benchmarking/ls/runclient
   trunk/perfsonar/contrib/benchmarking/ls/test1
Log:
changes to benchmarking - test1

words_create - create words file basing on dict/words
copy-jars-from-lib - as name says

other small changes



Modified: trunk/perfsonar/contrib/benchmarking/ls/config.props
===================================================================
--- trunk/perfsonar/contrib/benchmarking/ls/config.props        2007-04-26 
13:43:14 UTC (rev 2363)
+++ trunk/perfsonar/contrib/benchmarking/ls/config.props        2007-04-27 
09:34:42 UTC (rev 2364)
@@ -1,7 +1,8 @@
-LOOKUP_SERVICE=http://localhost:8080/axis/services/LookupService
+LOOKUP_SERVICE=http://localhost:8080/projects/services/LookupService
+#LOOKUP_SERVICE=http://localhost:8080/axis/services/LookupService
 #LOOKUP_SERVICE=http://loco4.man.poznan.pl:8090/axis/services/LookupService
 
-JAVA=/usr/java/java/bin/java
+JAVA=/usr/bin/java
 
 TEMPDIR=temp
 INPUTDIR=storage

Modified: trunk/perfsonar/contrib/benchmarking/ls/generateDB.pl
===================================================================
--- trunk/perfsonar/contrib/benchmarking/ls/generateDB.pl       2007-04-26 
13:43:14 UTC (rev 2363)
+++ trunk/perfsonar/contrib/benchmarking/ls/generateDB.pl       2007-04-27 
09:34:42 UTC (rev 2364)
@@ -29,6 +29,10 @@
 #           registration information. (services/and interfaces
 #           hosted by that service.)
 #
+#    Require:
+#        WorlList.pm:
+#        http://search.cpan.org/~adeo/Data-Random-0.05/Random/WordList.pm
+#
 #    Usage:
 #           ./generateDB.pl -s nservices -i ninterfaces -t (message|store)
 #
@@ -61,7 +65,8 @@
     NUMINTERFACES => 100,
     EXACTINTERFACES => 0,
     TYPE => "message",
-    DICT => '/usr/share/dict/words',
+#    DICT => '/usr/share/dict/words',
+    DICT => 'words',
 );
 
 # reverse mapping of command-line hash

Modified: trunk/perfsonar/contrib/benchmarking/ls/generate_files
===================================================================
--- trunk/perfsonar/contrib/benchmarking/ls/generate_files      2007-04-26 
13:43:14 UTC (rev 2363)
+++ trunk/perfsonar/contrib/benchmarking/ls/generate_files      2007-04-27 
09:34:42 UTC (rev 2364)
@@ -2,6 +2,10 @@
 
 STORAGE_DIR=storage
 
+if [ -x $STORAGE_DIR ] ; then :
+else mkdir $STORAGE_DIR
+fi
+
 #test1
 
 echo Remove old test1 files

Added: trunk/perfsonar/contrib/benchmarking/ls/jar/copy-jars-from-lib


Property changes on: 
trunk/perfsonar/contrib/benchmarking/ls/jar/copy-jars-from-lib
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/perfsonar/contrib/benchmarking/ls/jar/required-jars
===================================================================
--- trunk/perfsonar/contrib/benchmarking/ls/jar/required-jars   2007-04-26 
13:43:14 UTC (rev 2363)
+++ trunk/perfsonar/contrib/benchmarking/ls/jar/required-jars   2007-04-27 
09:34:42 UTC (rev 2364)
@@ -1,5 +1,3 @@
-These JAR files are required to run the client:
-
 activation-1.0.2.jar
 axis-1.4.jar
 axis-jaxrpc-1.4.jar
@@ -7,8 +5,4 @@
 commons-discovery-0.2.jar
 commons-logging-1.0.4.jar
 mail-1.3.2.jar
-required-jars
 xercesImpl-2.6.2.jar
-
-They all may be found on our local JAR repository or a public one.
-

Modified: trunk/perfsonar/contrib/benchmarking/ls/runclient
===================================================================
--- trunk/perfsonar/contrib/benchmarking/ls/runclient   2007-04-26 13:43:14 
UTC (rev 2363)
+++ trunk/perfsonar/contrib/benchmarking/ls/runclient   2007-04-27 09:34:42 
UTC (rev 2364)
@@ -7,7 +7,7 @@
 
 . config.props
 
-CLASSPATH=/projects/sonar/perfsonar/build
+CLASSPATH=../../../build
 CLIENT=org.perfsonar.client.testHarness.SOAPClient
 
 LOOKUP_SERVICE=$1
@@ -20,4 +20,5 @@
 
 # ------ build CLASSPATH ----------------------------------------------------
 
-$JAVA -classpath $CLASSPATH $CLIENT $LOOKUP_SERVICE $INPUT_FILE $OUTPUT_FILE 
| grep "time taken" | sed "s/^.*\:\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/"
+$JAVA -classpath $CLASSPATH $CLIENT $LOOKUP_SERVICE $INPUT_FILE $OUTPUT_FILE
+# | grep "time taken" | sed "s/^.*\:\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/"
\ No newline at end of file

Modified: trunk/perfsonar/contrib/benchmarking/ls/test1
===================================================================
--- trunk/perfsonar/contrib/benchmarking/ls/test1       2007-04-26 13:43:14 
UTC (rev 2363)
+++ trunk/perfsonar/contrib/benchmarking/ls/test1       2007-04-27 09:34:42 
UTC (rev 2364)
@@ -12,6 +12,14 @@
 #where to store results
 CSV=test1.csv
 
+if [ -x $TEMPDIR ] ; then :
+else mkdir $TEMPDIR
+fi
+
+if [ -x $OUTPUTDIR ] ; then :
+else mkdir $OUTPUTDIR
+fi
+
 #CSV Header
 echo "file,interfaces,register,reregister,deregister" > $OUTPUTDIR/$CSV
 
@@ -29,13 +37,14 @@
     
     #register
     echo [Registering]
+    REGISTER=0
     REGISTER=$(./runclient $LOOKUP_SERVICE $i $TEMPDIR/out.register.xml.temp)
     echo $REGISTER
     
     #re-register
     echo [Re-registering]
     REREGISTER=0
-    #REREGISTER=$(./runclient $LOOKUP_SERVICE $i 
$TEMPDIR/out.reregister.xml.temp)
+    REREGISTER=$(./runclient $LOOKUP_SERVICE $i 
$TEMPDIR/out.reregister.xml.temp)
     echo $REREGISTER
         
     #deregister
@@ -47,7 +56,7 @@
     cat $TEMPDIR/metadata.temp >> $TEMPDIR/deregister-request.temp
     cat $TEMPLATEDIR/LSDeregisterRequest.xml.FOOT >> 
$TEMPDIR/deregister-request.temp    
     
-    
+    DEREGISTER=0
     DEREGISTER=$(./runclient $LOOKUP_SERVICE 
$TEMPDIR/deregister-request.temp $TEMPDIR/out.deregister.xml.temp)
     echo $DEREGISTER
     

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

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


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