diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/basebuildpage.html | 4 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/task.html | 23 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/tasks.html | 20 |
3 files changed, 30 insertions, 17 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html index 0dc71f5e5e..ff9433eee7 100644 --- a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html +++ b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html | |||
@@ -67,8 +67,8 @@ | |||
67 | {% block nav-buildtime %} | 67 | {% block nav-buildtime %} |
68 | <li><a href="{% url 'buildtime' build.pk %}">Time</a></li> | 68 | <li><a href="{% url 'buildtime' build.pk %}">Time</a></li> |
69 | {% endblock %} | 69 | {% endblock %} |
70 | {% block nav-cpuusage %} | 70 | {% block nav-cputime %} |
71 | <li><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> | 71 | <li><a href="{% url 'cputime' build.pk %}">CPU time</a></li> |
72 | {% endblock %} | 72 | {% endblock %} |
73 | {% block nav-diskio %} | 73 | {% block nav-diskio %} |
74 | <li><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> | 74 | <li><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> |
diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/bitbake/lib/toaster/toastergui/templates/task.html index ef628d9f9b..5768262432 100644 --- a/bitbake/lib/toaster/toastergui/templates/task.html +++ b/bitbake/lib/toaster/toastergui/templates/task.html | |||
@@ -238,7 +238,7 @@ | |||
238 | </dl> | 238 | </dl> |
239 | 239 | ||
240 | {# Performance section - shown only for executed tasks #} | 240 | {# Performance section - shown only for executed tasks #} |
241 | {%if task.elapsed_time or task.cpu_usage or task.disk_io %} | 241 | {%if task.elapsed_time or task.cpu_time_user or task.cpu_time_system or task.disk_io %} |
242 | <h2 class="details">Performance</h2> | 242 | <h2 class="details">Performance</h2> |
243 | {% endif %} | 243 | {% endif %} |
244 | <dl class="dl-horizontal"> | 244 | <dl class="dl-horizontal"> |
@@ -249,19 +249,26 @@ | |||
249 | </dt> | 249 | </dt> |
250 | <dd>{{task.elapsed_time|format_none_and_zero|floatformat:2}}</dd> | 250 | <dd>{{task.elapsed_time|format_none_and_zero|floatformat:2}}</dd> |
251 | {% endif %} | 251 | {% endif %} |
252 | {% if task.cpu_usage > 0 %} | 252 | {% if task.cpu_time_user > 0 %} |
253 | <dt> | 253 | <dt> |
254 | <i class="icon-question-sign get-help" title="The percentage of task CPU utilization"></i> | 254 | <i class="icon-question-sign get-help" title="Total amount of time spent executing in user mode, in seconds. Note that this time can be greater than the task time due to parallel execution."></i> |
255 | CPU usage | 255 | User CPU time (secs) |
256 | </dt> | 256 | </dt> |
257 | <dd>{{task.cpu_usage|format_none_and_zero|floatformat:2}}%</dd> | 257 | <dd>{{task.cpu_time_user|format_none_and_zero|floatformat:2}}</dd> |
258 | {% endif %} | ||
259 | {% if task.cpu_time_system > 0 %} | ||
260 | <dt> | ||
261 | <i class="icon-question-sign get-help" title="Total amount of time spent executing in kernel mode, in seconds. Note that this time can be greater than the task time due to parallel execution."></i> | ||
262 | System CPU time (secs) | ||
263 | </dt> | ||
264 | <dd>{{task.cpu_time_system|format_none_and_zero|floatformat:2}}</dd> | ||
258 | {% endif %} | 265 | {% endif %} |
259 | {% if task.disk_io > 0 %} | 266 | {% if task.disk_io > 0 %} |
260 | <dt> | 267 | <dt> |
261 | <i class="icon-question-sign get-help" title="Number of miliseconds the task spent doing disk input and output"></i> | 268 | <i class="icon-question-sign get-help" title="Number of bytes written to and read from the disk during the task"></i> |
262 | Disk I/O (ms) | 269 | Disk I/O (bytes) |
263 | </dt> | 270 | </dt> |
264 | <dd>{{task.disk_io|format_none_and_zero}}</dd> | 271 | <dd>{{task.disk_io|format_none_and_zero|intcomma}}</dd> |
265 | {% endif %} | 272 | {% endif %} |
266 | </dl> | 273 | </dl> |
267 | 274 | ||
diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html index 353410f92a..23eb957567 100644 --- a/bitbake/lib/toaster/toastergui/templates/tasks.html +++ b/bitbake/lib/toaster/toastergui/templates/tasks.html | |||
@@ -1,4 +1,5 @@ | |||
1 | {% extends "basebuildpage.html" %} | 1 | {% extends "basebuildpage.html" %} |
2 | {% load humanize %} | ||
2 | {% load projecttags %} | 3 | {% load projecttags %} |
3 | 4 | ||
4 | {% block title %} {{mainheading}} - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster{% endblock %} | 5 | {% block title %} {{mainheading}} - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster{% endblock %} |
@@ -20,13 +21,15 @@ | |||
20 | <li><a href="{% url 'buildtime' build.pk %}">Time</a></li> | 21 | <li><a href="{% url 'buildtime' build.pk %}">Time</a></li> |
21 | {% endif %} | 22 | {% endif %} |
22 | {% endblock %} | 23 | {% endblock %} |
23 | {% block nav-cpuusage %} | 24 | |
24 | {% if 'CPU usage' == mainheading %} | 25 | {% block nav-cputime %} |
25 | <li class="active"><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> | 26 | {% if 'CPU time' == mainheading %} |
27 | <li class="active"><a href="{% url 'cputime' build.pk %}">CPU time</a></li> | ||
26 | {% else %} | 28 | {% else %} |
27 | <li><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> | 29 | <li><a href="{% url 'cputime' build.pk %}">CPU time</a></li> |
28 | {% endif %} | 30 | {% endif %} |
29 | {% endblock %} | 31 | {% endblock %} |
32 | |||
30 | {% block nav-diskio %} | 33 | {% block nav-diskio %} |
31 | {% if 'Disk I/O' == mainheading %} | 34 | {% if 'Disk I/O' == mainheading %} |
32 | <li class="active"><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> | 35 | <li class="active"><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> |
@@ -107,11 +110,14 @@ | |||
107 | <td class="time_taken"> | 110 | <td class="time_taken"> |
108 | {{task.elapsed_time|format_none_and_zero|floatformat:2}} | 111 | {{task.elapsed_time|format_none_and_zero|floatformat:2}} |
109 | </td> | 112 | </td> |
110 | <td class="cpu_used"> | 113 | <td class="cpu_time_system"> |
111 | {{task.cpu_usage|format_none_and_zero|floatformat:2}}{% if task.cpu_usage %}%{% endif %} | 114 | {{task.cpu_time_system|format_none_and_zero|floatformat:2}} |
115 | </td> | ||
116 | <td class="cpu_time_user"> | ||
117 | {{task.cpu_time_user|format_none_and_zero|floatformat:2}} | ||
112 | </td> | 118 | </td> |
113 | <td class="disk_io"> | 119 | <td class="disk_io"> |
114 | {{task.disk_io|format_none_and_zero}} | 120 | {{task.disk_io|format_none_and_zero|intcomma}} |
115 | </td> | 121 | </td> |
116 | 122 | ||
117 | </tr> | 123 | </tr> |