-/* 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>
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
};
namespace simgrid{
// 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 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)
{
smpi_key_elem value;
value.copy_fn = copy_fn;
value.delete_fn = delete_fn;
value.extra_state = extra_state;
- value.refcount = 1;
+ value.refcount = 0;
+ value.deleted = false;
+ value.delete_attr = delete_attr;
*keyval = T::keyval_id_;
T::keyvals_.emplace(*keyval, std::move(value));
return MPI_ERR_ARG;
smpi_key_elem& elem = elem_it->second;
- elem.refcount--;
+ elem.deleted = true;
if (elem.refcount == 0)
T::keyvals_.erase(elem_it);
*keyval = MPI_KEYVAL_INVALID;
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){
auto elem_it = T::keyvals_.find(keyval);
- if (elem_it == T::keyvals_.end())
+ if (elem_it == T::keyvals_.end() || elem_it->second.deleted)
return MPI_ERR_ARG;
auto attr = attributes().find(keyval);
template <typename T> int Keyval::attr_put(int keyval, void* attr_value){
auto elem_it = T::keyvals_.find(keyval);
- if (elem_it == T::keyvals_.end())
+ if (elem_it == T::keyvals_.end() || elem_it->second.deleted)
return MPI_ERR_ARG;
smpi_key_elem& elem = elem_it->second;
}
template <typename T> void Keyval::cleanup_attr(){
- int flag = 0;
for (auto const& it : attributes()) {
auto elem_it = T::keyvals_.find(it.first);
- if (elem_it != T::keyvals_.end()) {
- smpi_key_elem& elem = elem_it->second;
- call_deleter<T>((T*)this, elem, it.first, it.second, &flag);
- } else {
- // already deleted, not a problem
- flag = 0;
- }
+ 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();
}
}