Modularized the client to allow for profiling

Author: gdanezis

awstest.py

@@ -0,0 +1,22 @@
+import boto3
+ec2 = boto3.resource('ec2')
+
+instances = ec2.instances.filter()
+for instance in instances:
+    print(instance.id, instance.state["Name"], instance.public_dns_name)
+
+if False:
+	ids = [i.id for i in instances]
+	try:
+		ec2.instances.filter(InstanceIds=ids).stop()
+		ec2.instances.filter(InstanceIds=ids).terminate()
+	except Exception as e:
+		print e
+
+if False:
+	print ec2.create_instances(
+		ImageId='ami-178be960', 
+		InstanceType='t2.micro',
+		SecurityGroupIds= [ 'sg-ae5f0fcb' ],
+		MinCount=1, 
+		MaxCount=1 )

fabfile.py

@@ -42,7 +42,7 @@ def dyn_server_role():
 from collections import defaultdict
 env.timings = defaultdict(list)
 
-NUM_MACHINES = 8
+NUM_MACHINES = 60
 
 @runs_once
 def ec2start():
@@ -195,7 +195,7 @@ def deploy():
 
 @runs_once
 def experiment1():
-    env.messages = 200
+    env.messages = 2000
     env.expname = "experiment1"
     local( "rm -rf experiment1" )
     local( "mkdir experiment1" )
@@ -205,6 +205,8 @@ def experiment1():
     execute( "experiment1collect" )
     # local( "mkdir experiment1" )
     local("python exp1plot.py experiment1")
+    local("python estthroughput.py %s > %s/stats.txt" % (env.expname, env.expname))
+
 
 @roles("clients")
 @parallel
@@ -264,9 +266,12 @@ def experiment2():
     local("python simscript.py 2000 payments.txt")
     local("./rsc.py --play payments.txt-issue > experiment2/issue-times.txt")
     local("./rsc.py --play payments.txt-r1 --conn 20 > experiment2/r1-times.txt")
+    # local("python -m cProfile -s tottime rsc.py --play payments.txt-r2 > experiment2/r2-times.txt")
     local("./rsc.py --play payments.txt-r2 > experiment2/r2-times.txt")
 
     local("python exp1plot.py experiment2")
+    local("python estthroughput.py experiment2 > experiment2/stats.txt")
+
 
 
 @runs_once

rsc.py

@@ -226,8 +226,7 @@ def process_query_response(resp):
 
 import socket
 
-if __name__ == "__main__":
-    
+def main():    
     dir_data = load_setup(file("directory.conf").read())
     # directory = dir_data["directory"]
 
@@ -430,3 +429,6 @@ def r_process(results):
             d.addCallback(r_process)
             d.addBoth(r_stop)
             reactor.run()
+
+if __name__ == "__main__":
+    main()