ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

top: show priority and quota

Browse Source 
Issue #3192
This commit is contained in:
Alexander Boettcher 2019-05-02 11:06:41 +02:00 committed by Christian Helmuth
parent 3e848dff10
commit 85d98195d5
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
repos/os/src/app/top/main.cc
View File

@ -248,21 +248,23 @@ struct Trace_subject_registry
if (!load[x][y][i] || !total_first[x][y]) if (!load[x][y][i] || !total_first[x][y])
continue; continue;
unsigned ec_percent = load[x][y][i]->recent_time[first] * 100 / total_first[x][y]; Entry const &entry = *load[x][y][i];
unsigned ec_rest = load[x][y][i]->recent_time[first] * 10000 / total_first[x][y] - (ec_percent * 100);
unsigned ec_percent = entry.recent_time[first] * 100 / total_first[x][y];
unsigned ec_rest = entry.recent_time[first] * 10000 / total_first[x][y] - (ec_percent * 100);
unsigned sc_percent = 0; unsigned sc_percent = 0;
unsigned sc_rest = 0; unsigned sc_rest = 0;
if (total_second[x][y]) { if (total_second[x][y]) {
sc_percent = load[x][y][i]->recent_time[second] * 100 / total_second[x][y]; sc_percent = entry.recent_time[second] * 100 / total_second[x][y];
sc_rest = load[x][y][i]->recent_time[second] * 10000 / total_second[x][y] - (sc_percent * 100); sc_rest = entry.recent_time[second] * 10000 / total_second[x][y] - (sc_percent * 100);
} }
enum { NAME_SPACE = 24 }; enum { NAME_SPACE = 24 };
static char space[NAME_SPACE]; static char space[NAME_SPACE];
Genode::memset(space, ' ', NAME_SPACE - 1); Genode::memset(space, ' ', NAME_SPACE - 1);
unsigned thread_name_len = load[x][y][i]->info.thread_name().length(); unsigned thread_name_len = entry.info.thread_name().length();
if (!thread_name_len) if (!thread_name_len)
space[NAME_SPACE - 1] = 0; space[NAME_SPACE - 1] = 0;
else else
@ -274,20 +276,35 @@ struct Trace_subject_registry
Genode::String<NAME_SPACE> space_string(space); Genode::String<NAME_SPACE> space_string(space);
using Genode::log; using Genode::log;
log("cpu=", load[x][y][i]->info.affinity().xpos(), ".", log("cpu=", entry.info.affinity().xpos(),
load[x][y][i]->info.affinity().ypos(), " ", ".", entry.info.affinity().ypos(),
ec_percent < 10 ? " " : (ec_percent < 100 ? " " : ""), " ", _align_right<4>(entry.info.execution_time().priority),
ec_percent, ".", ec_rest < 10 ? "0" : "", ec_rest, "% ", " ", _align_right<6>(entry.info.execution_time().quantum),
sc_percent < 10 ? " " : (sc_percent < 100 ? " " : ""), " ", _align_right<4>(ec_percent),
sc_percent, ".", sc_rest < 10 ? "0" : "", sc_rest, "% " ".", _align_right<3>(ec_rest, true), "%"
"thread='", load[x][y][i]->info.thread_name(), "' ", space_string, " ", _align_right<4>(sc_percent),
"label='", load[x][y][i]->info.session_label(), "'"); ".", _align_right<3>(sc_rest, true), "% "
"thread='", entry.info.thread_name(), "' ", space_string,
"label='", entry.info.session_label(), "'");
} }
} }
} }
if (load[0][0][0] && load[0][0][0]->recent_time[first]) if (load[0][0][0] && load[0][0][0]->recent_time[first])
Genode::log(""); Genode::log("");
} }
template <int T>
Genode::String<T> _align_right(Genode::uint64_t value, bool zero = false)
{
Genode::String<T> result(value);
for (Genode::uint64_t i = 1, pow = 10; i < (T - 1); i++, pow *= 10) {
if (value < pow)
result = Genode::String<T>(zero ? "0" : " ", result);
}
return result;
}
}; };