X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a1582e115b08d0012c289028cab7cd112167e3a..2114c044f7a785c1c53c0f69d0203fd50c2175d5:/src/smpi/smpi_mpi_dt.c

diff --git a/src/smpi/smpi_mpi_dt.c b/src/smpi/smpi_mpi_dt.c
index 923193b576..54eecc2710 100644
--- a/src/smpi/smpi_mpi_dt.c
+++ b/src/smpi/smpi_mpi_dt.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <limits.h>
 #include "private.h"
 #include "smpi_mpi_dt_private.h"
 #include "mc/mc.h"
@@ -20,6 +20,10 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi_dt, smpi,
                                 "Logging specific to SMPI (datatype)");
 
+#define INTSIZEDCHAR (sizeof(int)*CHAR_BIT-1)/3 + 3 
+xbt_dict_t smpi_type_keyvals = NULL;
+int type_keyval_id=0;//avoid collisions
+
 #define CREATE_MPI_DATATYPE(name, type)       \
   static s_smpi_mpi_datatype_t mpi_##name = { \
     (char*) # name,                                   \
@@ -28,7 +32,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi_dt, smpi,
     0,             /* lb */                   \
     sizeof(type),  /* ub = lb + size */       \
     DT_FLAG_BASIC,  /* flags */              \
-    NULL           /* pointer on extended struct*/ \
+    NULL,           /* attributes */         \
+    NULL,           /* pointer on extended struct*/ \
   };                                          \
 MPI_Datatype name = &mpi_##name;
 
@@ -40,6 +45,7 @@ MPI_Datatype name = &mpi_##name;
     0,             /* lb */                   \
     0,  /* ub = lb + size */       \
     DT_FLAG_BASIC,  /* flags */              \
+    NULL,           /* attributes */         \
     NULL           /* pointer on extended struct*/ \
   };                                          \
 MPI_Datatype name = &mpi_##name;
@@ -126,6 +132,7 @@ CREATE_MPI_DATATYPE(MPI_2FLOAT, float_float);
 CREATE_MPI_DATATYPE(MPI_2DOUBLE, double_double);
 CREATE_MPI_DATATYPE(MPI_2LONG, long_long);
 
+CREATE_MPI_DATATYPE(MPI_REAL, float);
 CREATE_MPI_DATATYPE(MPI_REAL4, float);
 CREATE_MPI_DATATYPE(MPI_REAL8, float);
 CREATE_MPI_DATATYPE(MPI_REAL16, double);
@@ -142,7 +149,7 @@ CREATE_MPI_DATATYPE(MPI_LONG_DOUBLE_INT, long_double_int);
 
 CREATE_MPI_DATATYPE_NULL(MPI_UB);
 CREATE_MPI_DATATYPE_NULL(MPI_LB);
-CREATE_MPI_DATATYPE_NULL(MPI_PACKED);
+CREATE_MPI_DATATYPE(MPI_PACKED, char);
 // Internal use only
 CREATE_MPI_DATATYPE(MPI_PTR, void*);
 
@@ -168,26 +175,58 @@ MPI_Aint smpi_datatype_ub(MPI_Datatype datatype)
   return datatype->ub;
 }
 
