X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a85fbe15d839396514cb6c2be3ea977d766d95e..6a1a64f72c3f699c137b1352b0a93f4b5a1c8fd6:/src/smpi/smpi_bench.c diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c index bf0fb7f109..7028ea3960 100644 --- a/src/smpi/smpi_bench.c +++ b/src/smpi/smpi_bench.c @@ -153,7 +153,7 @@ void smpi_execute_(double *duration) } void smpi_execute_flops(double flops) { - smx_action_t action; + smx_synchro_t action; smx_host_t host; host = SIMIX_host_self(); XBT_DEBUG("Handle real computation time: %f flops", flops); @@ -195,7 +195,7 @@ void smpi_bench_begin(void) { smpi_switch_data_segment(smpi_process_index()); - if(MC_is_active()) + if (MC_is_active() || MC_record_replay_is_active()) return; xbt_os_threadtimer_start(smpi_process_timer()); @@ -204,7 +204,7 @@ void smpi_bench_begin(void) void smpi_bench_end(void) { - if(MC_is_active()) + if (MC_is_active() || MC_record_replay_is_active()) return; xbt_os_timer_t timer = smpi_process_timer(); @@ -638,6 +638,7 @@ void smpi_really_switch_data_segment(int dest) { } } + // FIXME, cross-process support (mmap across process when necessary) int current = smpi_privatisation_regions[dest].file_descriptor; XBT_DEBUG("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); @@ -647,6 +648,11 @@ void smpi_really_switch_data_segment(int dest) { #endif } +int smpi_is_privatisation_file(char* file) +{ + return strncmp("/dev/shm/my-buffer-", file, 19) == 0; +} + void smpi_get_executable_global_size(){ int size_bss_binary=0; int size_data_binary=0;