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
Added reference link to comment in MakeLib.cmake
[simgrid.git]
/
src
/
smpi
/
smpi_base.c
diff --git
a/src/smpi/smpi_base.c
b/src/smpi/smpi_base.c
index
bc7ac71
..
af7deeb
100644
(file)
--- a/
src/smpi/smpi_base.c
+++ b/
src/smpi/smpi_base.c
@@
-7,6
+7,7
@@
#include "private.h"
#include "xbt/virtu.h"
#include "mc/mc.h"
#include "private.h"
#include "xbt/virtu.h"
#include "mc/mc.h"
+#include "mc/mc_replay.h"
#include "xbt/replay.h"
#include <errno.h>
#include "simix/smx_private.h"
#include "xbt/replay.h"
#include <errno.h>
#include "simix/smx_private.h"
@@
-456,11
+457,11
@@
void smpi_mpi_start(MPI_Request request)
oldbuf = request->buf;
if (!smpi_process_get_replaying() && oldbuf && request->size!=0){
if((smpi_privatize_global_variables)
oldbuf = request->buf;
if (!smpi_process_get_replaying() && oldbuf && request->size!=0){
if((smpi_privatize_global_variables)
-
&& ((char*)request->buf >=
start_data_exe)
-
&& ((char*)request->buf < start_data_exe +
size_data_exe )){
+
&& ((char*) request->buf >= smpi_
start_data_exe)
+
&& ((char*)request->buf < smpi_start_data_exe + smpi_
size_data_exe )){
XBT_DEBUG("Privatization : We are sending from a zone inside global memory. Switch data segment ");
XBT_DEBUG("Privatization : We are sending from a zone inside global memory. Switch data segment ");
-
smpi_switch_data_segment(request->src);
- }
+ smpi_switch_data_segment(request->src);
+
}
buf = xbt_malloc(request->size);
memcpy(buf,oldbuf,request->size);
XBT_DEBUG("buf %p copied into %p",oldbuf,buf);
buf = xbt_malloc(request->size);
memcpy(buf,oldbuf,request->size);
XBT_DEBUG("buf %p copied into %p",oldbuf,buf);
@@
-694,8
+695,8
@@
static void finish_wait(MPI_Request * request, MPI_Status * status)
if((req->flags & ACCUMULATE) || (datatype->has_subtype == 1)){
if (!smpi_process_get_replaying()){
if( smpi_privatize_global_variables
if((req->flags & ACCUMULATE) || (datatype->has_subtype == 1)){
if (!smpi_process_get_replaying()){
if( smpi_privatize_global_variables
- && ((char*)req->old_buf >= start_data_exe)
- && ((char*)req->old_buf < s
tart_data_exe +
size_data_exe )
+ && ((char*)req->old_buf >= s
mpi_s
tart_data_exe)
+ && ((char*)req->old_buf < s
mpi_start_data_exe + smpi_
size_data_exe )
){
XBT_VERB("Privatization : We are unserializing to a zone in global memory - Switch data segment ");
smpi_switch_data_segment(smpi_process_index());
){
XBT_VERB("Privatization : We are unserializing to a zone in global memory - Switch data segment ");
smpi_switch_data_segment(smpi_process_index());