X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4871b54f42ce85370d6acdbcb7e42bf75a63b389..f99abf5a401827fc377d1fc7b5ec7a59c2a36de1:/src/surf/surf_interface.hpp

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 0e001a9e15..e9cda2590d 100644
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -9,12 +9,26 @@
 #include <iostream>
 #include <memory>
 #include <boost/function.hpp>
+#include <boost/intrusive/list.hpp>
 #include "surf/trace_mgr.h"
 #include "xbt/lib.h"
 #include "surf/surf_routing.h"
 #include "simgrid/platf_interface.h"
 #include "surf/surf.h"
 #include "surf/surf_private.h"
+#include "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__)
+#else
+#include <boost/signals2.hpp>
+#define surf_callback(arg1, ...)  boost::signals2::signal<arg1(__VA_ARGS__)>
+#define surf_callback_connect(callback, fun_ptr) callback.connect(fun_ptr)
+#define surf_callback_emit(callback, ...) callback(__VA_ARGS__)
+#endif
 
 extern tmgr_history_t history;
 #define NO_MAX_DURATION -1.0
@@ -44,13 +58,9 @@ extern int sg_gtnets_jitter_seed;
 #endif
 extern xbt_dynar_t surf_path;
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 XBT_PUBLIC(double) surf_get_clock(void);
-#ifdef __cplusplus
 }
-#endif
 
 extern double sg_sender_gap;
 XBT_PUBLIC(int)  SURF_CPU_LEVEL;    //Surf cpu level
@@ -71,8 +81,15 @@ typedef boost::function<void (ResourcePtr r)> ResourceCallback;
 typedef Action* ActionPtr;
 typedef boost::function<void (ActionPtr a)> ActionCallback;
 
