diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/views.py')
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 55 |
1 files changed, 35 insertions, 20 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index bd118920ab..85ca9be716 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -1005,11 +1005,11 @@ def tasks_common(request, build_id, variant, task_anchor): | |||
1005 | object_search_display="disk I/O data" | 1005 | object_search_display="disk I/O data" |
1006 | filter_search_display="tasks" | 1006 | filter_search_display="tasks" |
1007 | (pagesize, orderby) = _get_parameters_values(request, 25, 'disk_io:-') | 1007 | (pagesize, orderby) = _get_parameters_values(request, 25, 'disk_io:-') |
1008 | elif 'cpuusage' == variant: | 1008 | elif 'cputime' == variant: |
1009 | title_variant='CPU usage' | 1009 | title_variant='CPU time' |
1010 | object_search_display="CPU usage data" | 1010 | object_search_display="CPU time data" |
1011 | filter_search_display="tasks" | 1011 | filter_search_display="tasks" |
1012 | (pagesize, orderby) = _get_parameters_values(request, 25, 'cpu_usage:-') | 1012 | (pagesize, orderby) = _get_parameters_values(request, 25, 'cpu_time_system:-') |
1013 | else : | 1013 | else : |
1014 | title_variant='Tasks' | 1014 | title_variant='Tasks' |
1015 | object_search_display="tasks" | 1015 | object_search_display="tasks" |
@@ -1161,23 +1161,38 @@ def tasks_common(request, build_id, variant, task_anchor): | |||
1161 | del tc_time['clclass'] | 1161 | del tc_time['clclass'] |
1162 | tc_cache['hidden']='1' | 1162 | tc_cache['hidden']='1' |
1163 | 1163 | ||
1164 | tc_cpu={ | 1164 | tc_cpu_time_system={ |
1165 | 'name':'CPU usage', | 1165 | 'name':'System CPU time (secs)', |
1166 | 'qhelp':'The percentage of task CPU utilization', | 1166 | 'qhelp':'Total amount of time spent executing in kernel mode, in ' + |
1167 | 'orderfield': _get_toggle_order(request, "cpu_usage", True), | 1167 | 'seconds. Note that this time can be greater than the task ' + |
1168 | 'ordericon':_get_toggle_order_icon(request, "cpu_usage"), | 1168 | 'time due to parallel execution.', |
1169 | 'orderkey' : 'cpu_usage', | 1169 | 'orderfield': _get_toggle_order(request, "cpu_time_system", True), |
1170 | 'clclass': 'cpu_used', 'hidden' : 1, | 1170 | 'ordericon':_get_toggle_order_icon(request, "cpu_time_system"), |
1171 | 'orderkey' : 'cpu_time_system', | ||
1172 | 'clclass': 'cpu_time_system', 'hidden' : 1, | ||
1171 | } | 1173 | } |
1172 | 1174 | ||
1173 | if 'cpuusage' == variant: | 1175 | tc_cpu_time_user={ |
1174 | tc_cpu['hidden']='0' | 1176 | 'name':'User CPU time (secs)', |
1175 | del tc_cpu['clclass'] | 1177 | 'qhelp':'Total amount of time spent executing in user mode, in seconds. ' + |
1178 | 'Note that this time can be greater than the task time due to ' + | ||
1179 | 'parallel execution.', | ||
1180 | 'orderfield': _get_toggle_order(request, "cpu_time_user", True), | ||
1181 | 'ordericon':_get_toggle_order_icon(request, "cpu_time_user"), | ||
1182 | 'orderkey' : 'cpu_time_user', | ||
1183 | 'clclass': 'cpu_time_user', 'hidden' : 1, | ||
1184 | } | ||
1185 | |||
1186 | if 'cputime' == variant: | ||
1187 | tc_cpu_time_system['hidden']='0' | ||
1188 | tc_cpu_time_user['hidden']='0' | ||
1189 | del tc_cpu_time_system['clclass'] | ||
1190 | del tc_cpu_time_user['clclass'] | ||
1176 | tc_cache['hidden']='1' | 1191 | tc_cache['hidden']='1' |
1177 | 1192 | ||
1178 | tc_diskio={ | 1193 | tc_diskio={ |
1179 | 'name':'Disk I/O (ms)', | 1194 | 'name':'Disk I/O (bytes)', |
1180 | 'qhelp':'Number of miliseconds the task spent doing disk input and output', | 1195 | 'qhelp':'Number of bytes written to and read from the disk during the task', |
1181 | 'orderfield': _get_toggle_order(request, "disk_io", True), | 1196 | 'orderfield': _get_toggle_order(request, "disk_io", True), |
1182 | 'ordericon':_get_toggle_order_icon(request, "disk_io"), | 1197 | 'ordericon':_get_toggle_order_icon(request, "disk_io"), |
1183 | 'orderkey' : 'disk_io', | 1198 | 'orderkey' : 'disk_io', |
@@ -1208,7 +1223,8 @@ def tasks_common(request, build_id, variant, task_anchor): | |||
1208 | tc_outcome, | 1223 | tc_outcome, |
1209 | tc_cache, | 1224 | tc_cache, |
1210 | tc_time, | 1225 | tc_time, |
1211 | tc_cpu, | 1226 | tc_cpu_time_system, |
1227 | tc_cpu_time_user, | ||
1212 | tc_diskio, | 1228 | tc_diskio, |
1213 | ]} | 1229 | ]} |
1214 | 1230 | ||
@@ -1229,9 +1245,8 @@ def buildtime(request, build_id): | |||
1229 | def diskio(request, build_id): | 1245 | def diskio(request, build_id): |
1230 | return tasks_common(request, build_id, 'diskio', '') | 1246 | return tasks_common(request, build_id, 'diskio', '') |
1231 | 1247 | ||
1232 | def cpuusage(request, build_id): | 1248 | def cputime(request, build_id): |
1233 | return tasks_common(request, build_id, 'cpuusage', '') | 1249 | return tasks_common(request, build_id, 'cputime', '') |
1234 | |||
1235 | 1250 | ||
1236 | def recipes(request, build_id): | 1251 | def recipes(request, build_id): |
1237 | template = 'recipes.html' | 1252 | template = 'recipes.html' |