-MPI_Datatype smpi_datatype_dup(MPI_Datatype datatype)
+int smpi_datatype_dup(MPI_Datatype datatype, MPI_Datatype* new_t)
 {
-  MPI_Datatype new_t= xbt_new(s_smpi_mpi_datatype_t,1);
-  memcpy(new_t, datatype, sizeof(s_smpi_mpi_datatype_t));
-  if (datatype->has_subtype)
-    memcpy(new_t->substruct, datatype->substruct, sizeof(s_smpi_subtype_t));
+  int ret=MPI_SUCCESS;
+  *new_t= xbt_new(s_smpi_mpi_datatype_t,1);
+  memcpy(*new_t, datatype, sizeof(s_smpi_mpi_datatype_t));
+  if (datatype->has_subtype){
+    //FIXME: may copy too much information.
+    (*new_t)->substruct=xbt_malloc(sizeof(s_smpi_mpi_struct_t));
+    memcpy((*new_t)->substruct, datatype->substruct, sizeof(s_smpi_mpi_struct_t));
+  }
   if(datatype->name)
-    new_t->name = strdup(datatype->name);
-  return new_t;
+    (*new_t)->name = strdup(datatype->name);
+  if(datatype->attributes !=NULL){
+      (*new_t)->attributes=xbt_dict_new();
+      xbt_dict_cursor_t cursor = NULL;
+      int *key;
+      int flag;
+      void* value_in;
+      void* value_out;
+      xbt_dict_foreach(datatype->attributes, cursor, key, value_in){
+        smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)key);
+        if(elem && elem->copy_fn!=MPI_NULL_COPY_FN){
+          ret = elem->copy_fn(datatype, atoi((const char*)key), NULL, value_in, &value_out, &flag );
+          if(ret!=MPI_SUCCESS){
+            *new_t=MPI_DATATYPE_NULL;
+            return ret;
+          }
+          if(flag)
+            xbt_dict_set((*new_t)->attributes, (const char*)key,value_out, NULL);
+        }
+      }
+    }
+  return ret;
 }
 
 int smpi_datatype_extent(MPI_Datatype datatype, MPI_Aint * lb,
                          MPI_Aint * extent)
 {
+  if(datatype == MPI_DATATYPE_NULL){
+    *lb=0;
+    *extent=0;
+    return MPI_SUCCESS;
+  }
   *lb = datatype->lb;
   *extent = datatype->ub - datatype->lb;
   return MPI_SUCCESS;
 }
 
 MPI_Aint smpi_datatype_get_extent(MPI_Datatype datatype){
+  if(datatype == MPI_DATATYPE_NULL){
+    return 0;
+  }
   return datatype->ub - datatype->lb;
 }
 
