summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-04-10 18:51:18 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-04-10 18:51:18 -0400
commitd2a5752b6ed0048216ead3d53e694bb8b84b6e34 (patch)
tree0af1b093031e3db85321ae0208e46b0c4989b514
parentc5de6f188dac491f114861648aafb30737da131f (diff)
move data to its folder
-rw-r--r--data/series-develop-mostly-downloading.log (renamed from series-develop-mostly-downloading.log)0
-rw-r--r--data/series-develop.png (renamed from series-develop.png)bin75647 -> 75647 bytes
-rw-r--r--data/series-only-create.log (renamed from series-only-create.log)0
-rw-r--r--data/series-only-create.png (renamed from series-only-create.png)bin47706 -> 47706 bytes
-rw-r--r--data/series-vshyba-mostly-downloading.log (renamed from series-vshyba-mostly-downloading.log)0
-rw-r--r--data/series-vshyba-pr-downloading.png (renamed from series-vshyba-pr-downloading.png)bin48701 -> 48701 bytes
-rw-r--r--data/series-vshyba-pr.log (renamed from series-vshyba-pr.log)0
-rw-r--r--data/series-vshyba-pr.png (renamed from series-vshyba-pr.png)bin78844 -> 78844 bytes
-rw-r--r--data/series.log200
-rw-r--r--get-client-cpu-mem.py4
-rwxr-xr-xgraphit8
-rw-r--r--series.log200
-rwxr-xr-xserver-solsync.py8
-rw-r--r--toys/perf.py2 (renamed from perf.py2)0
-rw-r--r--toys/perf.pypy (renamed from perf.pypy)0
15 files changed, 216 insertions, 204 deletions
diff --git a/series-develop-mostly-downloading.log b/data/series-develop-mostly-downloading.log
index 786fedc..786fedc 100644
--- a/series-develop-mostly-downloading.log
+++ b/data/series-develop-mostly-downloading.log
diff --git a/series-develop.png b/data/series-develop.png
index 3d15dd0..3d15dd0 100644
--- a/series-develop.png
+++ b/data/series-develop.png
Binary files differ
diff --git a/series-only-create.log b/data/series-only-create.log
index 0fac266..0fac266 100644
--- a/series-only-create.log
+++ b/data/series-only-create.log
diff --git a/series-only-create.png b/data/series-only-create.png
index 1a5de09..1a5de09 100644
--- a/series-only-create.png
+++ b/data/series-only-create.png
Binary files differ
diff --git a/series-vshyba-mostly-downloading.log b/data/series-vshyba-mostly-downloading.log
index 31e4fdb..31e4fdb 100644
--- a/series-vshyba-mostly-downloading.log
+++ b/data/series-vshyba-mostly-downloading.log
diff --git a/series-vshyba-pr-downloading.png b/data/series-vshyba-pr-downloading.png
index 840c21f..840c21f 100644
--- a/series-vshyba-pr-downloading.png
+++ b/data/series-vshyba-pr-downloading.png
Binary files differ
diff --git a/series-vshyba-pr.log b/data/series-vshyba-pr.log
index ee0f21c..ee0f21c 100644
--- a/series-vshyba-pr.log
+++ b/data/series-vshyba-pr.log
diff --git a/series-vshyba-pr.png b/data/series-vshyba-pr.png
index dd4e9d6..dd4e9d6 100644
--- a/series-vshyba-pr.png
+++ b/data/series-vshyba-pr.png
Binary files differ
diff --git a/data/series.log b/data/series.log
new file mode 100644
index 0000000..e6cfcb5
--- /dev/null
+++ b/data/series.log
@@ -0,0 +1,200 @@
+0.210047 56.3
+0.316841 138.4
+0.419286 140.4
+0.521831 139.7
+0.649547 112.3
+0.7747 136.8
+0.877166 143.6
+0.97634 145.3
+1.095328 120.5
+1.207807 121.1
+1.311972 134.4
+1.409 150.3
+1.516224 137.5
+1.66495 88.2
+1.790899 106.8
+1.914703 110.7
+2.037933 113.1
+2.153851 116.4
+2.259358 132.0
+2.381434 116.0
+2.485015 143.8
+2.644692 77.4
+2.760346 125.3
+2.879985 113.5
+2.979379 144.2
+3.110818 97.6
+3.215562 131.7
+3.329797 117.7
+3.433906 143.3
+3.590632 79.5
+3.694265 136.3
+3.801984 131.1
+3.922523 110.9
+4.050104 101.4
+4.15811 135.7
+4.261787 136.9
+4.363309 138.7
+4.481696 112.4
+4.60274 109.0
+4.738066 97.9
+4.840082 137.5
+4.957175 117.7
+5.071918 121.3
+5.263489 67.6
+5.433107 82.1
+5.584194 87.6
+5.722112 96.6
+5.825947 140.6
+5.948904 108.0
+6.055644 132.7
+6.183554 107.7
+6.306964 107.1
+6.424886 120.5
+6.59423 79.3
+6.726049 99.0
+6.833721 131.2
+6.933688 139.3
+7.074586 90.8
+7.199221 106.4
+7.315739 117.5
+7.472213 79.1
+7.672748 60.8
+7.850607 69.0
+8.027069 70.6
+8.203116 80.7
+8.402747 63.1
+8.612229 59.1
+8.854187 55.6
+8.973681 120.0
+9.099607 103.5
+9.221818 109.5
+9.36211 95.1
+9.477103 117.3
+9.603077 106.4
+9.714717 126.7
+9.818982 143.1
+9.94438 107.1
+10.070115 105.1
+10.169238 144.6
+10.320133 83.4
+10.427798 130.2
+10.552177 106.8
+10.675741 107.5
+10.813704 91.7
+10.946708 100.0
+11.174081 59.3
+11.397472 59.6
+11.529954 99.8
+11.653342 106.2
+11.763712 126.1
+11.891591 101.8
+11.991629 142.8
+12.228416 55.3
+12.351251 117.9
+12.477629 103.1
+12.594639 113.5
+12.725439 97.6
+12.845845 109.5
+12.981984 104.6
+13.117733 95.3
+13.239068 109.9
+13.384764 88.4
+13.670487 45.2
+14.079312 28.6
+14.247621 104.4
+14.429241 69.8
+14.645767 65.9
+14.84522 63.1
+14.958642 130.6
+15.14819 62.5
+15.298423 88.7
+15.424745 103.2
+15.525933 140.2
+15.645346 110.6
+15.744282 144.1
+15.909168 77.9
+16.138961 53.3
+16.338066 60.7
+16.447721 129.5
+16.635302 63.4
+16.841896 56.5
+17.012547 72.0
+17.182396 76.5
+17.296235 120.6
+17.416205 109.6
+17.551178 97.8
+17.654689 142.8
+17.773628 113.6
+17.923737 92.8
+18.055348 98.6
+18.159398 134.7
+18.267011 136.6
+18.378633 136.7
+18.64627 42.9
+18.91044 45.5
+19.162734 50.2
+19.426078 58.2
+19.719835 39.0
+20.085218 40.6
+20.405663 40.8
+20.654743 48.2
+20.999818 43.4
+21.21637 55.7
+21.427141 57.6
+21.659958 52.4
+21.962387 38.3
+22.192803 53.9
+22.412744 55.4
+22.612556 60.7
+22.838938 52.5
+23.016574 70.5
+23.241087 53.2
+23.551507 53.2
+23.871489 43.7
+24.117979 49.7
+24.369804 46.9
+24.640464 52.2
+24.878516 65.7
+24.996105 113.3
+25.109084 127.7
+25.230275 108.7
+25.348385 116.5
+25.46849 111.0
+25.583052 119.7
+25.726719 97.3
+25.827865 143.0
+25.926775 145.7
+26.028083 144.3
+26.156272 107.2
+26.275749 111.5
+26.38198 136.2
+26.485271 139.5
+26.654527 83.1
+26.774963 115.4
+26.888794 121.0
+27.005365 121.9
+27.128847 111.9
+27.247169 112.8
+27.346957 141.9
+27.537317 63.1
+27.683703 88.4
+27.799036 121.4
+27.928876 101.2
+28.282746 40.1
+28.662626 29.8
+29.089195 33.2
+29.353389 49.2
+29.639542 48.9
+29.954964 41.9
+30.379812 28.9
+30.647427 53.3
+30.883988 49.9
+31.185856 47.8
+31.326121 106.7
+31.616247 46.1
+31.761444 90.3
+31.894652 98.3
+32.124868 51.3
+32.377793 45.7
+32.690502 37.2
diff --git a/get-client-cpu-mem.py b/get-client-cpu-mem.py
index 7dc9f26..ba5049a 100644
--- a/get-client-cpu-mem.py
+++ b/get-client-cpu-mem.py
@@ -1,6 +1,8 @@
import commands
+import urllib
+import psutil
-pid = commands.getoutput('ps x | grep "server-solsync" | head -n 1 | cut -d " " -f 2')
+pid = urllib.urlopen('http://localhost:8080/pid').read()
res = commands.getoutput("ps -p " + pid + " -o \%cpu,\%mem")
splitted = res.split()
cpu = splitted[2]
diff --git a/graphit b/graphit
index 177c040..f40ab2e 100755
--- a/graphit
+++ b/graphit
@@ -1,6 +1,8 @@
#! /usr/bin/gnuplot
-name=system("echo $data")
-set title name
-plot name with linespoints notitle
+filename=system("echo $data")
+set title filename
+set key outside
+#plot name with linespoints notitle
+plot for [col=1:3] filename using 0:col with lines notitle
pause -1
diff --git a/series.log b/series.log
deleted file mode 100644
index 86e25ba..0000000
--- a/series.log
+++ /dev/null
@@ -1,200 +0,0 @@
-0.157886 87.2
-0.261819 151.6
-0.377972 130.2
-0.470585 193.6
-0.612237 98.6
-0.715338 171.9
-0.809935 176.8
-0.924311 138.6
-1.02395 162.0
-1.123657 163.0
-1.213692 195.0
-1.316492 154.9
-1.44406 113.9
-1.577139 105.7
-1.675565 165.0
-1.762841 201.5
-1.862302 162.7
-1.965888 152.1
-2.065839 167.0
-2.166259 160.6
-2.265765 158.6
-2.365249 160.8
-2.499473 105.4
-2.621782 119.2
-2.721699 160.3
-2.842831 120.3
-2.934911 191.4
-3.022378 200.9
-3.121595 161.2
-3.210846 198.4
-3.310038 161.4
-3.465299 85.4
-3.853785 30.5
-4.064162 61.9
-4.220535 89.1
-4.401924 72.6
-4.608519 73.7
-5.021938 27.2
-5.124187 191.1
-5.224069 171.2
-5.323125 169.0
-5.409861 202.6
-5.827335 26.3
-5.911915 209.4
-6.027492 201.7
-6.339636 36.6
-6.587121 51.3
-6.989092 27.7
-7.128792 99.4
-7.305529 79.3
-7.552146 49.6
-7.680859 134.8
-7.814906 110.0
-8.201958 32.0
-8.327512 146.2
-8.510957 87.6
-9.846658 7.8
-10.291902 24.9
-10.419836 157.6
-10.530068 171.1
-10.709393 73.1
-11.184723 23.8
-11.355573 150.3
-11.474852 152.6
-11.592804 171.0
-12.935238 8.0
-13.246022 53.3
-17.511863 2.4
-21.33786 2.6
-21.568473 55.8
-23.210757 6.3
-24.044634 14.4
-28.139653 2.5
-35.019769 1.5
-39.813301 2.1
-40.64821 13.9
-40.954058 49.0
-41.212287 46.8
-41.839557 17.3
-42.699845 12.4
-45.284302 4.0
-45.74211 26.6
-47.211015 7.3
-47.439254 53.8
-49.24361 5.9
-50.549995 8.3
-51.29709 17.2
-59.845354 1.2
-65.976834 1.7
-66.708405 16.0
-71.792716 2.0
-72.01152 59.7
-72.19499 74.3
-72.324713 114.9
-72.556869 57.8
-72.779086 54.4
-72.909337 111.1
-73.052528 109.9
-73.253054 66.8
-73.552915 38.2
-73.754073 68.2
-73.950659 69.8
-74.071057 126.8
-74.248013 81.4
-74.456885 58.6
-74.698537 49.5
-74.867519 77.4
-74.987497 130.3
-75.170559 79.6
-75.362249 68.2
-75.59776 62.0
-75.717714 127.1
-75.891162 75.5
-76.174971 41.3
-76.304999 117.1
-76.545434 50.1
-76.719943 75.0
-76.901084 71.6
-77.025819 124.0
-77.23012 61.6
-77.420058 66.6
-77.641579 66.5
-77.779788 103.8
-77.979545 62.2
-78.13807 84.6
-78.267594 113.4
-78.98313 15.4
-79.111082 119.7
-79.278967 92.8
-79.462019 68.9
-79.648529 67.8
-79.764446 143.3
-79.964717 84.4
-80.154855 74.5
-80.270898 132.7
-80.452513 70.8
-80.634489 70.5
-80.750268 136.6
-80.996322 48.9
-81.153251 85.1
-81.277408 120.8
-81.46187 72.4
-81.640226 73.3
-81.783108 100.3
-81.970445 106.7
-82.163347 67.1
-82.355424 67.2
-82.514638 87.5
-82.651321 110.2
-82.916574 44.4
-83.089624 75.1
-83.204529 133.9
-83.391839 70.9
-83.570625 71.3
-83.715882 104.4
-83.960585 60.0
-84.12879 77.3
-84.24924 125.1
-84.44927 64.7
-84.625027 75.1
-84.849438 55.8
-84.993562 99.5
-85.176581 70.6
-85.286822 141.4
-85.469041 68.9
-85.589584 127.3
-85.821292 53.9
-86.011505 73.6
-86.182882 79.1
-86.314276 108.2
-86.484261 82.9
-86.715558 52.0
-86.840645 124.5
-87.026877 77.3
-87.202636 72.9
-87.410824 59.5
-87.541302 110.4
-87.772875 54.6
-87.976959 60.8
-88.158389 71.5
-88.282732 132.9
-88.443632 92.7
-88.720317 43.1
-88.897558 73.2
-89.026123 117.4
-89.217806 69.1
-89.421721 60.4
-89.669229 48.1
-89.791905 132.7
-89.962632 91.7
-90.130086 81.1
-90.242618 140.4
-90.432758 91.7
-90.713444 45.4
-91.015848 38.3
-91.161218 102.7
-91.381846 56.6
-91.647654 45.0
-91.901728 48.6
-92.095619 64.6
diff --git a/server-solsync.py b/server-solsync.py
index d47b06f..71aae56 100755
--- a/server-solsync.py
+++ b/server-solsync.py
@@ -1,4 +1,6 @@
#!/usr/bin/env python
+import os
+
from klein import run, route
import soledad_sync as sync
@@ -18,6 +20,12 @@ def home(request):
def ping(request):
return 'easy!'
+
+@route('/pid')
+def pid(request):
+ return str(os.getpid())
+
+
if __name__ == "__main__":
global s
s = sync._get_soledad_instance_from_uuid(
diff --git a/perf.py2 b/toys/perf.py2
index ef2eeb2..ef2eeb2 100644
--- a/perf.py2
+++ b/toys/perf.py2
diff --git a/perf.pypy b/toys/perf.pypy
index 671cfa2..671cfa2 100644
--- a/perf.pypy
+++ b/toys/perf.pypy