1 files changed, 13 insertions, 2 deletions
diff --git a/series-ping.py b/series-ping.py
index 077c5ef..0993d08 100644
--- a/series-ping.py
+++ b/series-ping.py
@@ -1,5 +1,16 @@
 import commands
-for i in range(100):
+import datetime
+
+POINTS = 100
+
+start = datetime.datetime.now()
+
+for i in range(POINTS):
     value = commands.getoutput('python get_ping_rate.py')
     print "Step", i, "...", value
-    commands.getoutput('echo %s\t%s >> series.log' % (i, value))
+    cpu_mem = commands.getoutput('python get-client-cpu-mem.py')
+    cpu, mem = cpu_mem.split()
+    now = datetime.datetime.now()
+    secs = (now - start).seconds
+    commands.getoutput(
+        'echo %s\t%s\t%s\t%s >> series.log' % (secs, value, cpu, mem))