-//class ActionLmm;
-typedef ActionLmm* ActionLmmPtr;
+typedef boost::intrusive::list<Action> ActionList;
+typedef ActionList* ActionListPtr;
+typedef boost::intrusive::list_base_hook<> actionHook;
+
+struct lmmTag;
+typedef boost::intrusive::list<Action, boost::intrusive::base_hook<boost::intrusive::list_base_hook<boost::intrusive::tag<lmmTag> > > > ActionLmmList;
+typedef ActionLmmList* ActionLmmListPtr;
+typedef boost::intrusive::list_base_hook<boost::intrusive::tag<lmmTag> > actionLmmHook;
+
 
 enum heap_action_type{
   LATENCY = 100,
@@ -92,31 +109,55 @@ XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_avail;
 XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_bandwidth; 
 XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency;
 
-
 /*********
  * Model *
  *********/
 XBT_PUBLIC_DATA(xbt_dynar_t) model_list;
 
 class Model {
+  const char *p_name;
+
+  ActionListPtr p_readyActionSet; /**< Actions in state SURF_ACTION_READY */
+  ActionListPtr p_runningActionSet; /**< Actions in state SURF_ACTION_RUNNING */
+  ActionListPtr p_failedActionSet; /**< Actions in state SURF_ACTION_FAILED */
+  ActionListPtr p_doneActionSet; /**< Actions in state SURF_ACTION_DONE */
+
+  ResourceCallback m_resOnCB, m_resOffCB;
+  ActionCallback m_actCancelCB, m_actSuspendCB, m_actResumeCB;
+
+protected:
+  ActionLmmListPtr p_modifiedSet;
+
+  lmm_system_t p_maxminSystem;
+  e_UM_t p_updateMechanism;
+  int m_selectiveUpdate;
+  xbt_heap_t p_actionHeap;
+
 public:
-  Model(string name);
+  Model(const char *name);
   virtual ~Model();
 
-  //ResourcePtr createResource(string name);
+  const char *getName() {return p_name;}
+  virtual ActionListPtr getReadyActionSet() {return p_readyActionSet;}
+  virtual ActionListPtr getRunningActionSet() {return p_runningActionSet;}
+  virtual ActionListPtr getFailedActionSet() {return p_failedActionSet;}
+  virtual ActionListPtr getDoneActionSet() {return p_doneActionSet;}
+  virtual ActionLmmListPtr getModifiedSet() {return p_modifiedSet;}
+  lmm_system_t getMaxminSystem() {return p_maxminSystem;}
+  e_UM_t getUpdateMechanism() {return p_updateMechanism;}
+  xbt_heap_t getActionHeap() {return p_actionHeap;}
+
   ActionPtr createAction(double _cost, bool _failed);
   virtual double shareResources(double now);
   virtual double shareResourcesLazy(double now);
   virtual double shareResourcesFull(double now);
-  double shareResourcesMaxMin(xbt_swag_t running_actions,
+  double shareResourcesMaxMin(ActionListPtr running_actions,
                                       lmm_system_t sys,
                                       void (*solve) (lmm_system_t));
   virtual void updateActionsState(double now, double delta);
   virtual void updateActionsStateLazy(double now, double delta);
   virtual void updateActionsStateFull(double now, double delta);
 
-  string getName() {return m_name;};
-
   void addTurnedOnCallback(ResourceCallback rc);
   void notifyResourceTurnedOn(ResourcePtr r);
 
@@ -129,25 +170,6 @@ public:
   void notifyActionResume(ActionPtr a);
   void addActionSuspendCallback(ActionCallback ac);  
   void notifyActionSuspend(ActionPtr a);
-
-  lmm_system_t p_maxminSystem;
-  e_UM_t p_updateMechanism;
-  xbt_swag_t p_modifiedSet;
-  xbt_heap_t p_actionHeap;
-  int m_selectiveUpdate;
-
-  xbt_swag_t p_readyActionSet; /**< Actions in state SURF_ACTION_READY */
-  xbt_swag_t p_runningActionSet; /**< Actions in state SURF_ACTION_RUNNING */
-  xbt_swag_t p_failedActionSet; /**< Actions in state SURF_ACTION_FAILED */
-  xbt_swag_t p_doneActionSet; /**< Actions in state SURF_ACTION_DONE */
-  string m_name;
-
-protected:
-  std::vector<ActionPtr> m_failedActions, m_runningActions;
-
-private:
-  ResourceCallback m_resOnCB, m_resOffCB;
-  ActionCallback m_actCancelCB, m_actSuspendCB, m_actResumeCB;
 };
 
 /************
@@ -164,120 +186,130 @@ typedef struct {
 } s_surf_metric_t;
 
 class Resource {
+  void *p_resource;
+  const char *p_name;
+  ModelPtr p_model;
+  xbt_dict_t p_properties;
+  bool m_running;
+
+protected:
+  e_surf_resource_state_t m_stateCurrent;
+
 public:
   Resource();
-  Resource(ModelPtr model, const char *name, xbt_dict_t properties);
+  Resource(ModelPtr model, const char *name, xbt_dict_t props);
+  Resource(ModelPtr model, const char *name, xbt_dict_t props, lmm_constraint_t constraint);
+  Resource(ModelPtr model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit);
+  Resource(ModelPtr model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit, lmm_constraint_t constraint);
+
   virtual ~Resource() {
-	xbt_free((void*)m_name);
-    xbt_dict_free(&m_properties);
+	xbt_free((void*)p_name);
+    xbt_dict_free(&p_properties);
   };
 
-  virtual void updateState(tmgr_trace_event_t event_type, double value, double date)=0;
+  ModelPtr getModel() {return p_model;};
+  const char *getName() {return p_name;};
+  virtual xbt_dict_t getProperties() {return p_properties;};
 
-  //private
+  virtual void updateState(tmgr_trace_event_t event_type, double value, double date)=0;
   virtual bool isUsed()=0;
-  //FIXME:updateActionState();
-  //FIXME:updateResourceState();
-  //FIXME:finilize();
-
   bool isOn();
   void turnOn();
   void turnOff();
   void setName(string name);
-  const char *getName();
-  virtual xbt_dict_t getProperties();
 
-  ModelPtr getModel() {return p_model;};
   virtual e_surf_resource_state_t getState();
   virtual void setState(e_surf_resource_state_t state);
-  void printModel() { std::cout << p_model->getName() << "<<plop"<<std::endl;};
-  void *p_resource;
-  const char *m_name;
-  xbt_dict_t m_properties;
-  ModelPtr p_model;
-  e_surf_resource_state_t p_stateCurrent;
-
-protected:
 
+  /* LMM */
 private:
-  bool m_running;  
-};
-
-class ResourceLmm: virtual public Resource {
-public:
-  ResourceLmm() : p_constraint(NULL) {
-	p_power.event = NULL;
-  };
-  ResourceLmm(lmm_system_t system,
-              double constraint_value,
-              tmgr_history_t history,
-              e_surf_resource_state_t state_init,
-              tmgr_trace_t state_trace,
-              double metric_peak,
-              tmgr_trace_t metric_trace);
-  ~ResourceLmm() {
-  };
   lmm_constraint_t p_constraint;
-  tmgr_trace_event_t p_stateEvent;
-  s_surf_metric_t p_power;
+public:
+  lmm_constraint_t getConstraint() {return p_constraint;};
+
 };
 
 /**********
  * Action *
  **********/
+void surf_action_lmm_update_index_heap(void *action, int i);
+
+class Action : public actionHook, public actionLmmHook {
+  ActionLmmListPtr p_modifiedSet;
+  xbt_heap_t p_actionHeap;
+  int m_selectiveUpdate;
+  ModelPtr p_model;
+  double m_bound;   /**< the capping of the CPU use  */
+  bool m_failed;
+  double m_start; /**< start time  */
+  char *p_category;               /**< tracing category for categorized resource utilization monitoring */
+
+  #ifdef HAVE_LATENCY_BOUND_TRACKING
+  int m_latencyLimited;               /**< Set to 1 if is limited by latency, 0 otherwise */
+  #endif
+  int    m_cost;
+  void *p_data; /**< for your convenience */
+
+protected:
+  ActionListPtr p_stateSet;
+  double m_priority; /**< priority (1.0 by default) */
+  int    m_refcount;
+  double m_remains; /**< How much of that cost remains to be done in the currently running task */
+  double m_maxDuration; /*< max_duration (may fluctuate until the task is completed) */
+  double m_finish; /**< finish time : this is modified during the run and fluctuates until the task is completed */
+
+  ModelPtr getModel() {return p_model;}
 
-class Action {
 public:
+
   Action();
   Action(ModelPtr model, double cost, bool failed);
+  Action(ModelPtr model, double cost, bool failed, lmm_variable_t var);
   virtual ~Action();
   
+  void finish();
   s_xbt_swag_hookup_t p_stateHookup;
 
   e_surf_action_state_t getState(); /**< get the state*/
   virtual void setState(e_surf_action_state_t state); /**< Change state*/
+  double getBound() {return m_bound;}
   double getStartTime(); /**< Return the start time of an action */
   double getFinishTime(); /**< Return the finish time of an action */
+  void *getData() {return p_data;}
   void setData(void* data);
+  double getMaxDuration() {return m_maxDuration;}
+  char *getCategory() {return p_category;}
+  double getCost() {return m_cost;}
+  void setCost(double cost) {m_cost = cost;}
+
+  void updateMaxDuration(double delta) {double_update(&m_maxDuration, delta);}
+  void updateRemains(double delta) {double_update(&m_remains, delta);}
+  void setRemains(double value) {m_remains = value;}
+  void setFinishTime(double value) {m_finish = value;}
+
 
   void ref();
   virtual int unref();     /**< Specify that we don't use that action anymore. Returns true if the action was destroyed and false if someone still has references on it. */
   virtual void cancel();     /**< Cancel a running action */
-  virtual void recycle();     /**< Recycle an action */
+  virtual void recycle(){};     /**< Recycle an action */
   
-  virtual void suspend()=0;     /**< Suspend an action */
-  virtual void resume()=0;     /**< Resume a suspended action */
-  virtual bool isSuspended()=0;     /**< Return whether an action is suspended */
-  virtual void setMaxDuration(double duration)=0;     /**< Set the max duration of an action*/
-  virtual void setPriority(double priority)=0;     /**< Set the priority of an action */
+  virtual void suspend();     /**< Suspend an action */
+  virtual void resume();     /**< Resume a suspended action */
+  virtual bool isSuspended();     /**< Return whether an action is suspended */
+  virtual void setMaxDuration(double duration);     /**< Set the max duration of an action*/
+  virtual void setPriority(double priority);     /**< Set the priority of an action */
 #ifdef HAVE_TRACING
   void setCategory(const char *category); /**< Set the category of an action */
 #endif
   virtual double getRemains();     /**< Get the remains of an action */
+  double getRemainsNoUpdate();
+
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   int getLatencyLimited();     /**< Return 1 if action is limited by latency, 0 otherwise */
 #endif
 
-  xbt_swag_t p_stateSet;
-
-  double m_priority; /**< priority (1.0 by default) */
-  double m_bound;              /**< the capping of the CPU use  */
-  bool m_failed;
-  double m_start; /**< start time  */
-  double m_finish; /**< finish time : this is modified during the run and fluctuates until the task is completed */
-  double m_remains; /**< How much of that cost remains to be done in the currently running task */
-  #ifdef HAVE_LATENCY_BOUND_TRACKING
-  int m_latencyLimited;               /**< Set to 1 if is limited by latency, 0 otherwise */
-  #endif
-  double m_maxDuration; /*< max_duration (may fluctuate until the task is completed) */  
-  char *p_category;               /**< tracing category for categorized resource utilization monitoring */  
-  int    m_cost;
-  void *p_data; /**< for your convenience */
-protected:
-  ModelPtr p_model;  
-  int    m_refcount;
-#ifdef HAVE_TRACING
-#endif
+  double getPriority() {return m_priority;};
+  ActionListPtr getStateSet() {return p_stateSet;};
 
 private:
   int resourceUsed(void *resource_id);
@@ -289,51 +321,26 @@ private:
   void updateResourceState(void *id, tmgr_trace_event_t event_type,
                                  double value, double time);
 
-  xbt_swag_t p_modifiedSet;
-  xbt_heap_t p_actionHeap;
-  int m_selectiveUpdate;
-};
-
-//FIXME:REMOVE
-void surf_action_lmm_update_index_heap(void *action, int i);
+  /* LMM */
+protected:
+  lmm_variable_t p_variable;
+  double m_lastUpdate;
+  double m_lastValue;
+  int m_suspended;
+  int m_indexHeap;
+  enum heap_action_type m_hat;
 
-class ActionLmm: virtual public Action {
 public:
-  ActionLmm() : m_suspended(false) {
-	p_actionListHookup.prev = 0;
-	p_actionListHookup.next = 0;
-        m_lastUpdate = 0;
-        m_lastValue = 0;
-  };
-  ActionLmm(ModelPtr /*model*/, double /*cost*/, bool /*failed*/) : m_suspended(false) {
-	p_actionListHookup.prev = 0;
-	p_actionListHookup.next = 0;
-        m_lastUpdate = 0;
-        m_lastValue = 0;
-  };
-
   virtual void updateRemainingLazy(double now);
   void heapInsert(xbt_heap_t heap, double key, enum heap_action_type hat);
   void heapRemove(xbt_heap_t heap);
-  double getRemains();     /**< Get the remains of an action */
   void updateIndexHeap(int i);
-
-  virtual int unref();
-  void cancel();
-  void suspend();
-  void resume();
-  bool isSuspended();
-  void setMaxDuration(double duration);
-  void setPriority(double priority);
+  lmm_variable_t getVariable() {return p_variable;}
+  double getLastUpdate() {return m_lastUpdate;}
+  void refreshLastUpdate() {m_lastUpdate = surf_get_clock();}
+  enum heap_action_type getHat() {return m_hat;}
+  bool is_linked() {return actionLmmHook::is_linked();}
   void gapRemove();
-
-  lmm_variable_t p_variable;
-  s_xbt_swag_hookup_t p_actionListHookup;
-  int m_indexHeap;
-  double m_lastUpdate;
-  double m_lastValue;
-  enum heap_action_type m_hat;
-  int m_suspended;
 };
 
 #endif /* SURF_MODEL_H_ */