Merge pull request #302 from mpoquet/rename-s4u-synchro-examples

[simgrid.git] / include / xbt / signal.hpp

diff --git a/include/xbt/signal.hpp b/include/xbt/signal.hpp
index 2068546..4c1d46d 100644 (file)
--- 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-2018. 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,47 +6,45 @@
 #ifndef SIMGRID_XBT_SIGNAL_HPP
 #define SIMGRID_XBT_SIGNAL_HPP
 
-#ifdef SIMGRID_HAVE_LIBSIG
-#include <sigc++/sigc++.h>
+#include <functional>
+#include <utility>
+#include <vector>
 
 namespace simgrid {
 namespace xbt {
-  // Wraps sigc++ signals with the interface of boost::signals2:
-  template<class T> class signal;
+
+  template<class S> class signal;
+
+  /** A signal/slot mechanism
+  *
+  *  S is expected to be the function signature of the signal.
+  *  I'm not sure we need a return value (it is currently ignored).
+  *  If we don't we might use `signal<P1, P2, ...>` instead.
+  */
   template<class R, class... P>
   class signal<R(P...)> {
   private:
-    sigc::signal<R, P...> sig_;
+    typedef std::function<R(P...)> callback_type;
+    std::vector<callback_type> handlers_;
   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...))
+    template<class U>
+    void connect(U slot)
     {
-      sig_.connect(sigc::ptr_fun(slot));
+      handlers_.push_back(std::move(slot));
     }
-    template<class... Args> XBT_ALWAYS_INLINE
-    R operator()(Args&&... args) const
+    R operator()(P... args) const
     {
-      return sig_.emit(std::forward<Args>(args)...);
+      for (auto const& handler : handlers_)
+        handler(args...);
     }
+    void disconnect_slots() { handlers_.clear(); }
+    int get_slot_count() { return handlers_.size(); }
+    // deprecated
+    XBT_ATTRIB_DEPRECATED_v323("Please use xbt::disconnect_slots)") void disconnectSlots() { disconnect_slots(); }
+    XBT_ATTRIB_DEPRECATED_v323("Please use xbt::get_slot_count)") int getSlotsAmount() { return get_slot_count(); }
   };
-}
-}
 
-#else
-
-#include <boost/signals2.hpp>
-namespace simgrid {
-namespace xbt {
-  template<class T>
-  using signal = ::boost::signals2::signal<T>;
 }
 }
 
 #endif
-
-#endif