-/* Copyright (c) 2012-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2012-2020. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/internal_config.h" // HAVE_FUTEX_H
#include "xbt/parmap.hpp"
-#include <simgrid/msg.h>
+#include <simgrid/s4u/Engine.hpp>
#include <xbt.h>
#include <cstdlib>
XBT_LOG_NEW_DEFAULT_CATEGORY(parmap_bench, "Bench for parmap");
-#define MODES_DEFAULT 0x7
-#define ARRAY_SIZE 10007
-#define FIBO_MAX 25
-
-void (*fun_to_apply)(unsigned*);
+constexpr unsigned MODES_DEFAULT = 0x7;
+constexpr unsigned ARRAY_SIZE = 10007;
+constexpr unsigned FIBO_MAX = 25;
static std::string parmap_mode_name(e_xbt_parmap_mode_t mode)
{
*arg = fibonacci(*arg % FIBO_MAX);
}
-static void bench_parmap(int nthreads, double timeout, e_xbt_parmap_mode_t mode, bool full_bench)
+template <class F>
+void bench_parmap(int nthreads, double timeout, e_xbt_parmap_mode_t mode, bool full_bench, F func_to_apply)
{
std::string mode_name = parmap_mode_name(mode);
XBT_INFO("** mode = %s", mode_name.c_str());
delete parmap;
parmap = new simgrid::xbt::Parmap<unsigned*>(nthreads, mode);
}
- parmap->apply(fun_to_apply, data);
+ parmap->apply(func_to_apply, data);
elapsed_time = xbt_os_time() - start_time;
i++;
} while (elapsed_time < timeout);
XBT_INFO(" ran %d times in %g seconds (%g/s)", i, elapsed_time, i / elapsed_time);
}
-static void bench_all_modes(int nthreads, double timeout, unsigned modes, bool full_bench)
+template <class F> void bench_all_modes(int nthreads, double timeout, unsigned modes, bool full_bench, F func_to_apply)
{
std::vector<e_xbt_parmap_mode_t> all_modes = {XBT_PARMAP_POSIX, XBT_PARMAP_FUTEX, XBT_PARMAP_BUSY_WAIT,
XBT_PARMAP_DEFAULT};
for (unsigned i = 0; i < all_modes.size(); i++) {
if (1U << i & modes)
- bench_parmap(nthreads, timeout, all_modes[i], full_bench);
+ bench_parmap(nthreads, timeout, all_modes[i], full_bench, func_to_apply);
}
}
unsigned modes = MODES_DEFAULT;
xbt_log_control_set("parmap_bench.fmt:[%c/%p]%e%m%n");
- MSG_init(&argc, argv);
+ simgrid::s4u::Engine e(&argc, argv);
if (argc != 3 && argc != 4) {
XBT_INFO("Usage: %s nthreads timeout [modes]", argv[0]);
}
timeout = atof(argv[2]);
if (argc == 4)
- modes = strtol(argv[2], NULL, 0);
+ modes = static_cast<unsigned>(strtoul(argv[2], NULL, 0));
XBT_INFO("Parmap benchmark with %d workers (modes = %#x)...", nthreads, modes);
XBT_INFO("%s", "");
SIMIX_context_set_nthreads(nthreads);
- fun_to_apply = &fun_small_comp;
XBT_INFO("Benchmark for parmap create+apply+destroy (small comp):");
- bench_all_modes(nthreads, timeout, modes, true);
+ bench_all_modes(nthreads, timeout, modes, true, &fun_small_comp);
XBT_INFO("%s", "");
XBT_INFO("Benchmark for parmap apply only (small comp):");
- bench_all_modes(nthreads, timeout, modes, false);
+ bench_all_modes(nthreads, timeout, modes, false, &fun_small_comp);
XBT_INFO("%s", "");
- fun_to_apply = &fun_big_comp;
-
XBT_INFO("Benchmark for parmap create+apply+destroy (big comp):");
- bench_all_modes(nthreads, timeout, modes, true);
+ bench_all_modes(nthreads, timeout, modes, true, &fun_big_comp);
XBT_INFO("%s", "");
XBT_INFO("Benchmark for parmap apply only (big comp):");
- bench_all_modes(nthreads, timeout, modes, false);
+ bench_all_modes(nthreads, timeout, modes, false, &fun_big_comp);
XBT_INFO("%s", "");
return EXIT_SUCCESS;