X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f05083da42eef633dfdf50f44e63fb18e3c0dcec..e7474e602031399bbebb1105d683564d1fb2f1c0:/src/smpi/smpi_bench.cpp?ds=sidebyside diff --git a/src/smpi/smpi_bench.cpp b/src/smpi/smpi_bench.cpp index a997df03b7..1e9eaed4ed 100644 --- a/src/smpi/smpi_bench.cpp +++ b/src/smpi/smpi_bench.cpp @@ -80,7 +80,7 @@ double smpi_running_power; int smpi_loaded_page = -1; char* smpi_start_data_exe = NULL; int smpi_size_data_exe = 0; -int smpi_privatize_global_variables; +bool smpi_privatize_global_variables; double smpi_total_benched_time = 0; smpi_privatisation_region_t smpi_privatisation_regions; @@ -155,7 +155,7 @@ static size_t shm_size(int fd) { if(fstat(fd, &st) < 0) { xbt_die("Could not stat fd %d: %s", fd, strerror(errno)); } - return (size_t)st.st_size; + return static_cast(st.st_size); } #ifndef WIN32 @@ -164,10 +164,8 @@ static void* shm_map(int fd, size_t size, shared_data_key_type* data) { char loc[PTR_STRLEN]; shared_metadata_t meta; - if(size > shm_size(fd)) { - if(ftruncate(fd, (off_t)size) < 0) { + if(size > shm_size(fd) && (ftruncate(fd, static_cast(size)) < 0)) { xbt_die("Could not truncate fd %d to %zu: %s", fd, size, strerror(errno)); - } } mem = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); @@ -255,7 +253,6 @@ void smpi_bench_end(void) double speedup = 1; xbt_os_timer_t timer = smpi_process_timer(); xbt_os_threadtimer_stop(timer); -// smpi_switch_data_segment(smpi_process_count()); if (smpi_process_get_sampling()) { XBT_CRITICAL("Cannot do recursive benchmarks."); XBT_CRITICAL("Are you trying to make a call to MPI within a SMPI_SAMPLE_ block?"); @@ -266,9 +263,9 @@ void smpi_bench_end(void) 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. - smpi_trace_call_location_t* loc = smpi_process_get_call_location(); - std::string key = loc->get_composed_key(); - std::map::const_iterator it = location2speedup.find(key); + smpi_trace_call_location_t* loc = smpi_process_get_call_location(); + std::string key = loc->get_composed_key(); + std::unordered_map::const_iterator it = location2speedup.find(key); if (it != location2speedup.end()) { speedup = it->second; } @@ -304,12 +301,12 @@ static unsigned int private_sleep(double secs) unsigned int smpi_sleep(unsigned int secs) { - return private_sleep((double)secs); + return private_sleep(static_cast(secs)); } int smpi_usleep(useconds_t usecs) { - return (int)private_sleep((double)usecs / 1000000.0); + return static_cast(private_sleep(static_cast(usecs) / 1000000.0)); } int smpi_gettimeofday(struct timeval *tv, void* tz) @@ -318,11 +315,11 @@ int smpi_gettimeofday(struct timeval *tv, void* tz) smpi_bench_end(); now = SIMIX_get_clock(); if (tv) { - tv->tv_sec = (time_t)now; + tv->tv_sec = static_cast(now); #ifdef WIN32 - tv->tv_usec = (useconds_t)((now - tv->tv_sec) * 1e6); + tv->tv_usec = static_cast((now - tv->tv_sec) * 1e6); #else - tv->tv_usec = (suseconds_t)((now - tv->tv_sec) * 1e6); + tv->tv_usec = static_cast((now - tv->tv_sec) * 1e6); #endif } smpi_bench_begin(); @@ -335,7 +332,7 @@ unsigned long long smpi_rastro_resolution (void) smpi_bench_end(); double resolution = (1/sg_surf_precision); smpi_bench_begin(); - return (unsigned long long)resolution; + return static_cast(resolution); } unsigned long long smpi_rastro_timestamp (void) @@ -346,7 +343,7 @@ unsigned long long smpi_rastro_timestamp (void) unsigned long long sec = (unsigned long long)now; unsigned long long pre = (now - sec) * smpi_rastro_resolution(); smpi_bench_begin(); - return (unsigned long long)sec * smpi_rastro_resolution() + pre; + return static_cast(sec) * smpi_rastro_resolution() + pre; } /* ****************************** Functions related to the SMPI_SAMPLE_ macros ************************************/ @@ -390,14 +387,14 @@ void smpi_sample_1(int global, const char *file, int line, int iters, double thr smpi_bench_end(); /* Take time from previous, unrelated computation into account */ smpi_process_set_sampling(1); - if (!samples) + if (samples==NULL) samples = xbt_dict_new_homogeneous(free); data = static_cast(xbt_dict_get_or_null(samples, loc)); - if (!data) { + if (data==NULL) { xbt_assert(threshold>0 || iters>0, "You should provide either a positive amount of iterations to bench, or a positive maximal stderr (or both)"); - data = (local_data_t *) xbt_new(local_data_t, 1); + data = static_cast( xbt_new(local_data_t, 1)); data->count = 0; data->sum = 0.0; data->sum_pow2 = 0.0; @@ -417,7 +414,7 @@ void smpi_sample_1(int global, const char *file, int line, int iters, double thr // if we already have some data, check whether sample_2 should get one more bench or whether it should emulate // the computation instead - data->benching = !sample_enough_benchs(data); + data->benching = (sample_enough_benchs(data) == 0); XBT_DEBUG("XXXX Re-entering the benched nest %s. %s",loc, (data->benching?"more benching needed":"we have enough data, skip computes")); } @@ -476,10 +473,10 @@ void smpi_sample_3(int global, const char *file, int line) sample = xbt_os_timer_elapsed(smpi_process_timer()); data->sum += sample; data->sum_pow2 += sample * sample; - n = (double)data->count; + n = static_cast(data->count); data->mean = data->sum / n; data->relstderr = sqrt((data->sum_pow2 / n - data->mean * data->mean) / n) / data->mean; - if (!sample_enough_benchs(data)) { + if (sample_enough_benchs(data)==0) { data->mean = sample; // Still in benching process; We want sample_2 to simulate the exact time of this loop // occurrence before leaving, not the mean over the history } @@ -507,12 +504,10 @@ void *smpi_shared_malloc(size_t size, const char *file, int line) snprintf(shmname, 31, "/shmalloc%p", &*data); fd = shm_open(shmname, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (fd < 0) { - switch(errno) { - case EEXIST: - xbt_die("Please cleanup /dev/shm/%s", shmname); - default: - xbt_die("An unhandled error occurred while opening %s. shm_open: %s", shmname, strerror(errno)); - } + if(errno==EEXIST) + xbt_die("Please cleanup /dev/shm/%s", shmname); + else + xbt_die("An unhandled error occurred while opening %s. shm_open: %s", shmname, strerror(errno)); } data->second.fd = fd; data->second.count = 1; @@ -569,7 +564,7 @@ int smpi_shared_known_call(const char* func, const char* input) xbt_ex_t ex; int known = 0; - if (!calls) { + if (calls==NULL) { calls = xbt_dict_new_homogeneous(NULL); } TRY { @@ -591,22 +586,22 @@ void* smpi_shared_get_call(const char* func, const char* input) { char* loc = bprintf("%s:%s", func, input); void* data; - if(!calls) { + if(calls==NULL) { calls = xbt_dict_new_homogeneous(NULL); } data = xbt_dict_get(calls, loc); - free(loc); + xbt_free(loc); return data; } void* smpi_shared_set_call(const char* func, const char* input, void* data) { char* loc = bprintf("%s:%s", func, input); - if(!calls) { + if(calls==0) { calls = xbt_dict_new_homogeneous(NULL); } xbt_dict_set(calls, loc, data, NULL); - free(loc); + xbt_free(loc); return data; } @@ -656,7 +651,7 @@ int smpi_is_privatisation_file(char* file) void smpi_initialize_global_memory_segments(){ #if !HAVE_PRIVATIZATION - smpi_privatize_global_variables=0; + smpi_privatize_global_variables=false; xbt_die("You are trying to use privatization on a system that does not support it. Don't."); return; #else @@ -666,12 +661,12 @@ void smpi_initialize_global_memory_segments(){ XBT_DEBUG ("bss+data segment found : size %d starting at %p", smpi_size_data_exe, smpi_start_data_exe ); if (smpi_size_data_exe == 0){//no need to switch - smpi_privatize_global_variables=0; + smpi_privatize_global_variables=false; return; } smpi_privatisation_regions = - (smpi_privatisation_region_t) malloc(smpi_process_count() * sizeof(struct s_smpi_privatisation_region)); + static_cast( xbt_malloc(smpi_process_count() * sizeof(struct s_smpi_privatisation_region))); for (int i=0; i< smpi_process_count(); i++){ //create SIMIX_process_count() mappings of this size with the same data inside @@ -738,8 +733,7 @@ void smpi_destroy_global_memory_segments(){ #endif } -extern "C" { - +extern "C" { /** These functions will be called from the user code **/ smpi_trace_call_location_t* smpi_trace_get_call_location() { return smpi_process_get_call_location(); }