renaming for clarity
authorKali Kaneko (leap communications) <kali@leap.se>
Sun, 10 Apr 2016 23:02:25 +0000 (19:02 -0400)
committerKali Kaneko (leap communications) <kali@leap.se>
Sun, 10 Apr 2016 23:02:25 +0000 (19:02 -0400)
Makefile
get_client_cpu_mem.py [moved from get-client-cpu-mem.py with 100% similarity]
measure-perf-series.py
server_with_soledad_syncer.py [moved from server-solsync.py with 100% similarity]

index 606b55a..b570079 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Actual soledad sync
 
 soledad-sync-server:
-       ./server-solsync.py
+       ./server_with_soledad_syncer.py
 
 measure-ping:
        httperf --server localhost --port 8080 --num-calls 5 --num-conns 20 --uri /ping
similarity index 100%
rename from get-client-cpu-mem.py
rename to get_client_cpu_mem.py
index 24e9d5f..6cfcb02 100644 (file)
@@ -11,14 +11,9 @@ start = datetime.datetime.now()
 for i in range(POINTS):
     value = commands.getoutput('python get_ping_rate.py')
     print "Step", i, "...", value
-    # TODO --- cpu/mem too brittle.
-    cpu_mem = commands.getoutput('python get-client-cpu-mem.py')
+    cpu_mem = commands.getoutput('python get_client_cpu_mem.py')
     cpu, mem = cpu_mem.split()
-    print "CPU/MEM", cpu, mem
     now = datetime.datetime.now()
     secs = (now - start).total_seconds()
-    #print "TOOK", secs, "seconds"
     commands.getoutput(
-        #'echo %s\t%s >> series.log' % (secs, value))
         'echo %s\t%s\t%s\t%s >> series.log' % (secs, value, cpu, mem))
-    #, cpu, mem))