sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

benchmark - slightly better stderr

Browse source
This commit is contained in:
Artem Pavlenko 2018-01-10 10:04:10 +00:00
parent b193d03151
commit 5ab6db2607
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
benchmark/bench_framework.hpp
View file

@ -35,8 +35,8 @@ protected:
public: public:
test_case(mapnik::parameters const& params) test_case(mapnik::parameters const& params)
: params_(params), : params_(params),
threads_(mapnik::safe_cast<std::size_t>(*params.get<mapnik::value_integer>("threads",0))), threads_(mapnik::safe_cast<std::size_t>(*params.get<mapnik::value_integer>("threads", 0))),
iterations_(mapnik::safe_cast<std::size_t>(*params.get<mapnik::value_integer>("iterations",0))) iterations_(mapnik::safe_cast<std::size_t>(*params.get<mapnik::value_integer>("iterations", 0)))
{} {}
std::size_t threads() const std::size_t threads() const
{ {
@ -240,7 +240,7 @@ int run(T const& test_runner, std::string const& name)
big_number_fmt ips(5, total_iters / seconds<double>(elapsed_nonzero).count()); big_number_fmt ips(5, total_iters / seconds<double>(elapsed_nonzero).count());
std::snprintf(msg, sizeof(msg), std::snprintf(msg, sizeof(msg),
"%-43s %3zu threads %*.0f%s iters %6.0f milliseconds %*.0f%s i/s\n", "%-43s %3zu thread(s) %*.0f%s iters %6.0f milliseconds %*.0f%s i/s\n",
name.c_str(), name.c_str(),
num_threads, num_threads,
itersf.w, itersf.v, itersf.u, itersf.w, itersf.v, itersf.u,

2
benchmark/run
View file

@ -10,7 +10,7 @@ function run {
local threads="$2" local threads="$2"
local iters="$3" local iters="$3"
shift 3 shift 3
$runner --threads 0 --iterations $iters "$@" $runner --threads 1 --iterations $iters "$@"
if test $threads -gt 0; then if test $threads -gt 0; then
$runner --threads $threads --iterations $((iters/threads)) "$@" $runner --threads $threads --iterations $((iters/threads)) "$@"
fi fi