X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8ad8c3d9f2ae83e9e2d04f62791a682fb78e05b7..0f2a0c5fa3533c3cc23788659c72950a8da14bd8:/src/smpi/internals/smpi_bench.cpp diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp index 65c074f8a0..281d79f41d 100644 --- a/src/smpi/internals/smpi_bench.cpp +++ b/src/smpi/internals/smpi_bench.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -30,7 +30,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi, "Logging specific to SMPI (ben 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); @@ -48,7 +48,7 @@ void smpi_execute_(double *duration) 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()); @@ -59,7 +59,7 @@ void smpi_execute(double duration) 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); @@ -82,7 +82,7 @@ void smpi_execute_benched(double duration) 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()); } @@ -90,7 +90,7 @@ void smpi_bench_begin() return; #if HAVE_PAPI - if (not xbt_cfg_get_string("smpi/papi-events").empty()) { + if (not simgrid::config::get_value("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()) { @@ -119,7 +119,7 @@ void smpi_bench_end() * 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("smpi/papi-events")[0] != '\0') { papi_counter_t& counter_data = smpi_process()->papi_counters(); int event_set = smpi_process()->papi_event_set(); std::vector event_values = std::vector(counter_data.size()); @@ -142,8 +142,8 @@ void smpi_bench_end() 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("smpi/comp-adjustment-file")[0] != '\0') { smpi_trace_call_location_t* loc = smpi_process()->call_location(); std::string key = loc->get_composed_key(); @@ -154,14 +154,14 @@ void smpi_bench_end() } // Simulate the benchmarked computation unless disabled via command-line argument - if (xbt_cfg_get_boolean("smpi/simulate-computation")) { + if (simgrid::config::get_value("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("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) { @@ -180,7 +180,7 @@ static unsigned int private_sleep(double secs) 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); @@ -207,7 +207,7 @@ int smpi_usleep(useconds_t usecs) #if _POSIX_TIMERS > 0 int smpi_nanosleep(const struct timespec* tp, struct timespec* t) -{ +{ if (not smpi_process()) return nanosleep(tp,t); return static_cast(private_sleep(static_cast(tp->tv_sec + tp->tv_nsec / 1000000000.0))); @@ -277,7 +277,7 @@ public: 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())); } }; @@ -294,9 +294,6 @@ public: bool need_more_benchs() const; }; -} - -std::unordered_map> samples; bool LocalData::need_more_benchs() const { @@ -308,6 +305,9 @@ bool LocalData::need_more_benchs() const return res; } +std::unordered_map> samples; +} + void smpi_sample_1(int global, const char *file, int line, int iters, double threshold) { SampleLocation loc(global, file, line);