-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2021. 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. */
MPI_Comm_delete_attr_function *comm_delete_fn;
MPI_Type_delete_attr_function *type_delete_fn;
MPI_Win_delete_attr_function *win_delete_fn;
+ MPI_Comm_delete_attr_function_fort *comm_delete_fn_fort;
+ MPI_Type_delete_attr_function_fort *type_delete_fn_fort;
+ MPI_Win_delete_attr_function_fort *win_delete_fn_fort;
};
struct smpi_copy_fn {
MPI_Comm_copy_attr_function *comm_copy_fn;
MPI_Type_copy_attr_function *type_copy_fn;
MPI_Win_copy_attr_function *win_copy_fn;
+ MPI_Comm_copy_attr_function_fort *comm_copy_fn_fort;
+ MPI_Type_copy_attr_function_fort *type_copy_fn_fort;
+ MPI_Win_copy_attr_function_fort *win_copy_fn_fort;
};
struct s_smpi_key_elem_t {
smpi_copy_fn copy_fn;
smpi_delete_fn delete_fn;
+ void* extra_state;
int refcount;
};
-typedef s_smpi_key_elem_t* smpi_key_elem;
+using smpi_key_elem = s_smpi_key_elem_t*;
namespace simgrid{
namespace smpi{
// Each subclass should have two members, as we want to separate the ones for Win, Comm, and Datatypes :
// static std::unordered_map<int, smpi_key_elem> keyvals_;
// static int keyval_id_;
- template <typename T> static int keyval_create(smpi_copy_fn copy_fn, smpi_delete_fn delete_fn, int* keyval, void* extra_statee);
+ template <typename T>
+ static int keyval_create(const smpi_copy_fn& copy_fn, const smpi_delete_fn& delete_fn, int* keyval,
+ void* extra_state);
template <typename T> static int keyval_free(int* keyval);
template <typename T> int attr_delete(int keyval);
template <typename T> int attr_get(int keyval, void* attr_value, int* flag);
template <typename T> int attr_put(int keyval, void* attr_value);
- template <typename T> static int call_deleter(T* obj, smpi_key_elem elem, int keyval, void * value, int* flag);
+ template <typename T>
+ static int call_deleter(T* obj, const s_smpi_key_elem_t* elem, int keyval, void* value, int* flag);
template <typename T> void cleanup_attr();
};
-template <typename T> int Keyval::keyval_create(smpi_copy_fn copy_fn, smpi_delete_fn delete_fn, int* keyval, void* extra_state){
-
- smpi_key_elem value = new s_smpi_key_elem_t;
+template <typename T>
+int Keyval::keyval_create(const smpi_copy_fn& copy_fn, const smpi_delete_fn& delete_fn, int* keyval, void* extra_state)
+{
+ auto* value = new s_smpi_key_elem_t;
value->copy_fn=copy_fn;
value->delete_fn=delete_fn;
+ value->extra_state=extra_state;
value->refcount=1;
*keyval = T::keyval_id_;
/* See MPI-1, 5.7.1. Freeing the keyval does not remove it if it
* is in use in an attribute */
smpi_key_elem elem = T::keyvals_.at(*keyval);
- if(elem==0){
+ if (elem == nullptr) {
return MPI_ERR_ARG;
}
if(elem->refcount==1){
}else{
elem->refcount--;
}
+ *keyval = MPI_KEYVAL_INVALID;
return MPI_SUCCESS;
}
template <typename T> int Keyval::attr_get(int keyval, void* attr_value, int* flag){
- smpi_key_elem elem = T::keyvals_.at(keyval);
+ const s_smpi_key_elem_t* elem = T::keyvals_.at(keyval);
if(elem==nullptr)
return MPI_ERR_ARG;
if(attributes()->empty()){
if(elem==nullptr)
return MPI_ERR_ARG;
elem->refcount++;
- void * value = nullptr;
int flag=0;
- this->attr_get<T>(keyval, &value, &flag);
- if(flag!=0){
- int ret = call_deleter<T>((T*)this, elem, keyval,value,&flag);
+ auto p = attributes()->insert({keyval, attr_value});
+ if (!p.second) {
+ int ret = call_deleter<T>((T*)this, elem, keyval,p.first->second,&flag);
+ // overwrite previous value
+ p.first->second = attr_value;
if(ret!=MPI_SUCCESS)
- return ret;
+ return ret;
}
- attributes()->insert({keyval, attr_value});
return MPI_SUCCESS;
}
call_deleter<T>((T*)this, elem, it.first,it.second,&flag);
}
} else {
- //already deleted, not a problem;
+ // already deleted, not a problem
flag=0;
}
}