Use an ActorPtr as parameter to smpi_switch_data_segemnt.

[simgrid.git] / src / smpi / mpi / smpi_datatype.cpp

diff --git a/src/smpi/mpi/smpi_datatype.cpp b/src/smpi/mpi/smpi_datatype.cpp
index cc3ff44..7103d09 100644 (file)
--- a/src/smpi/mpi/smpi_datatype.cpp
+++ b/src/smpi/mpi/smpi_datatype.cpp
@@ -1,5 +1,5 @@
 /* smpi_datatype.cpp -- MPI primitives to handle datatypes                  */
-/* Copyright (c) 2009-2017. The SimGrid Team.  All rights reserved.         */
+/* Copyright (c) 2009-2018. The SimGrid Team.  All rights reserved.         */
 
 /* 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. */
@@ -277,7 +277,7 @@ int Datatype::copy(void *sendbuf, int sendcount, MPI_Datatype sendtype,
 // FIXME Handle the case of a partial shared malloc.
 
   if(smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP){
-    smpi_switch_data_segment(simgrid::s4u::Actor::self()->getPid());
+    smpi_switch_data_segment(simgrid::s4u::Actor::self());
   }
   /* First check if we really have something to do */
   if (recvcount > 0 && recvbuf != sendbuf) {
@@ -506,11 +506,11 @@ int Datatype::create_subarray(int ndims, int* array_of_sizes,
   
   for (i=0; i < ndims; i++) {
     if (array_of_subsizes[i] > array_of_sizes[i]){
-      XBT_WARN("subarray : array_of_subsizes > array_of_sizes for dim %d\n",i);
+      XBT_WARN("subarray : array_of_subsizes > array_of_sizes for dim %d",i);
       return MPI_ERR_ARG;
     }
     if (array_of_starts[i] + array_of_subsizes[i] > array_of_sizes[i]){
-      XBT_WARN("subarray : array_of_starts + array_of_subsizes > array_of_sizes for dim %d\n",i);
+      XBT_WARN("subarray : array_of_starts + array_of_subsizes > array_of_sizes for dim %d",i);
       return MPI_ERR_ARG;
     }
   }
@@ -526,15 +526,15 @@ int Datatype::create_subarray(int ndims, int* array_of_sizes,
       step = 1;
       end = ndims;
   }
+  
+  MPI_Aint size = (MPI_Aint)array_of_sizes[i] * (MPI_Aint)array_of_sizes[i+step];
+  MPI_Aint lb = (MPI_Aint)array_of_starts[i] + (MPI_Aint)array_of_starts[i+step] *(MPI_Aint)array_of_sizes[i];
 
   create_vector( array_of_subsizes[i+step], array_of_subsizes[i], array_of_sizes[i],
                                oldtype, newtype );
 
   tmp = *newtype;
-  MPI_Aint size = (MPI_Aint)array_of_sizes[i] * (MPI_Aint)array_of_sizes[i+step];
-  MPI_Aint lb = (MPI_Aint)array_of_starts[i] + (MPI_Aint)array_of_starts[i+step] *(MPI_Aint)array_of_sizes[i];
-  
-  
+
   for( i += 2 * step; i != end; i += step ) {
       create_hvector( array_of_subsizes[i], 1, size * extent,
                                     tmp, newtype );
@@ -546,7 +546,7 @@ int Datatype::create_subarray(int ndims, int* array_of_sizes,
 
   MPI_Aint lbs[1] = {lb * extent};
   int sizes [1]={1};
-  
+  //handle LB and UB with a resized call
   create_hindexed( 1, sizes, lbs, tmp, newtype);
   unref(tmp);
   
@@ -556,6 +556,18 @@ int Datatype::create_subarray(int ndims, int* array_of_sizes,
   unref(tmp);
   return MPI_SUCCESS;
 }
+
+int Datatype::create_resized(MPI_Datatype oldtype,MPI_Aint lb, MPI_Aint extent, MPI_Datatype *newtype){
+  int blocks[3]         = {1, 1, 1};
+  MPI_Aint disps[3]     = {lb, 0, lb + extent};
+  MPI_Datatype types[3] = {MPI_LB, oldtype, MPI_UB};
+
+  *newtype = new simgrid::smpi::Type_Struct(oldtype->size(), lb, lb + extent, DT_FLAG_DERIVED, 3, blocks, disps, types);
+
+  (*newtype)->addflag(~DT_FLAG_COMMITED);
+  return MPI_SUCCESS;
+}
+
 Datatype* Datatype::f2c(int id){
   return static_cast<Datatype*>(F2C::f2c(id));
 }