don't free the properties of the cluster before the last host

[simgrid.git] / src / smpi / smpi_op.cpp

diff --git a/src/smpi/smpi_op.cpp b/src/smpi/smpi_op.cpp
index 3cd260e..22ac499 100644 (file)
--- a/src/smpi/smpi_op.cpp
+++ b/src/smpi/smpi_op.cpp
@@ -234,14 +234,14 @@ 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
     XBT_DEBUG("Applying operation, switch to the right data frame ");
-    smpi_switch_data_segment(smpi_process_index());
+    smpi_switch_data_segment(smpi_process()->index());
   }
 
-  if(!smpi_process_get_replaying()){
+  if(!smpi_process()->replaying()){
     if(! is_fortran_op_)
       this->func_(invec, inoutvec, len, &datatype);
     else{
-      int tmp = smpi_type_c2f(datatype);
+      int tmp = datatype->c2f();
       /* Unfortunately, the C and Fortran version of the MPI standard do not agree on the type here,
          thus the reinterpret_cast. */
       this->func_(invec, inoutvec, len, reinterpret_cast<MPI_Datatype*>(&tmp) );
@@ -249,5 +249,9 @@ void Op::apply(void *invec, void *inoutvec, int *len, MPI_Datatype datatype)
   }
 }
 
+Op* Op::f2c(int id){
+  return static_cast<Op*>(F2C::f2c(id));
+}
+
 }
 }