@@ -205,7 +244,7 @@ int smpi_datatype_copy(void *sendbuf, int sendcount, MPI_Datatype sendtype,
 {
   int count;
   if(smpi_privatize_global_variables){
-    switch_data_segment(smpi_process_index());
+    smpi_switch_data_segment(smpi_process_index());
   }
   /* First check if we really have something to do */
   if (recvcount > 0 && recvbuf != sendbuf) {
@@ -215,17 +254,17 @@ int smpi_datatype_copy(void *sendbuf, int sendcount, MPI_Datatype sendtype,
     count = sendcount < recvcount ? sendcount : recvcount;
 
     if(sendtype->has_subtype == 0 && recvtype->has_subtype == 0) {
-      if(!_xbt_replay_is_active()) memcpy(recvbuf, sendbuf, count);
+      if(!smpi_process_get_replaying()) memcpy(recvbuf, sendbuf, count);
     }
     else if (sendtype->has_subtype == 0)
     {
       s_smpi_subtype_t *subtype =  recvtype->substruct;
-      subtype->unserialize( sendbuf, recvbuf,1, subtype, MPI_REPLACE);
+      subtype->unserialize( sendbuf, recvbuf, recvcount/smpi_datatype_size(recvtype), subtype, MPI_REPLACE);
     }
     else if (recvtype->has_subtype == 0)
     {
       s_smpi_subtype_t *subtype =  sendtype->substruct;
-      subtype->serialize(sendbuf, recvbuf,1, subtype);
+      subtype->serialize(sendbuf, recvbuf, sendcount/smpi_datatype_size(sendtype), subtype);
     }else{
       s_smpi_subtype_t *subtype =  sendtype->substruct;
 
@@ -356,6 +395,7 @@ void smpi_datatype_create(MPI_Datatype* new_type, int size,int lb, int ub, int h
   new_t->flags = flags;
   new_t->substruct = struct_type;
   new_t->in_use=0;
+  new_t->attributes=NULL;
   *new_type = new_t;
 
 #ifdef HAVE_MC
@@ -365,6 +405,17 @@ void smpi_datatype_create(MPI_Datatype* new_type, int size,int lb, int ub, int h
 }
 
 void smpi_datatype_free(MPI_Datatype* type){
+  if((*type)->attributes !=NULL){
+      xbt_dict_cursor_t cursor = NULL;
+      int* key;
+      void * value;
+      int flag;
+      xbt_dict_foreach((*type)->attributes, cursor, key, value){
+        smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)key);
+        if(elem &&  elem->delete_fn)
+          elem->delete_fn(*type, atoi((const char*)key), value, &flag);
+      }
+  }
 
   if((*type)->flags & DT_FLAG_PREDEFINED)return;
 
@@ -1261,6 +1312,8 @@ static void max_func(void *a, void *b, int *length,
     APPLY_FUNC(a, b, length, unsigned int, MAX_OP);
   } else if (*datatype == MPI_UNSIGNED_LONG) {
     APPLY_FUNC(a, b, length, unsigned long, MAX_OP);
+  } else if (*datatype == MPI_UNSIGNED_CHAR) {
+    APPLY_FUNC(a, b, length, unsigned char, MAX_OP);
   } else if (*datatype == MPI_FLOAT) {
     APPLY_FUNC(a, b, length, float, MAX_OP);
   } else if (*datatype == MPI_DOUBLE) {
@@ -1287,6 +1340,8 @@ static void min_func(void *a, void *b, int *length,
     APPLY_FUNC(a, b, length, unsigned int, MIN_OP);
   } else if (*datatype == MPI_UNSIGNED_LONG) {
     APPLY_FUNC(a, b, length, unsigned long, MIN_OP);
+  } else if (*datatype == MPI_UNSIGNED_CHAR) {
+    APPLY_FUNC(a, b, length, unsigned char, MIN_OP);
   } else if (*datatype == MPI_FLOAT) {
     APPLY_FUNC(a, b, length, float, MIN_OP);
   } else if (*datatype == MPI_DOUBLE) {
@@ -1313,6 +1368,8 @@ static void sum_func(void *a, void *b, int *length,
     APPLY_FUNC(a, b, length, unsigned int, SUM_OP);
   } else if (*datatype == MPI_UNSIGNED_LONG) {
     APPLY_FUNC(a, b, length, unsigned long, SUM_OP);
+  } else if (*datatype == MPI_UNSIGNED_CHAR) {
+    APPLY_FUNC(a, b, length, unsigned char, SUM_OP);
   } else if (*datatype == MPI_FLOAT) {
     APPLY_FUNC(a, b, length, float, SUM_OP);
   } else if (*datatype == MPI_DOUBLE) {
@@ -1345,6 +1402,8 @@ static void prod_func(void *a, void *b, int *length,
     APPLY_FUNC(a, b, length, unsigned int, PROD_OP);
   } else if (*datatype == MPI_UNSIGNED_LONG) {
     APPLY_FUNC(a, b, length, unsigned long, PROD_OP);
+  } else if (*datatype == MPI_UNSIGNED_CHAR) {
+    APPLY_FUNC(a, b, length, unsigned char, PROD_OP);
   } else if (*datatype == MPI_FLOAT) {
     APPLY_FUNC(a, b, length, float, PROD_OP);
   } else if (*datatype == MPI_DOUBLE) {
@@ -1377,6 +1436,8 @@ static void land_func(void *a, void *b, int *length,
     APPLY_FUNC(a, b, length, unsigned int, LAND_OP);
   } else if (*datatype == MPI_UNSIGNED_LONG) {
     APPLY_FUNC(a, b, length, unsigned long, LAND_OP);
+  } else if (*datatype == MPI_UNSIGNED_CHAR) {
+    APPLY_FUNC(a, b, length, unsigned char, LAND_OP);
   } else if (*datatype == MPI_C_BOOL) {
     APPLY_FUNC(a, b, length, _Bool, LAND_OP);
   }
@@ -1399,6 +1460,8 @@ static void lor_func(void *a, void *b, int *length,
     APPLY_FUNC(a, b, length, unsigned int, LOR_OP);
   } else if (*datatype == MPI_UNSIGNED_LONG) {
     APPLY_FUNC(a, b, length, unsigned long, LOR_OP);
+  } else if (*datatype == MPI_UNSIGNED_CHAR) {
+    APPLY_FUNC(a, b, length, unsigned char, LOR_OP);
   } else if (*datatype == MPI_C_BOOL) {
     APPLY_FUNC(a, b, length, _Bool, LOR_OP);
   }
@@ -1421,6 +1484,8 @@ static void lxor_func(void *a, void *b, int *length,
     APPLY_FUNC(a, b, length, unsigned int, LXOR_OP);
   } else if (*datatype == MPI_UNSIGNED_LONG) {
     APPLY_FUNC(a, b, length, unsigned long, LXOR_OP);
+  } else if (*datatype == MPI_UNSIGNED_CHAR) {
+    APPLY_FUNC(a, b, length, unsigned char, LXOR_OP);
   } else if (*datatype == MPI_C_BOOL) {
     APPLY_FUNC(a, b, length, _Bool, LXOR_OP);
   }
@@ -1431,8 +1496,7 @@ static void band_func(void *a, void *b, int *length,
 {
   if (*datatype == MPI_CHAR) {
     APPLY_FUNC(a, b, length, char, BAND_OP);
-  }
-  if (*datatype == MPI_SHORT) {
+  }else if (*datatype == MPI_SHORT) {
     APPLY_FUNC(a, b, length, short, BAND_OP);
   } else if (*datatype == MPI_INT) {
     APPLY_FUNC(a, b, length, int, BAND_OP);
@@ -1444,6 +1508,8 @@ static void band_func(void *a, void *b, int *length,
     APPLY_FUNC(a, b, length, unsigned int, BAND_OP);
   } else if (*datatype == MPI_UNSIGNED_LONG) {
     APPLY_FUNC(a, b, length, unsigned long, BAND_OP);
+  } else if (*datatype == MPI_UNSIGNED_CHAR) {
+    APPLY_FUNC(a, b, length, unsigned char, BAND_OP);
   } else if (*datatype == MPI_BYTE) {
     APPLY_FUNC(a, b, length, uint8_t, BAND_OP);
   }
@@ -1466,6 +1532,8 @@ static void bor_func(void *a, void *b, int *length,
     APPLY_FUNC(a, b, length, unsigned int, BOR_OP);
   } else if (*datatype == MPI_UNSIGNED_LONG) {
     APPLY_FUNC(a, b, length, unsigned long, BOR_OP);
+  } else if (*datatype == MPI_UNSIGNED_CHAR) {
+    APPLY_FUNC(a, b, length, unsigned char, BOR_OP);
   } else if (*datatype == MPI_BYTE) {
     APPLY_FUNC(a, b, length, uint8_t, BOR_OP);
   }
@@ -1488,6 +1556,8 @@ static void bxor_func(void *a, void *b, int *length,
     APPLY_FUNC(a, b, length, unsigned int, BXOR_OP);
   } else if (*datatype == MPI_UNSIGNED_LONG) {
     APPLY_FUNC(a, b, length, unsigned long, BXOR_OP);
+  } else if (*datatype == MPI_UNSIGNED_CHAR) {
+    APPLY_FUNC(a, b, length, unsigned char, BXOR_OP);
   } else if (*datatype == MPI_BYTE) {
     APPLY_FUNC(a, b, length, uint8_t, BXOR_OP);
   }
@@ -1588,11 +1658,136 @@ void smpi_op_destroy(MPI_Op op)
 void smpi_op_apply(MPI_Op op, void *invec, void *inoutvec, int *len,
                    MPI_Datatype * datatype)
 {
+  if(op==MPI_OP_NULL)
+    return;
+
   if(smpi_privatize_global_variables){ //we need to switch here, as the called function may silently touch global variables
-    XBT_VERB("Applying operation, switch to the right data frame ");
-    switch_data_segment(smpi_process_index());
+    XBT_DEBUG("Applying operation, switch to the right data frame ");
+    smpi_switch_data_segment(smpi_process_index());
   }
 
-  if(!_xbt_replay_is_active())
+  if(!smpi_process_get_replaying())
   op->func(invec, inoutvec, len, datatype);
 }
+
+int smpi_type_attr_delete(MPI_Datatype type, int keyval){
+  char* tmpkey=xbt_malloc(INTSIZEDCHAR);
+  sprintf(tmpkey, "%d", keyval);
+  smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)tmpkey);
+  if(!elem)
+    return MPI_ERR_ARG;
+  if(elem->delete_fn!=MPI_NULL_DELETE_FN){
+    void * value;
+    int flag;
+    if(smpi_type_attr_get(type, keyval, &value, &flag)==MPI_SUCCESS){
+      int ret = elem->delete_fn(type, keyval, value, &flag);
+      if(ret!=MPI_SUCCESS) return ret;
+    }
+  }  
+  if(type->attributes==NULL)
+    return MPI_ERR_ARG;
+
+  xbt_dict_remove(type->attributes, (const char*)tmpkey);
+  xbt_free(tmpkey);
+  return MPI_SUCCESS;
+}
+
+int smpi_type_attr_get(MPI_Datatype type, int keyval, void* attr_value, int* flag){
+  char* tmpkey=xbt_malloc(INTSIZEDCHAR);
+  sprintf(tmpkey, "%d", keyval);
+  smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)tmpkey);
+  if(!elem)
+    return MPI_ERR_ARG;
+  xbt_ex_t ex;
+  if(type->attributes==NULL){
+    *flag=0;
+    return MPI_SUCCESS;
+  }
+  TRY {
+    *(void**)attr_value = xbt_dict_get(type->attributes, (const char*)tmpkey);
+    *flag=1;
+  }
+  CATCH(ex) {
+    *flag=0;
+    xbt_ex_free(ex);
+  }
+  xbt_free(tmpkey);
+  return MPI_SUCCESS;
+}
+
+int smpi_type_attr_put(MPI_Datatype type, int keyval, void* attr_value){
+  if(!smpi_type_keyvals)
+  smpi_type_keyvals = xbt_dict_new();
+  char* tmpkey=xbt_malloc(INTSIZEDCHAR);
+  sprintf(tmpkey, "%d", keyval);
+  smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)tmpkey);
+  if(!elem )
+    return MPI_ERR_ARG;
+  int flag;
+  void* value;
+  smpi_type_attr_get(type, keyval, &value, &flag);
+  if(flag && elem->delete_fn!=MPI_NULL_DELETE_FN){
+    int ret = elem->delete_fn(type, keyval, value, &flag);
+    if(ret!=MPI_SUCCESS) return ret;
+  }
+  if(type->attributes==NULL)
+    type->attributes=xbt_dict_new();
+
+  xbt_dict_set(type->attributes, (const char*)tmpkey, attr_value, NULL);
+  xbt_free(tmpkey);
+  return MPI_SUCCESS;
+}
+
+int smpi_type_keyval_create(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state){
+
+  if(!smpi_type_keyvals)
+  smpi_type_keyvals = xbt_dict_new();
+  
+  smpi_type_key_elem value = (smpi_type_key_elem) xbt_new0(s_smpi_mpi_type_key_elem_t,1);
+  
+  value->copy_fn=copy_fn;
+  value->delete_fn=delete_fn;
+  
+  *keyval = type_keyval_id;
+  char* tmpkey=xbt_malloc(INTSIZEDCHAR);
+  sprintf(tmpkey, "%d", *keyval);
+  xbt_dict_set(smpi_type_keyvals,(const char*)tmpkey,(void*)value, NULL);
+  type_keyval_id++;
+  xbt_free(tmpkey);
+  return MPI_SUCCESS;
+}
+
+int smpi_type_keyval_free(int* keyval){
+  char* tmpkey=xbt_malloc(INTSIZEDCHAR);
+  sprintf(tmpkey, "%d", *keyval);
+  smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)tmpkey);
+  if(!elem){
+    xbt_free(tmpkey);
+    return MPI_ERR_ARG;
+  }
+  xbt_dict_remove(smpi_type_keyvals, (const char*)tmpkey);
+  xbt_free(elem);
+  xbt_free(tmpkey);
+  return MPI_SUCCESS;
+}
+
+int smpi_mpi_pack(void* inbuf, int incount, MPI_Datatype type, void* outbuf, int outcount, int* position, MPI_Comm comm){
+  size_t size = smpi_datatype_size(type);
+  if (outcount - *position < incount*size)
+    return MPI_ERR_BUFFER;
+  smpi_datatype_copy(inbuf, incount, type,
+                   (char*)outbuf + *position, outcount, MPI_CHAR);
+  *position += incount * size;
+  return MPI_SUCCESS;
+}
+
+int smpi_mpi_unpack(void* inbuf, int insize, int* position, void* outbuf, int outcount, MPI_Datatype type, MPI_Comm comm){
+  size_t size = smpi_datatype_size(type);
+  if (outcount*size> insize)
+    return MPI_ERR_BUFFER;
+  smpi_datatype_copy((char*)inbuf + *position, insize, MPI_CHAR,
+                   outbuf, outcount, type);
+  *position += outcount * size;
+  return MPI_SUCCESS;
+}
+