-/* Copyright (c) 2007, 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2018. 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. */
double smpi_cpu_threshold = -1;
double smpi_host_speed;
-shared_malloc_type smpi_cfg_shared_malloc = shmalloc_global;
+SharedMallocType smpi_cfg_shared_malloc = SharedMallocType::GLOBAL;
double smpi_total_benched_time = 0;
extern "C" XBT_PUBLIC void smpi_execute_flops_(double* flops);
void smpi_execute_flops(double flops) {
xbt_assert(flops >= 0, "You're trying to execute a negative amount of flops (%f)!", flops);
XBT_DEBUG("Handle real computation time: %f flops", flops);
- smx_activity_t action = simcall_execution_start("computation", flops, 1, 0, smpi_process()->process()->getHost());
+ smx_activity_t action = simcall_execution_start("computation", flops, 1, 0, smpi_process()->get_actor()->get_host());
simcall_set_category (action, TRACE_internal_smpi_get_category());
simcall_execution_wait(action);
smpi_switch_data_segment(simgrid::s4u::Actor::self());
if (duration >= smpi_cpu_threshold) {
XBT_DEBUG("Sleep for %g to handle real computation time", duration);
double flops = duration * smpi_host_speed;
- int rank = simgrid::s4u::this_actor::getPid();
+ int rank = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_computing_in(rank, flops);
smpi_execute_flops(flops);
void smpi_bench_begin()
{
- if (smpi_privatize_global_variables == SmpiPrivStrategies::Mmap) {
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) {
smpi_switch_data_segment(simgrid::s4u::Actor::self());
}
return;
#if HAVE_PAPI
- if (not xbt_cfg_get_string("smpi/papi-events").empty()) {
+ if (not simgrid::config::get_value<std::string>("smpi/papi-events").empty()) {
int event_set = smpi_process()->papi_event_set();
// PAPI_start sets everything to 0! See man(3) PAPI_start
if (PAPI_LOW_LEVEL_INITED == PAPI_is_initialized()) {
* An MPI function has been called and now is the right time to update
* our PAPI counters for this process.
*/
- if (xbt_cfg_get_string("smpi/papi-events")[0] != '\0') {
+ if (simgrid::config::get_value<std::string>("smpi/papi-events")[0] != '\0') {
papi_counter_t& counter_data = smpi_process()->papi_counters();
int event_set = smpi_process()->papi_event_set();
std::vector<long long> event_values = std::vector<long long>(counter_data.size());
xbt_die("Aborting.");
}
- if (xbt_cfg_get_string("smpi/comp-adjustment-file")[0] != '\0') { // Maybe we need to artificially speed up or slow
- // down our computation based on our statistical analysis.
+ // Maybe we need to artificially speed up or slow down our computation based on our statistical analysis.
+ if (simgrid::config::get_value<std::string>("smpi/comp-adjustment-file")[0] != '\0') {
smpi_trace_call_location_t* loc = smpi_process()->call_location();
std::string key = loc->get_composed_key();
}
// Simulate the benchmarked computation unless disabled via command-line argument
- if (xbt_cfg_get_boolean("smpi/simulate-computation")) {
+ if (simgrid::config::get_value<bool>("smpi/simulate-computation")) {
smpi_execute(xbt_os_timer_elapsed(timer)/speedup);
}
#if HAVE_PAPI
- if (xbt_cfg_get_string("smpi/papi-events")[0] != '\0' && TRACE_smpi_is_enabled()) {
+ if (simgrid::config::get_value<std::string>("smpi/papi-events")[0] != '\0' && TRACE_smpi_is_enabled()) {
container_t container =
- new simgrid::instr::Container(std::string("rank-") + std::to_string(simgrid::s4u::this_actor::getPid));
+ new simgrid::instr::Container(std::string("rank-") + std::to_string(simgrid::s4u::this_actor::get_pid()));
papi_counter_t& counter_data = smpi_process()->papi_counters();
for (auto const& pair : counter_data) {
smpi_bench_end();
XBT_DEBUG("Sleep for: %lf secs", secs);
- int rank = MPI_COMM_WORLD->rank();
+ int rank = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_sleeping_in(rank, secs);
simcall_process_sleep(secs);
unsigned int smpi_sleep(unsigned int secs)
{
+ if (not smpi_process())
+ return sleep(secs);
return private_sleep(static_cast<double>(secs));
}
int smpi_usleep(useconds_t usecs)
{
+ if (not smpi_process())
+ return usleep(usecs);
return static_cast<int>(private_sleep(static_cast<double>(usecs) / 1000000.0));
}
#if _POSIX_TIMERS > 0
-int smpi_nanosleep(const struct timespec* tp, struct timespec* /*t*/)
+int smpi_nanosleep(const struct timespec* tp, struct timespec* t)
{
+ if (not smpi_process())
+ return nanosleep(tp,t);
return static_cast<int>(private_sleep(static_cast<double>(tp->tv_sec + tp->tv_nsec / 1000000000.0)));
}
#endif
-int smpi_gettimeofday(struct timeval* tv, void* /*tz*/)
+int smpi_gettimeofday(struct timeval* tv, struct timezone* tz)
{
+ if (not smpi_process())
+ return gettimeofday(tv, tz);
+
smpi_bench_end();
double now = SIMIX_get_clock();
if (tv) {
}
#if _POSIX_TIMERS > 0
-int smpi_clock_gettime(clockid_t /*clk_id*/, struct timespec* tp)
+int smpi_clock_gettime(clockid_t clk_id, struct timespec* tp)
{
+ if (not smpi_process())
+ return clock_gettime(clk_id, tp);
//there is only one time in SMPI, so clk_id is ignored.
smpi_bench_end();
double now = SIMIX_get_clock();
SampleLocation(bool global, const char* file, int line) : std::string(std::string(file) + ":" + std::to_string(line))
{
if (not global)
- this->append(":" + std::to_string(simgrid::s4u::this_actor::getPid()));
+ this->append(":" + std::to_string(simgrid::s4u::this_actor::get_pid()));
}
};
bool need_more_benchs() const;
};
-}
-
-std::unordered_map<SampleLocation, LocalData, std::hash<std::string>> samples;
bool LocalData::need_more_benchs() const
{
return res;
}
+std::unordered_map<SampleLocation, LocalData, std::hash<std::string>> samples;
+}
+
void smpi_sample_1(int global, const char *file, int line, int iters, double threshold)
{
SampleLocation loc(global, file, line);
samples.clear();
}
+int smpi_getopt_long_only (int argc, char *const *argv, const char *options,
+ const struct option * long_options, int *opt_index)
+{
+ if (smpi_process())
+ optind = smpi_process()->get_optind();
+ int ret = getopt_long_only (argc, argv, options, long_options, opt_index);
+ if (smpi_process())
+ smpi_process()->set_optind(optind);
+ return ret;
+}
+
int smpi_getopt_long (int argc, char *const *argv, const char *options,
const struct option * long_options, int *opt_index)
{
- optind = smpi_process()->get_optind();
+ if (smpi_process())
+ optind = smpi_process()->get_optind();
int ret = getopt_long (argc, argv, options, long_options, opt_index);
- smpi_process()->set_optind(optind);
+ if (smpi_process())
+ smpi_process()->set_optind(optind);
return ret;
}
int smpi_getopt (int argc, char *const *argv, const char *options)
{
- optind = smpi_process()->get_optind();
+ if (smpi_process())
+ optind = smpi_process()->get_optind();
int ret = getopt (argc, argv, options);
- smpi_process()->set_optind(optind);
+ if (smpi_process())
+ smpi_process()->set_optind(optind);
return ret;
}