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
Merge branch 'master' of framagit.org:simgrid/simgrid
[simgrid.git]
/
include
/
xbt
/
Extendable.hpp
diff --git
a/include/xbt/Extendable.hpp
b/include/xbt/Extendable.hpp
index 369e3a3462c345f9aaee402f338d4095452b6551..54adb3e65d5677ccb3c86b7b9a02d8d9d9f4d6fe 100644
(file)
--- a/
include/xbt/Extendable.hpp
+++ b/
include/xbt/Extendable.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2015-20
19
. The SimGrid Team.
+/* Copyright (c) 2015-20
23
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-8,11
+8,12
@@
#define SIMGRID_XBT_LIB_HPP
#include <cstddef>
#define SIMGRID_XBT_LIB_HPP
#include <cstddef>
+#include <functional>
#include <limits>
#include <limits>
+#include <memory>
#include <vector>
#include <vector>
-namespace simgrid {
-namespace xbt {
+namespace simgrid::xbt {
template<class T, class U> class Extension;
template<class T> class Extendable;
template<class T, class U> class Extension;
template<class T> class Extendable;
@@
-24,7
+25,7
@@
class Extension {
friend class Extendable<T>;
explicit constexpr Extension(std::size_t id) : id_(id) {}
public:
friend class Extendable<T>;
explicit constexpr Extension(std::size_t id) : id_(id) {}
public:
- explicit constexpr Extension()
{}
+ explicit constexpr Extension()
= default;
std::size_t id() const { return id_; }
bool valid() const { return id_ != INVALID_ID; }
};
std::size_t id() const { return id_; }
bool valid() const { return id_ != INVALID_ID; }
};
@@
-47,20
+48,16
@@
public:
template<class T>
class Extendable {
private:
template<class T>
class Extendable {
private:
- static std::vector<
void(*)(void*)
> deleters_;
- std::vector<void*> extensions_{
(deleters_.size() > 0 ? deleters_.size() : 1
), nullptr};
+ static std::vector<
std::function<void(void*)>
> deleters_;
+ std::vector<void*> extensions_{
deleters_.size(
), nullptr};
public:
public:
- static size_t extension_create(
void (*deleter)(void*)
)
+ static size_t extension_create(
const std::function<void(void*)>& deleter
)
{
{
- if (deleters_.empty()) { // Save space for void* user data
- deleters_.push_back(nullptr);
- }
- deleters_.push_back(deleter);
+ deleters_.emplace_back(deleter);
return deleters_.size() - 1;
}
return deleters_.size() - 1;
}
- template<class U>
- static Extension<T,U> extension_create(void (*deleter)(void*))
+ template <class U> static Extension<T, U> extension_create(const std::function<void(void*)>& deleter)
{
return Extension<T,U>(extension_create(deleter));
}
{
return Extension<T,U>(extension_create(deleter));
}
@@
-69,7
+66,7
@@
public:
{
return Extension<T, U>(extension_create([](void* p) { delete static_cast<U*>(p); }));
}
{
return Extension<T, U>(extension_create([](void* p) { delete static_cast<U*>(p); }));
}
- Extendable()
{}
+ Extendable()
= default;
Extendable(const Extendable&) = delete;
Extendable& operator=(const Extendable&) = delete;
~Extendable()
Extendable(const Extendable&) = delete;
Extendable& operator=(const Extendable&) = delete;
~Extendable()
@@
-81,7
+78,7
@@
public:
* an extension of B might need to have the extension of A around when executing
* its cleanup function/destructor. */
for (std::size_t i = extensions_.size(); i > 1; --i) // rank=0 is the spot of user's void*
* an extension of B might need to have the extension of A around when executing
* its cleanup function/destructor. */
for (std::size_t i = extensions_.size(); i > 1; --i) // rank=0 is the spot of user's void*
- if (extensions_[i - 1] != nullptr && deleters_[i - 1]
!= nullptr
)
+ if (extensions_[i - 1] != nullptr && deleters_[i - 1])
deleters_[i - 1](extensions_[i - 1]);
}
deleters_[i - 1](extensions_[i - 1]);
}
@@
-111,14
+108,16
@@
public:
void set_data(void* data){
extensions_[0]=data;
}
void set_data(void* data){
extensions_[0]=data;
}
- void* get_data() const { return extensions_[0]; }
- // Convenience extension access when the type has a associated EXTENSION ID:
+ template <typename D> D* get_data() const { return static_cast<D*>(extensions_[0]); }
+ template <typename D> std::unique_ptr<D> get_unique_data() { return std::unique_ptr<D>(get_data<D>()); }
+
+ // Convenience extension access when the type has an associated EXTENSION ID:
template <class U> U* extension() const { return extension<U>(U::EXTENSION_ID); }
template<class U> void extension_set(U* p) { extension_set<U>(U::EXTENSION_ID, p); }
};
template <class U> U* extension() const { return extension<U>(U::EXTENSION_ID); }
template<class U> void extension_set(U* p) { extension_set<U>(U::EXTENSION_ID, p); }
};
-template <class T> std::vector<void (*)(void*)> Extendable<T>::deleters_;
-}
-}
+// Initialized with a first element, to save space for void* user data
+template <class T> std::vector<std::function<void(void*)>> Extendable<T>::deleters_{1};
+}
// namespace simgrid::xbt
#endif
#endif