diff options
Diffstat (limited to 'yocto-poky/bitbake/lib/toaster/toastergui/templates/tasks.html')
-rw-r--r-- | yocto-poky/bitbake/lib/toaster/toastergui/templates/tasks.html | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/yocto-poky/bitbake/lib/toaster/toastergui/templates/tasks.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/tasks.html index 353410f92..84bc10386 100644 --- a/yocto-poky/bitbake/lib/toaster/toastergui/templates/tasks.html +++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/tasks.html @@ -1,4 +1,5 @@ {% extends "basebuildpage.html" %} +{% load humanize %} {% load projecttags %} {% block title %} {{mainheading}} - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster{% endblock %} @@ -20,13 +21,15 @@ <li><a href="{% url 'buildtime' build.pk %}">Time</a></li> {% endif %} {% endblock %} -{% block nav-cpuusage %} - {% if 'CPU usage' == mainheading %} - <li class="active"><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> + +{% block nav-cputime %} + {% if 'CPU time' == mainheading %} + <li class="active"><a href="{% url 'cputime' build.pk %}">CPU time</a></li> {% else %} - <li><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> + <li><a href="{% url 'cputime' build.pk %}">CPU time</a></li> {% endif %} {% endblock %} + {% block nav-diskio %} {% if 'Disk I/O' == mainheading %} <li class="active"><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> @@ -107,11 +110,14 @@ <td class="time_taken"> {{task.elapsed_time|format_none_and_zero|floatformat:2}} </td> - <td class="cpu_used"> - {{task.cpu_usage|format_none_and_zero|floatformat:2}}{% if task.cpu_usage %}%{% endif %} + <td class="cpu_time_system"> + {{task.cpu_time_system|format_none_and_zero|floatformat:2}} + </td> + <td class="cpu_time_user"> + {{task.cpu_time_user|format_none_and_zero|floatformat:2}} </td> <td class="disk_io"> - {{task.disk_io|format_none_and_zero}} + {{task.disk_io|format_none_and_zero|intcomma}} </td> </tr> @@ -125,7 +131,7 @@ <script type="text/javascript"> $(document).ready(function() { - // enable blue hightlight animation for the order link + // highlight heading on the column for the field used for ordering if (location.href.search('#') > -1) { var task_order = location.href.split('#')[1]; $("#" + task_order).addClass("highlight"); |