X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e0201e83de6ce9132c74ee5face3e1ef47d4381..4b650e80d20a9f072b649868db60151aaebfdbd9:/src/smpi/smpi_bench.c?ds=sidebyside diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c index b62666558f..e33d659375 100644 --- a/src/smpi/smpi_bench.c +++ b/src/smpi/smpi_bench.c @@ -4,6 +4,7 @@ /* 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 "internal_config.h" #include "private.h" #include "xbt/dict.h" #include "xbt/sysdep.h" @@ -24,6 +25,10 @@ #include #include +#ifndef MAP_ANONYMOUS +#define MAP_ANONYMOUS MAP_ANON +#endif + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi, "Logging specific to SMPI (benchmarking)"); @@ -64,7 +69,6 @@ xbt_dict_t allocs = NULL; /* Allocated on first use */ xbt_dict_t allocs_metadata = NULL; /* Allocated on first use */ xbt_dict_t samples = NULL; /* Allocated on first use */ xbt_dict_t calls = NULL; /* Allocated on first use */ -__thread int smpi_current_rank = 0; /* Updated after each MPI call */ double smpi_cpu_threshold; double smpi_running_power; @@ -113,7 +117,7 @@ static void* shm_map(int fd, size_t size, shared_data_t* data) { xbt_die("Could not map fd %d: %s", fd, strerror(errno)); } if(!allocs_metadata) { - allocs_metadata = xbt_dict_new_homogeneous(xbt_free); + allocs_metadata = xbt_dict_new_homogeneous(xbt_free_f); } snprintf(loc, PTR_STRLEN, "%p", mem); meta = xbt_new(shared_metadata_t, 1); @@ -187,7 +191,6 @@ void smpi_bench_begin(void) { switch_data_segment(smpi_process_index()); xbt_os_threadtimer_start(smpi_process_timer()); - smpi_current_rank = smpi_process_index(); } void smpi_bench_end(void) @@ -201,28 +204,46 @@ void smpi_bench_end(void) xbt_backtrace_display_current(); xbt_die("Aborting."); } - smpi_execute(xbt_os_timer_elapsed(timer)); + // Simulate the benchmarked computation unless disabled via command-line argument + if (sg_cfg_get_boolean("smpi/simulate_computation")) { + smpi_execute(xbt_os_timer_elapsed(timer)); + } } -unsigned int smpi_sleep(unsigned int secs) +/* Private sleep function used by smpi_sleep() and smpi_usleep() */ +static unsigned int private_sleep(double secs) { - smx_action_t action; - smpi_bench_end(); - double flops = (double) secs*simcall_host_get_speed(SIMIX_host_self()); - XBT_DEBUG("Sleep for: %f flops", flops); - action = simcall_host_execute("computation", SIMIX_host_self(), flops, 1, 0, 0); + XBT_DEBUG("Sleep for: %lf secs", secs); #ifdef HAVE_TRACING - simcall_set_category (action, TRACE_internal_smpi_get_category()); - #endif - simcall_host_execution_wait(action); + int rank = smpi_comm_rank(MPI_COMM_WORLD); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type=TRACING_SLEEPING; + extra->sleep_duration=secs; + TRACE_smpi_sleeping_in(rank, extra); +#endif + simcall_process_sleep(secs); +#ifdef HAVE_TRACING + TRACE_smpi_sleeping_out(rank); +#endif smpi_bench_begin(); - return secs; + return 0; +} + +unsigned int smpi_sleep(unsigned int secs) +{ + return private_sleep((double)secs); } -int smpi_gettimeofday(struct timeval *tv) +int smpi_usleep(useconds_t usecs) +{ + return (int)private_sleep((double)usecs / 1000000.0); +} + + +int smpi_gettimeofday(struct timeval *tv, void* tz) { double now; smpi_bench_end(); @@ -239,11 +260,11 @@ int smpi_gettimeofday(struct timeval *tv) return 0; } -extern double sg_maxmin_precision; +extern double sg_surf_precision; unsigned long long smpi_rastro_resolution (void) { smpi_bench_end(); - double resolution = (1/sg_maxmin_precision); + double resolution = (1/sg_surf_precision); smpi_bench_begin(); return (unsigned long long)resolution; } @@ -569,7 +590,6 @@ void* smpi_shared_set_call(const char* func, const char* input, void* data) { -#ifndef WIN32 #define TOPAGE(addr) (void *)(((unsigned long)(addr) / xbt_pagesize) * xbt_pagesize) @@ -590,13 +610,21 @@ void switch_data_segment(int dest){ if (loaded_page==dest)//no need to switch either return; + +#ifdef HAVE_MMAP + int i; + if(loaded_page==-1){//initial switch, do the copy from the real page here + for (i=0; i< SIMIX_process_count(); i++){ + memcpy(mappings[i],TOPAGE(start_data_exe),size_data_exe); + } + } int current= fds[dest]; XBT_VERB("Switching data frame to the one of process %d", dest); void* tmp = mmap (TOPAGE(start_data_exe), size_data_exe, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, current, 0); - msync(TOPAGE(start_data_exe), size_data_exe, MS_SYNC | MS_INVALIDATE ); if (tmp != TOPAGE(start_data_exe)) xbt_die("Couldn't map the new region"); loaded_page=dest; +#endif } void smpi_get_executable_global_size(){ @@ -675,14 +703,20 @@ void smpi_get_executable_global_size(){ void smpi_initialize_global_memory_segments(){ +#ifndef HAVE_MMAP + smpi_privatize_global_variables=0; + return; +#else + unsigned int i = 0; smpi_get_executable_global_size(); - XBT_VERB ("We have a size of bss+data of %d starting at %p",size_data_exe, start_data_exe ); - + XBT_DEBUG ("bss+data segment found : size %d starting at %p",size_data_exe, start_data_exe ); - if(size_data_exe == 0)//no need to switch + if(size_data_exe == 0){//no need to switch + smpi_privatize_global_variables=0; return; + } fds= (int*)xbt_malloc((smpi_process_count())*sizeof(int)); mappings= (void**)xbt_malloc((smpi_process_count())*sizeof(void*)); @@ -722,13 +756,15 @@ void smpi_initialize_global_memory_segments(){ mappings[i]= address; } +#endif + } void smpi_destroy_global_memory_segments(){ - int i; if(size_data_exe == 0)//no need to switch return; - +#ifdef HAVE_MMAP + int i; for (i=0; i< smpi_process_count(); i++){ if(munmap(mappings[i],size_data_exe) < 0) { XBT_WARN("Unmapping of fd %d failed: %s", fds[i], strerror(errno)); @@ -738,7 +774,7 @@ void smpi_destroy_global_memory_segments(){ xbt_free(mappings); xbt_free(fds); -} +#endif +} -#endif