#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"
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
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);
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*);
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;
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(*type, atoi((const char*)key), &value, &flag);
+ if(elem && elem->delete_fn)
+ elem->delete_fn(*type, atoi((const char*)key), value, &flag);
}
}
}
int smpi_type_attr_delete(MPI_Datatype type, int keyval){
- char* tmpkey=xbt_malloc(sizeof(int));
+ 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)
void * value;
int flag;
if(smpi_type_attr_get(type, keyval, &value, &flag)==MPI_SUCCESS){
- int ret = elem->delete_fn(type, keyval, &value, &flag);
+ int ret = elem->delete_fn(type, keyval, value, &flag);
if(ret!=MPI_SUCCESS) return ret;
}
}
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(sizeof(int));
+ 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_SUCCESS;
}
TRY {
- char* tmpkey=xbt_malloc(sizeof(int));
- sprintf(tmpkey, "%d", keyval);
*(void**)attr_value = xbt_dict_get(type->attributes, (const char*)tmpkey);
*flag=1;
}
*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(sizeof(int));
+ 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 )
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);
+ 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;
}
value->delete_fn=delete_fn;
*keyval = type_keyval_id;
- char* tmpkey=xbt_malloc(sizeof(int));
+ 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){
- smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)keyval);
- if(!elem)
- return MPI_ERR_ARG;
- char* tmpkey=xbt_malloc(sizeof(int));
+ 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;
+}
+