X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd769219531a772284d75320187a0ef9f8118afd..609b277351c837356a7b284127eed888eca3620d:/include/xbt/signal.hpp

diff --git a/include/xbt/signal.hpp b/include/xbt/signal.hpp
index 714ae0d17d..ef4ec9cf35 100644
--- a/include/xbt/signal.hpp
+++ b/include/xbt/signal.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2021. 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. */
@@ -6,52 +6,45 @@
 #ifndef SIMGRID_XBT_SIGNAL_HPP
 #define SIMGRID_XBT_SIGNAL_HPP
 
-#if SIMGRID_HAVE_LIBSIG
-#include <sigc++/sigc++.h>
-#else
-#include <boost/signals2.hpp>
-#endif
+#include <functional>
+#include <map>
+#include <utility>
 
 namespace simgrid {
 namespace xbt {
 
-#if SIMGRID_HAVE_LIBSIG
-
-  // Wraps sigc++ signals with the interface of boost::signals2:
-  template<class T> class signal;
-  template<class R, class... P>
-  class signal<R(P...)> {
-  private:
-    sigc::signal<R, P...> sig_;
-  public:
-    template<class U> XBT_ALWAYS_INLINE
-    void connect(U&& slot)
-    {
-      sig_.connect(std::forward<U>(slot));
-    }
-    template<class Res, class... Args> XBT_ALWAYS_INLINE
-    void connect(Res(*slot)(Args...))
-    {
-      sig_.connect(sigc::ptr_fun(slot));
-    }
-    template<class... Args> XBT_ALWAYS_INLINE
-    R operator()(Args&&... args) const
-    {
-      return sig_.emit(std::forward<Args>(args)...);
-    }
-    void disconnect_all_slots()
-    {
-      sig_.clear();
-    }
-  };
-
-#else
-
-  template<class T>
-  using signal = ::boost::signals2::signal<T>;
-
-#endif
-
+template <class S> class signal;
+
+/** @brief
+ * A signal/slot mechanism, where you can attach callbacks to a given signal, and then fire the signal.
+ *
+ * The template parameter is the function signature of the signal (the return value currently ignored).
+ */
+template <class R, class... P> class signal<R(P...)> {
+  using callback_type = std::function<R(P...)>;
+  std::map<unsigned int, callback_type> handlers_;
+  unsigned int callback_sequence_id = 0;
+
+public:
+  /** Add a new callback to this signal */
+  template <class U> unsigned int connect(U slot)
+  {
+    handlers_.insert({callback_sequence_id, std::move(slot)});
+    return callback_sequence_id++;
+  }
+  /** Fire that signal, invoking all callbacks */
+  R operator()(P... args) const
+  {
+    for (auto const& handler : handlers_)
+      handler.second(args...);
+  }
+  /** Remove a callback */
+  void disconnect(unsigned int id) { handlers_.erase(id); }
+  /** Remove all callbacks */
+  void disconnect_slots() { handlers_.clear(); }
+  /** Get the amount of callbacks */
+  int get_slot_count() { return handlers_.size(); }
+};
 }
 }