X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1555ef43eee251e5892a2f7fd49bc96e99d68fef..aa3595ed3c903167f52eeeab8e636bec96b258dd:/src/smpi/smpi_bench.cpp diff --git a/src/smpi/smpi_bench.cpp b/src/smpi/smpi_bench.cpp index 1b887eb1ee..50cd907b5e 100644 --- a/src/smpi/smpi_bench.cpp +++ b/src/smpi/smpi_bench.cpp @@ -21,11 +21,11 @@ #include "simgrid/modelchecker.h" #include "src/mc/mc_replay.h" +#include #ifndef WIN32 #include #endif #include -#include #include #include #include // sqrt @@ -80,7 +80,7 @@ xbt_dict_t samples = nullptr; /* Allocated on first use */ xbt_dict_t calls = nullptr; /* Allocated on first use */ double smpi_cpu_threshold; -double smpi_running_power; +double smpi_host_speed; int smpi_loaded_page = -1; char* smpi_start_data_exe = nullptr; @@ -98,10 +98,10 @@ namespace { class smpi_source_location { public: smpi_source_location(const char* filename, int line) - : filename(filename), filename_length(strlen(filename)), line(line) {} + : filename(xbt_strdup(filename)), filename_length(strlen(filename)), line(line) {} /** Pointer to a static string containing the file name */ - const char* filename = nullptr; + char* filename = nullptr; int filename_length = 0; int line = 0; @@ -175,7 +175,7 @@ static void* shm_map(int fd, size_t size, shared_data_key_type* data) { mem = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); if(mem == MAP_FAILED) { - xbt_die("Could not map fd %d: %s", fd, strerror(errno)); + xbt_die("Could not map fd %d with size %zu: %s.\n If you are running a lot of processes, you may be exceeding the amount of mappings allowed per process. \n On linux systems, this value can be set by using sudo sysctl -w vm.max_map_count=newvalue .\n Default value is 65536", fd, size, strerror(errno)); } snprintf(loc, PTR_STRLEN, "%p", mem); meta.size = size; @@ -186,7 +186,7 @@ static void* shm_map(int fd, size_t size, shared_data_key_type* data) { } #endif -void smpi_bench_destroy(void) +void smpi_bench_destroy() { allocs.clear(); allocs_metadata.clear(); @@ -207,9 +207,8 @@ void smpi_execute_(double *duration) } void smpi_execute_flops(double flops) { - smx_synchro_t action; XBT_DEBUG("Handle real computation time: %f flops", flops); - action = simcall_execution_start("computation", flops, 1, 0, 0); + smx_activity_t action = simcall_execution_start("computation", flops, 1, 0); simcall_set_category (action, TRACE_internal_smpi_get_category()); simcall_execution_wait(action); smpi_switch_data_segment(smpi_process_index()); @@ -219,12 +218,13 @@ 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_running_power; + double flops = duration * smpi_host_speed; int rank = smpi_process_index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type=TRACING_COMPUTING; extra->comp_size=flops; TRACE_smpi_computing_in(rank, extra); + smpi_execute_flops(flops); TRACE_smpi_computing_out(rank); @@ -235,7 +235,7 @@ void smpi_execute(double duration) } } -void smpi_bench_begin(void) +void smpi_bench_begin() { if (smpi_privatize_global_variables) { smpi_switch_data_segment(smpi_process_index()); @@ -260,7 +260,7 @@ void smpi_bench_begin(void) xbt_os_threadtimer_start(smpi_process_timer()); } -void smpi_bench_end(void) +void smpi_bench_end() { if (MC_is_active() || MC_record_replay_is_active()) return; @@ -403,7 +403,7 @@ int smpi_clock_gettime(clockid_t clk_id, struct timespec *tp) #endif extern double sg_surf_precision; -unsigned long long smpi_rastro_resolution (void) +unsigned long long smpi_rastro_resolution () { smpi_bench_end(); double resolution = (1/sg_surf_precision); @@ -411,7 +411,7 @@ unsigned long long smpi_rastro_resolution (void) return static_cast(resolution); } -unsigned long long smpi_rastro_timestamp (void) +unsigned long long smpi_rastro_timestamp () { smpi_bench_end(); double now = SIMIX_get_clock(); @@ -568,7 +568,7 @@ void smpi_sample_3(int global, const char *file, int line) void *smpi_shared_malloc(size_t size, const char *file, int line) { void* mem; - if (xbt_cfg_get_boolean("smpi/use-shared-malloc")){ + if (size > 0 && xbt_cfg_get_boolean("smpi/use-shared-malloc")){ int fd; smpi_source_location loc(file, line); auto res = allocs.insert(std::make_pair(loc, shared_data_t())); @@ -613,7 +613,7 @@ void smpi_shared_free(void *ptr) snprintf(loc, PTR_STRLEN, "%p", ptr); auto meta = allocs_metadata.find(ptr); if (meta == allocs_metadata.end()) { - XBT_WARN("Cannot free: %p was not shared-allocated by SMPI", ptr); + XBT_WARN("Cannot free: %p was not shared-allocated by SMPI - maybe its size was 0?", ptr); return; } shared_data_t* data = &meta->second.data->second; @@ -621,11 +621,12 @@ void smpi_shared_free(void *ptr) XBT_WARN("Unmapping of fd %d failed: %s", data->fd, strerror(errno)); } data->count--; - XBT_DEBUG("Shared free - no removal - of %p, count = %d", ptr, data->count); if (data->count <= 0) { close(data->fd); allocs.erase(allocs.find(meta->second.data->first)); XBT_DEBUG("Shared free - with removal - of %p", ptr); + }else{ + XBT_DEBUG("Shared free - no removal - of %p, count = %d", ptr, data->count); } }else{ XBT_DEBUG("Classic free of %p", ptr); @@ -746,11 +747,15 @@ void smpi_initialize_global_memory_segments(){ for (int i=0; i< smpi_process_count(); i++){ //create SIMIX_process_count() mappings of this size with the same data inside + int file_descriptor; void *address = nullptr; - char path[] = "/dev/shm/my-buffer-XXXXXX"; + char path[24]; int status; - int file_descriptor= mkstemp (path); + do { + snprintf(path, sizeof(path), "/smpi-buffer-%06x", rand()%0xffffff); + file_descriptor = shm_open(path, O_RDWR|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR); + } while (file_descriptor == -1 && errno == EEXIST); if (file_descriptor < 0) { if (errno==EMFILE) { xbt_die("Impossible to create temporary file for memory mapping: %s\n\ @@ -771,10 +776,6 @@ Ask the Internet about tutorials on how to increase the files limit such as: htt strerror(errno)); } - status = unlink (path); - if (status) - xbt_die("Impossible to unlink temporary file for memory mapping"); - status = ftruncate(file_descriptor, smpi_size_data_exe); if(status) xbt_die("Impossible to set the size of the temporary file for memory mapping"); @@ -784,6 +785,10 @@ Ask the Internet about tutorials on how to increase the files limit such as: htt if (address == MAP_FAILED) xbt_die("Couldn't find a free region for memory mapping"); + status = shm_unlink(path); + if (status) + xbt_die("Impossible to unlink temporary file for memory mapping"); + //initialize the values memcpy(address, TOPAGE(smpi_start_data_exe), smpi_size_data_exe);