perfsonar development work

Author: trzaszcz
Date: 2009-12-04 04:44:19 -0500 (Fri, 04 Dec 2009)
New Revision: 5374

Added:
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/DeregistrationThread.py
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/QueryThread.py
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/ReregistrationThread.py
Modified:
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/inputs/LSRegistrationCore.xml
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/Main.py
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/Main.py
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/TestThread.py
Log:
multithreading tests for LS

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/inputs/LSRegistrationCore.xml
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/inputs/LSRegistrationCore.xml
       2009-12-03 15:34:56 UTC (rev 5373)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/inputs/LSRegistrationCore.xml
       2009-12-04 09:44:19 UTC (rev 5374)
@@ -7,7 +7,7 @@
     xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
     xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>
   
-    <nmwg:metadata id="meta1">
+    <nmwg:metadata id="metaId">
         <perfsonar:subject id="subj.15977808">
             <psservice:service id="229.148.249.60.16283379">
                 <psservice:serviceName>Java RRD MA</psservice:serviceName>

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/Main.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/Main.py
 2009-12-03 15:34:56 UTC (rev 5373)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/Main.py
 2009-12-04 09:44:19 UTC (rev 5374)
@@ -7,13 +7,16 @@
 import pl.psnc.trzaszczka.auxiliary.Auxiliary
 from pl.psnc.trzaszczka.auxiliary.XMLGenerator import XMLGenerator
 import os
+import time
 
 if __name__ == '__main__':
     
+    t=time.time()
     xmlGenerator=XMLGenerator()
     
content=xmlGenerator.generateMessage("../../../inputs/LSRegistrationCore.xml",
 "metaId", "192.168", "man.poznan.pl", 1000);
-    f=file("LSRegistrationRequest1000.xml","w")
-    f.write(content)
+    print "time :",(time.time()-t)
+#    f=file("LSRegistrationRequest1000.xml","w")
+#    f.write(content)
 #    print content;
 #    print xmlGenerator.generateIP("192")
     

Added: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/DeregistrationThread.py

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/Main.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/Main.py
  2009-12-03 15:34:56 UTC (rev 5373)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/Main.py
  2009-12-04 09:44:19 UTC (rev 5374)
@@ -4,6 +4,8 @@
 @author: czacha
 '''
 from pl.psnc.trzaszczka.multiThreadingTests.RegistrationThread import 
RegistrationThread
+from pl.psnc.trzaszczka.multiThreadingTests.QueryThread import QueryThread
+from pl.psnc.trzaszczka.multiThreadingTests.DeregistrationThread import 
DeregistrationThread
 import time
 
 
@@ -19,15 +21,21 @@
     # free ids prepared for registration
     f_list=range(1,1000)
     startTime=time.time()
-    endTime=120
-    resultDir="/home/czacha/Desktop"
+    endTime=180
+    resultDir="/home/czacha/Desktop/tests"
     
-    regThread1=RegistrationThread("Registration I", startTime, 0, endTime, 
0.05, host, url_path, 
"../../../../../inputs/LSRegistrationRequest1000.xml",resultDir, r_list, 
f_list)
-    regThread2=RegistrationThread("Registration II", startTime, 0, endTime, 
0.05, host, url_path, 
"../../../../../inputs/LSRegistrationRequest1000.xml",resultDir, r_list, 
f_list)
+    regThread1=RegistrationThread("Registration I", startTime, 0, endTime, 
1, host, url_path, 
"../../../../../inputs/LSRegistrationRequest1000.xml",resultDir, r_list, 
f_list)
+    regThread2=RegistrationThread("Registration II", startTime, 30, endTime, 
2, host, url_path, 
"../../../../../inputs/LSRegistrationRequest1000.xml",resultDir, r_list, 
f_list)
+    deregThread=DeregistrationThread("Deregistration I", startTime, 40, 
endTime, 0.5, host, url_path, 
"../../../../../inputs/LSRegistrationRequest1000.xml",resultDir, r_list, 
f_list)
+    queryThread1=QueryThread("Query I", startTime, 5, endTime, 0.05, host, 
url_path, "../../../../../inputs/LSQueryRequest.xml",resultDir, r_list, 
f_list)
+    queryThread2=QueryThread("Query II", startTime, 10, endTime, 0.05, host, 
url_path, "../../../../../inputs/LSQueryRequest.xml",resultDir, r_list, 
f_list)
+    
     regThread1.start()
-    regThread2.start();
+    regThread2.start()
+    deregThread.start()
+    queryThread1.start()
+    queryThread2.start()
+    
     print "GO !";
     
-    
-    
     
\ No newline at end of file

Added: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/QueryThread.py

Added: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/ReregistrationThread.py

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/TestThread.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/TestThread.py
    2009-12-03 15:34:56 UTC (rev 5373)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/multiThreadingTests/TestThread.py
    2009-12-04 09:44:19 UTC (rev 5374)
@@ -103,7 +103,7 @@
 startDelay:%(startDelay)f
 delay:%(delay)f
 nr of iteration: %(iteration)d
-avg:%{avg}f
+avg:%(avg)f
 ---------------------------
 """  % 
{"startDelay":self.start_delay,"delay":self.delay,"iteration":len(self.result),"avg":self.avg}
         content=content + self.getFormatedResult()