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
travis: activate MC on linux so that sonar checks it (fix #158)
[simgrid.git]
/
src
/
smpi
/
smpi_op.cpp
diff --git
a/src/smpi/smpi_op.cpp
b/src/smpi/smpi_op.cpp
index
a4e42aa
..
599c0c2
100644
(file)
--- a/
src/smpi/smpi_op.cpp
+++ b/
src/smpi/smpi_op.cpp
@@
-3,8
+3,10
@@
/* 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. */
/* 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 "mc/mc.h"
-#include "private.h"
+#include "src/smpi/private.h"
+#include "src/smpi/smpi_datatype.hpp"
+#include "src/smpi/smpi_op.hpp"
+#include "src/smpi/smpi_process.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_op, smpi, "Logging specific to SMPI (op)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_op, smpi, "Logging specific to SMPI (op)");
@@
-238,12
+240,12
@@
void Op::set_fortran_op()
void Op::apply(void *invec, void *inoutvec, int *len, MPI_Datatype datatype)
{
void Op::apply(void *invec, void *inoutvec, int *len, MPI_Datatype datatype)
{
- if(smpi_privatize_global_variables){//we need to switch as the called function may silently touch global variables
+ if(smpi_privatize_global_variables
== SMPI_PRIVATIZE_MMAP
){//we need to switch as the called function may silently touch global variables
XBT_DEBUG("Applying operation, switch to the right data frame ");
smpi_switch_data_segment(smpi_process()->index());
}
XBT_DEBUG("Applying operation, switch to the right data frame ");
smpi_switch_data_segment(smpi_process()->index());
}
- if(!smpi_process()->replaying()){
+ if(!smpi_process()->replaying()
&& *len > 0
){
if(! is_fortran_op_)
this->func_(invec, inoutvec, len, &datatype);
else{
if(! is_fortran_op_)
this->func_(invec, inoutvec, len, &datatype);
else{