X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d648ebbbe5705878080b9cbf1ca61497323c592..1363ce9624f4327f3ad5c934b15736a776637dfd:/include/xbt/Extendable.hpp

diff --git a/include/xbt/Extendable.hpp b/include/xbt/Extendable.hpp
index 37a7d41c59..54adb3e65d 100644
--- a/include/xbt/Extendable.hpp
+++ b/include/xbt/Extendable.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2019. The SimGrid Team.
+/* Copyright (c) 2015-2023. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,23 +8,24 @@
 #define SIMGRID_XBT_LIB_HPP
 
 #include <cstddef>
+#include <functional>
 #include <limits>
+#include <memory>
 #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 {
-  static const std::size_t INVALID_ID = std::numeric_limits<std::size_t>::max();
-  std::size_t id_;
+  static constexpr std::size_t INVALID_ID = std::numeric_limits<std::size_t>::max();
+  std::size_t id_                         = INVALID_ID;
   friend class Extendable<T>;
   explicit constexpr Extension(std::size_t id) : id_(id) {}
 public:
-  explicit constexpr Extension() : id_(INVALID_ID) {}
+  explicit constexpr Extension() = default;
   std::size_t id() const { return id_; }
   bool valid() const { return id_ != INVALID_ID; }
 };
@@ -47,17 +48,16 @@ public:
 template<class T>
 class Extendable {
 private:
-  static std::vector<void(*)(void*)> deleters_;
-  std::vector<void*> extensions_;
+  static std::vector<std::function<void(void*)>> deleters_;
+  std::vector<void*> extensions_{deleters_.size(), nullptr};
+
 public:
-  static size_t extension_create(void (*deleter)(void*))
+  static size_t extension_create(const std::function<void(void*)>& deleter)
   {
-    std::size_t res = deleters_.size();
-    deleters_.push_back(deleter);
-    return res;
+    deleters_.emplace_back(deleter);
+    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));
   }
@@ -66,7 +66,7 @@ public:
   {
     return Extension<T, U>(extension_create([](void* p) { delete static_cast<U*>(p); }));
   }
-  Extendable() : extensions_(deleters_.size(), nullptr) {}
+  Extendable()                  = default;
   Extendable(const Extendable&) = delete;
   Extendable& operator=(const Extendable&) = delete;
   ~Extendable()
@@ -77,25 +77,22 @@ public:
      * an extension A, the subsystem of B might depend on the subsystem on A and
      * 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 > 0; --i)
-      if (extensions_[i - 1] != nullptr && deleters_[i - 1] != nullptr)
+    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])
         deleters_[i - 1](extensions_[i - 1]);
   }
 
   // Type-unsafe versions of the facet access methods:
   void* extension(std::size_t rank) const
   {
-    if (rank >= extensions_.size())
-      return nullptr;
-    else
-      return extensions_.at(rank);
+    return rank < extensions_.size() ? extensions_[rank] : nullptr;
   }
   void extension_set(std::size_t rank, void* value, bool use_dtor = true)
   {
     if (rank >= extensions_.size())
       extensions_.resize(rank + 1, nullptr);
     void* old_value = this->extension(rank);
-    extensions_.at(rank) = value;
+    extensions_[rank] = value;
     if (use_dtor && old_value != nullptr && deleters_[rank])
       deleters_[rank](old_value);
   }
@@ -107,14 +104,20 @@ public:
   {
     extension_set(rank.id(), value, use_dtor);
   }
+  // void* version, for C users and nostalgics
+  void set_data(void* data){
+    extensions_[0]=data;
+  }
+  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 a associated EXTENSION ID:
+  // 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 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