Make HostL07 behave more like the regular Host

[simgrid.git] / src / surf / surf_interface.hpp

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 0ec897f..e3281ca 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -11,6 +11,8 @@
 #include <string>
 #include <vector>
 #include <memory>
+#include <utility>
+
 #include <boost/function.hpp>
 #include <boost/intrusive/list.hpp>
 #include "surf/trace_mgr.h"
@@ -23,15 +25,47 @@
 
 #ifdef LIBSIGC
 #include <sigc++/sigc++.h>
-#define surf_callback(arg1, ...)  sigc::signal<arg1,__VA_ARGS__>
-#define surf_callback_connect(callback, fun_ptr) callback.connect(sigc::ptr_fun(fun_ptr))
-#define surf_callback_emit(callback, ...) callback.emit(__VA_ARGS__)
+namespace simgrid {
+namespace surf {
+  // 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 T> XBT_ALWAYS_INLINE
+    void connect(T&& slot)
+    {
+      sig_.connect(std::forward<T>(slot));
+    }
+    template<class Res, class... Args> XBT_ALWAYS_INLINE
+    void connect(Res(*slot)(Args...))
+    {
+      sig_.connect(sigc::ptr_fun(slot));
+    }
+    template<class... Args>
+    R operator()(Args&&... args) const
+    {
+      return sig_.emit(std::forward<Args>(args)...);
+    }
+  };
+}
+}
 #else
 #include <boost/signals2.hpp>
-#define surf_callback(arg1, ...)  boost::signals2::signal<arg1(__VA_ARGS__)>
+namespace simgrid {
+namespace surf {
+  template<class T>
+  using signal = ::boost::signals2::signal<T>;
+}
+}
+#endif
+
+// Deprecated:
+#define surf_callback(arg1, ...)  ::simgrid::surf::signal<arg1(__VA_ARGS__)>
 #define surf_callback_connect(callback, fun_ptr) callback.connect(fun_ptr)
 #define surf_callback_emit(callback, ...) callback(__VA_ARGS__)
-#endif
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4251)
@@ -399,6 +433,9 @@ public:
    * @param constraint The lmm constraint associated to this Resource if it is part of a LMM component
    */
   Resource(Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint);
+
+  Resource(Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, e_surf_resource_state_t stateInit);
+
   /**
    * @brief Resource constructor
    *