X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0fe1137efda109ff1a402ab5f8317d3ec3a676dc..7817355e1053db0ad176750462d290516dc993e3:/src/surf/surf_interface.hpp?ds=sidebyside

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 61bfdca0d6..e3281ca00c 100644
--- 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"
@@ -18,20 +20,52 @@
 #include "surf/surf_routing.h"
 #include "simgrid/platf_interface.h"
 #include "surf/surf.h"
-#include "surf/surf_private.h"
-#include "internal_config.h"
+#include "src/surf/surf_private.h"
+#include "src/internal_config.h"
 
 #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)
@@ -273,7 +307,7 @@ typedef ActionLmmList* ActionLmmListPtr;
 /*********
  * Model *
  *********/
-XBT_PUBLIC_DATA(xbt_dynar_t) model_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) all_existing_models;
 
 /** @ingroup SURF_interface
  * @brief SURF model interface class
@@ -281,74 +315,40 @@ XBT_PUBLIC_DATA(xbt_dynar_t) model_list;
  */
 XBT_PUBLIC_CLASS Model {
 public:
-  /** @brief Constructor */
   Model();
-  /** @brief Destructor */
   virtual ~Model();
 
   virtual void addTraces() =0;
 
-  /**
-   * @brief Get the set of [actions](@ref Action) in *ready* state
-   *
-   * @return The set of [actions](@ref Action) in *ready* state
-   */
+  /** @brief Get the set of [actions](@ref Action) in *ready* state */
   virtual ActionList* getReadyActionSet() {return p_readyActionSet;}
 
-  /**
-   * @brief Get the set of [actions](@ref Action) in *running* state
-   *
-   * @return The set of [actions](@ref Action) in *running* state
-   */
+  /** @brief Get the set of [actions](@ref Action) in *running* state */
   virtual ActionList* getRunningActionSet() {return p_runningActionSet;}
 
-  /**
-   * @brief Get the set of [actions](@ref Action) in *failed* state
-   *
-   * @return The set of [actions](@ref Action) in *failed* state
-   */
+  /** @brief Get the set of [actions](@ref Action) in *failed* state */
   virtual ActionList* getFailedActionSet() {return p_failedActionSet;}
 
-  /**
-   * @brief Get the set of [actions](@ref Action) in *done* state
-   *
-   * @return The set of [actions](@ref Action) in *done* state
-   */
+  /** @brief Get the set of [actions](@ref Action) in *done* state */
   virtual ActionList* getDoneActionSet() {return p_doneActionSet;}
 
-  /**
-   * @brief Get the set of modified [actions](@ref Action)
-   *
-   * @return The set of modified [actions](@ref Action)
-   */
+  /** @brief Get the set of modified [actions](@ref Action) */
   virtual ActionLmmListPtr getModifiedSet() {return p_modifiedSet;}
 
-  /**
-   * @brief Get the maxmin system of the current Model
-   *
-   * @return The maxmin system of the current Model
-   */
+  /** @brief Get the maxmin system of the current Model */
   lmm_system_t getMaxminSystem() {return p_maxminSystem;}
 
   /**
    * @brief Get the update mechanism of the current Model
    * @see e_UM_t
-   *
-   * @return [description]
    */
   e_UM_t getUpdateMechanism() {return p_updateMechanism;}
 
-  /**
-   * @brief Get Action heap
-   * @details [TODO]
-   *
-   * @return The Action heap
-   */
+  /** @brief Get Action heap */
   xbt_heap_t getActionHeap() {return p_actionHeap;}
 
   /**
-   * @brief share the resources
-   * @details Share the resources between the actions
+   * @brief Share the resources between the actions
    *
    * @param now The current time of the simulation
    * @return The delta of time till the next action will finish
@@ -361,8 +361,7 @@ public:
                                       void (*solve) (lmm_system_t));
 
   /**
-   * @brief Update state of actions
-   * @details Update action to the current time
+   * @brief Update action to the current time
    *
    * @param now The current time of the simulation
    * @param delta The delta of time since the last update
@@ -434,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
    *