Explorar el Código

title support

David hace 10 años
padre
commit
103c3fdc04
Se han modificado 1 ficheros con 9 adiciones y 6 borrados
  1. 9 6
      scripts/batchplotter.py

+ 9 - 6
scripts/batchplotter.py

@@ -10,7 +10,7 @@ from stats import parseData
 
 bar_width = 0.25
 index = []
-def plot(process_data):
+def plot(process_data, title):
     fig, ax = plt.subplots(figsize=(10,5))
     
     task_output = []
@@ -21,9 +21,9 @@ def plot(process_data):
         (out, _) = process.communicate()
         process.wait()
         out = out.decode("utf-8")
-        parsed = parseData(out.split("\n"))
-
+        (parsed,idle) = parseData(out.split("\n"))
         ap  = {}
+        ap["idle"] = idle
         ap["processes"] = parsed
         ap["tasks"] = p["tasks"]
         ap["args"] = p["args"]
@@ -34,19 +34,22 @@ def plot(process_data):
     m_ready = []
     m_cpu = []
     m_cpuio = []
+    idletime = []
     for t in task_output:
         m_latencies.append(meanLatency(t))
         m_ready.append(meanReady(t))
         m_cpu.append(meanCPU(t))
         m_cpuio.append(meanCPUIO(t))
+        idletime.append(t["idle"])
 
     plot_data(0, m_latencies, 'r', 'M. Latency')
     plot_data(1, m_ready, 'g', 'M. Ready')
     plot_data(2, m_cpu, 'b', 'M. CPU')
     plot_data(3, m_cpuio, '#deadbe', 'M. CPU+IO')
+    plot_data(4, idletime, '#c1c1c1', 'Idle')
 
     ax.set_ylabel('Time')
-    ax.set_title('title')
+    ax.set_title(title)
     ax.set_xticks([ i + 1.5 * bar_width for i in index])
     ax.set_xticklabels( ["%s %s" % (task_output[i]["tasks"], task_output[i]["args"])
                         for i in range(len(process_data))])
@@ -115,8 +118,8 @@ if not os.path.isfile(sys.argv[1]):
 try:
     data = open(sys.argv[1]).read()
     j = json.loads(data)
-    index = [ 1.2*i for i in list(range(len(j["list"]))) ]
-    plot(j["list"])
+    index = [ 1.5*i for i in list(range(len(j["list"]))) ]
+    plot(j["list"],j["title"])
 except Exception as e:
     print("Exception")
     print(data)