A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[smpi] Use a std::unique_ptr for f2c_lookup_.
[simgrid.git]
/
src
/
smpi
/
include
/
smpi_f2c.hpp
diff --git
a/src/smpi/include/smpi_f2c.hpp
b/src/smpi/include/smpi_f2c.hpp
index
97f3eb3
..
c839d1c
100644
(file)
--- a/
src/smpi/include/smpi_f2c.hpp
+++ b/
src/smpi/include/smpi_f2c.hpp
@@
-9,6
+9,7
@@
#ifndef SMPI_F2C_HPP_INCLUDED
#define SMPI_F2C_HPP_INCLUDED
#ifndef SMPI_F2C_HPP_INCLUDED
#define SMPI_F2C_HPP_INCLUDED
+#include <memory>
#include <unordered_map>
namespace simgrid{
#include <unordered_map>
namespace simgrid{
@@
-16,21
+17,26
@@
namespace smpi{
class F2C {
private:
class F2C {
private:
+ using f2c_lookup_type = std::unordered_map<unsigned int, F2C*>;
+
// We use a single lookup table for every type.
// Beware of collisions if id in mpif.h is not unique
// We use a single lookup table for every type.
// Beware of collisions if id in mpif.h is not unique
- static std::un
ordered_map<unsigned int, F2C*>*
f2c_lookup_;
+ static std::un
ique_ptr<f2c_lookup_type>
f2c_lookup_;
static int f2c_id_;
static int f2c_id_;
- static
std::unordered_map<unsigned int, F2C*>
::size_type num_default_handles_;
+ static
f2c_lookup_type
::size_type num_default_handles_;
int my_f2c_id_ = -1;
protected:
int my_f2c_id_ = -1;
protected:
- static void set_f2c_lookup(std::unordered_map<unsigned int, F2C*>* map) { f2c_lookup_ = map; }
+ static void allocate_lookup()
+ {
+ if (not f2c_lookup_)
+ f2c_lookup_ = std::make_unique<f2c_lookup_type>();
+ }
static int f2c_id() { return f2c_id_; }
static void f2c_id_increment() { f2c_id_++; }
public:
static int f2c_id() { return f2c_id_; }
static void f2c_id_increment() { f2c_id_++; }
public:
- static void delete_lookup() { delete f2c_lookup_; f2c_lookup_ = nullptr ;}
- static std::unordered_map<unsigned int, F2C*>* lookup() { return f2c_lookup_; }
+ static f2c_lookup_type* lookup() { return f2c_lookup_.get(); }
F2C();
virtual ~F2C() = default;
F2C();
virtual ~F2C() = default;
@@
-42,7
+48,7
@@
public:
// For the default one, the MPI_*_NULL returned is assumed to be NULL.
static F2C* f2c(int id);
static void finish_initialization() { num_default_handles_ = f2c_lookup_->size(); }
// For the default one, the MPI_*_NULL returned is assumed to be NULL.
static F2C* f2c(int id);
static void finish_initialization() { num_default_handles_ = f2c_lookup_->size(); }
- static
std::unordered_map<unsigned int, F2C*>::size_type get_num_default_handles() { return num_default_handles_;
}
+ static
f2c_lookup_type::size_type get_num_default_handles() { return num_default_handles_;
}
};
}
};
}