A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
attempt to remove oudated coccinelle stuff
[simgrid.git]
/
src
/
smpi
/
smpi_bench.c
diff --git
a/src/smpi/smpi_bench.c
b/src/smpi/smpi_bench.c
index
76bc438
..
fcf9a6e
100644
(file)
--- a/
src/smpi/smpi_bench.c
+++ b/
src/smpi/smpi_bench.c
@@
-154,9
+154,9
@@
void smpi_execute_(double *duration)
void smpi_execute_flops(double flops) {
smx_synchro_t action;
XBT_DEBUG("Handle real computation time: %f flops", flops);
void smpi_execute_flops(double flops) {
smx_synchro_t action;
XBT_DEBUG("Handle real computation time: %f flops", flops);
- action = simcall_
process_execute
("computation", flops, 1, 0, 0);
+ action = simcall_
execution_start
("computation", flops, 1, 0, 0);
simcall_set_category (action, TRACE_internal_smpi_get_category());
simcall_set_category (action, TRACE_internal_smpi_get_category());
- simcall_
process_
execution_wait(action);
+ simcall_execution_wait(action);
smpi_switch_data_segment(smpi_process_index());
}
smpi_switch_data_segment(smpi_process_index());
}
@@
-622,7
+622,7
@@
void smpi_really_switch_data_segment(int dest) {
#ifdef HAVE_PRIVATIZATION
int i;
if(smpi_loaded_page==-1){//initial switch, do the copy from the real page here
#ifdef HAVE_PRIVATIZATION
int i;
if(smpi_loaded_page==-1){//initial switch, do the copy from the real page here
- for (i=0; i<
SIMIX
_process_count(); i++){
+ for (i=0; i<
smpi
_process_count(); i++){
memcpy(smpi_privatisation_regions[i].address,
TOPAGE(smpi_start_data_exe), smpi_size_data_exe);
}
memcpy(smpi_privatisation_regions[i].address,
TOPAGE(smpi_start_data_exe), smpi_size_data_exe);
}
@@
-648,6
+648,7
@@
void smpi_initialize_global_memory_segments(){
#ifndef HAVE_PRIVATIZATION
smpi_privatize_global_variables=0;
#ifndef HAVE_PRIVATIZATION
smpi_privatize_global_variables=0;
+ xbt_die("You are trying to use privatization on a system that does not support it. Don't.");
return;
#else
return;
#else
@@
-665,7
+666,7
@@
void smpi_initialize_global_memory_segments(){
smpi_privatisation_regions = (smpi_privatisation_region_t) malloc(
smpi_process_count() * sizeof(struct s_smpi_privatisation_region));
smpi_privatisation_regions = (smpi_privatisation_region_t) malloc(
smpi_process_count() * sizeof(struct s_smpi_privatisation_region));
- for (i=0; i<
SIMIX
_process_count(); i++){
+ for (i=0; i<
smpi
_process_count(); i++){
//create SIMIX_process_count() mappings of this size with the same data inside
void *address = NULL;
char path[] = "/dev/shm/my-buffer-XXXXXX";
//create SIMIX_process_count() mappings of this size with the same data inside
void *address = NULL;
char path[] = "/dev/shm/my-buffer-XXXXXX";