-/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2022. 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. */
#define SMPI_KEYVALS_HPP_INCLUDED
#include "smpi/smpi.h"
+#include "xbt/asserts.h"
#include <unordered_map>
MPI_Win_copy_attr_function_fort *win_copy_fn_fort;
};
-struct s_smpi_key_elem_t {
+struct smpi_key_elem {
smpi_copy_fn copy_fn;
smpi_delete_fn delete_fn;
void* extra_state;
int refcount;
+ bool deleted;
+ bool delete_attr; // if true, xbt_free(attr) on delete: used by Fortran bindings
};
-using smpi_key_elem = s_smpi_key_elem_t*;
-
namespace simgrid{
namespace smpi{
private:
std::unordered_map<int, void*> attributes_;
protected:
- std::unordered_map<int, void*>* attributes();
+ std::unordered_map<int, void*>& attributes() { return attributes_; }
+
public:
// 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(const smpi_copy_fn& copy_fn, const smpi_delete_fn& delete_fn, int* keyval,
- void* extra_state);
+ void* extra_state, bool delete_attr = false);
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, const s_smpi_key_elem_t* elem, int keyval, void* value, int* flag);
+ static int call_deleter(T* obj, const smpi_key_elem& elem, int keyval, void* value, int* flag);
template <typename T> void cleanup_attr();
};
template <typename T>
-int Keyval::keyval_create(const smpi_copy_fn& copy_fn, const smpi_delete_fn& delete_fn, int* keyval, void* extra_state)
+int Keyval::keyval_create(const smpi_copy_fn& copy_fn, const smpi_delete_fn& delete_fn, int* keyval, void* extra_state,
+ bool delete_attr)
{
- 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;
+ smpi_key_elem value;
+ value.copy_fn = copy_fn;
+ value.delete_fn = delete_fn;
+ value.extra_state = extra_state;
+ value.refcount = 0;
+ value.deleted = false;
+ value.delete_attr = delete_attr;
*keyval = T::keyval_id_;
- T::keyvals_.insert({*keyval, value});
+ T::keyvals_.emplace(*keyval, std::move(value));
T::keyval_id_++;
return MPI_SUCCESS;
}
template <typename T> int Keyval::keyval_free(int* keyval){
-/* 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 == nullptr) {
+ /* See MPI-1, 5.7.1. Freeing the keyval does not remove it if it is in use in an attribute */
+ auto elem_it = T::keyvals_.find(*keyval);
+ if (elem_it == T::keyvals_.end())
return MPI_ERR_ARG;
- }
- if(elem->refcount==1){
- T::keyvals_.erase(*keyval);
- delete elem;
- }else{
- elem->refcount--;
- }
+
+ smpi_key_elem& elem = elem_it->second;
+ elem.deleted = true;
+ if (elem.refcount == 0)
+ T::keyvals_.erase(elem_it);
*keyval = MPI_KEYVAL_INVALID;
return MPI_SUCCESS;
}
template <typename T> int Keyval::attr_delete(int keyval){
- smpi_key_elem elem = T::keyvals_.at(keyval);
- if(elem==nullptr)
+ auto elem_it = T::keyvals_.find(keyval);
+ if (elem_it == T::keyvals_.end())
return MPI_ERR_ARG;
- elem->refcount--;
- void * value = nullptr;
- int flag=0;
- if(this->attr_get<T>(keyval, &value, &flag)==MPI_SUCCESS){
- int ret = call_deleter<T>((T*)this, elem, keyval,value,&flag);
- if(ret!=MPI_SUCCESS)
- return ret;
- }
- if(attributes()->empty())
+
+ auto attr = attributes().find(keyval);
+ if (attr == attributes().end())
return MPI_ERR_ARG;
- attributes()->erase(keyval);
+
+ smpi_key_elem& elem = elem_it->second;
+ int flag = 0;
+ int ret = call_deleter<T>((T*)this, elem, keyval, attr->second, &flag);
+ if (ret != MPI_SUCCESS)
+ return ret;
+
+ elem.refcount--;
+ if (elem.deleted && elem.refcount == 0)
+ T::keyvals_.erase(elem_it);
+ attributes().erase(attr);
return MPI_SUCCESS;
}
template <typename T> int Keyval::attr_get(int keyval, void* attr_value, int* flag){
- const s_smpi_key_elem_t* elem = T::keyvals_.at(keyval);
- if(elem==nullptr)
+ auto elem_it = T::keyvals_.find(keyval);
+ if (elem_it == T::keyvals_.end() || elem_it->second.deleted)
return MPI_ERR_ARG;
- if(attributes()->empty()){
- *flag=0;
- return MPI_SUCCESS;
- }
- const auto& attribs = attributes();
- auto attr = attribs->find(keyval);
- if (attr != attribs->end()) {
+
+ auto attr = attributes().find(keyval);
+ if (attr != attributes().end()) {
*static_cast<void**>(attr_value) = attr->second;
*flag=1;
} else {
}
template <typename T> int Keyval::attr_put(int keyval, void* attr_value){
- smpi_key_elem elem = T::keyvals_.at(keyval);
- if(elem==nullptr)
+ auto elem_it = T::keyvals_.find(keyval);
+ if (elem_it == T::keyvals_.end() || elem_it->second.deleted)
return MPI_ERR_ARG;
- elem->refcount++;
+
+ smpi_key_elem& elem = elem_it->second;
int flag=0;
- auto p = attributes()->insert({keyval, attr_value});
- if (!p.second) {
+ auto p = attributes().emplace(keyval, attr_value);
+ if (p.second) {
+ elem.refcount++;
+ } else {
int ret = call_deleter<T>((T*)this, elem, keyval,p.first->second,&flag);
// overwrite previous value
p.first->second = attr_value;
}
template <typename T> void Keyval::cleanup_attr(){
- if (not attributes()->empty()) {
- int flag=0;
- for (auto const& it : attributes_) {
- auto elm = T::keyvals_.find(it.first);
- if (elm != T::keyvals_.end()) {
- smpi_key_elem elem = elm->second;
- if(elem != nullptr){
- call_deleter<T>((T*)this, elem, it.first,it.second,&flag);
- }
- } else {
- // already deleted, not a problem
- flag=0;
- }
- }
+ for (auto const& it : attributes()) {
+ auto elem_it = T::keyvals_.find(it.first);
+ xbt_assert(elem_it != T::keyvals_.end());
+ smpi_key_elem& elem = elem_it->second;
+ int flag = 0;
+ call_deleter<T>((T*)this, elem, it.first, it.second, &flag);
+ elem.refcount--;
+ if (elem.deleted && elem.refcount == 0)
+ T::keyvals_.erase(elem_it);
}
+ attributes().clear();
}
}
