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

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index b28e1c0aa3..f243cac497 100644
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -1,4 +1,8 @@
-//using namespace generic;
+/* Copyright (c) 2004-2014. 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. */
 
 #ifndef SURF_MODEL_H_
 #define SURF_MODEL_H_
@@ -6,27 +10,34 @@
 #include <xbt.h>
 #include <string>
 #include <vector>
-#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
 
 using namespace std;
 
-/** \ingroup SURF_simulation
- *  \brief Return the current time
- *
- *  Return the current time in millisecond.
- */
-
 /*********
  * Utils *
  *********/
@@ -49,26 +60,23 @@ XBT_PUBLIC(double) surf_get_clock(void);
 }
 
 extern double sg_sender_gap;
-XBT_PUBLIC(int)  SURF_CPU_LEVEL;    //Surf cpu level
+
+extern surf_callback(void, void) surfExitCallbacks;
 
 int __surf_is_absolute_file_path(const char *file_path);
 
 /***********
  * Classes *
  ***********/
-//class Model;
-typedef Model* ModelPtr;
+typedef boost::intrusive::list<Action> ActionList;
+typedef ActionList* ActionListPtr;
+typedef boost::intrusive::list_base_hook<> actionHook;
 
-//class Resource;
-typedef Resource* ResourcePtr;
-typedef boost::function<void (ResourcePtr r)> ResourceCallback;
-			
-//class Action;
-typedef Action* ActionPtr;
-typedef boost::function<void (ActionPtr a)> ActionCallback;
+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;
 
-//class ActionLmm;
-typedef ActionLmm* ActionLmmPtr;
 
 enum heap_action_type{
   LATENCY = 100,
@@ -84,252 +92,460 @@ enum heap_action_type{
 XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list;
 XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_avail;
 XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_power;
-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_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 {
+/** @ingroup SURF_interface
+ * @brief SURF model interface class
+ * @details A model is an object which handle the interactions between its Resources and its Actions
+ */
+XBT_PUBLIC_CLASS Model {
 public:
-  Model(string name);
+  /**
+   * @brief Model constructor
+   *
+   * @param name the name of the model
+   */
+  Model(const char *name);
+
+  /**
+   * @brief Model destructor
+   */
   virtual ~Model();
 
-  //ResourcePtr createResource(string name);
-  ActionPtr createAction(double _cost, bool _failed);
+  virtual void addTraces() =0;
+
+  /**
+   * @brief Get the name of the current Model
+   *
+   * @return The name of the current Model
+   */
+  const char *getName() {return p_name;}
+
+  /**
+   * @brief Get the set of [actions](@ref Action) in *ready* state
+   *
+   * @return The set of [actions](@ref Action) in *ready* state
+   */
+  virtual ActionListPtr 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
+   */
+  virtual ActionListPtr 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
+   */
+  virtual ActionListPtr 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
+   */
+  virtual ActionListPtr getDoneActionSet() {return p_doneActionSet;}
+
+  /**
+   * @brief Get the set of modified [actions](@ref Action)
+   *
+   * @return 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
+   */
+  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
+   */
+  xbt_heap_t getActionHeap() {return p_actionHeap;}
+
+  /**
+   * @brief share the resources
+   * @details 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
+   */
   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));
+
+  /**
+   * @brief Update state of actions
+   * @details Update action to the current time
+   *
+   * @param now The current time of the simulation
+   * @param delta The delta of time since the last update
+   */
   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);
-
-  void addTurnedOffCallback(ResourceCallback rc);  
-  void notifyResourceTurnedOff(ResourcePtr r);
-
-  void addActionCancelCallback(ActionCallback ac);
-  void notifyActionCancel(ActionPtr a);
-  void addActionResumeCallback(ActionCallback ac);
-  void notifyActionResume(ActionPtr a);
-  void addActionSuspendCallback(ActionCallback ac);  
-  void notifyActionSuspend(ActionPtr a);
-
+protected:
+  ActionLmmListPtr p_modifiedSet;
   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;
+  xbt_heap_t p_actionHeap;
 
 private:
-  ResourceCallback m_resOnCB, m_resOffCB;
-  ActionCallback m_actCancelCB, m_actSuspendCB, m_actResumeCB;
+  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 */
 };
 
 /************
  * Resource *
  ************/
 
-/**
- * Resource which have a metric handled by a maxmin system
+/** @ingroup SURF_interface
+ * @brief Resource which have a metric handled by a maxmin system
  */
 typedef struct {
-  double scale;
-  double peak;
-  tmgr_trace_event_t event;
+  double scale;             /**< The scale of the metric */
+  double peak;              /**< The peak of the metric */
+  tmgr_trace_event_t event; /**< The associated trace event associated to the metric */
 } s_surf_metric_t;
 
-class Resource {
+/** @ingroup SURF_interface
+ * @brief SURF resource interface class
+ * @details A resource represent an element of a component (e.g.: a link for the network)
+ */
+XBT_PUBLIC_CLASS Resource {
 public:
+  /**
+   * @brief Resource constructor
+   */
   Resource();
-  Resource(ModelPtr model, const char *name, xbt_dict_t properties);
-  virtual ~Resource() {
-	xbt_free((void*)m_name);
-    xbt_dict_free(&m_properties);
-  };
 
+  /**
+   * @brief Resource constructor
+   *
+   * @param model Model associated to this Resource
+   * @param name The name of the Resource
+   * @param props Dictionary of properties associated to this Resource
+   */
+  Resource(Model *model, const char *name, xbt_dict_t props);
+
+  /**
+   * @brief Resource constructor
+   *
+   * @param model Model associated to this Resource
+   * @param name The name of the Resource
+   * @param props Dictionary of properties associated to this Resource
+   * @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);
+  /**
+   * @brief Resource constructor
+   *
+   * @param model Model associated to this Resource
+   * @param name The name of the Resource
+   * @param props Dictionary of properties associated to this Resource
+   * @param stateInit the initial state of the Resource
+   */
+  Resource(Model *model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit);
+
+  /**
+   * @brief Resource destructor
+   */
+  virtual ~Resource();
+
+  /**
+   * @brief Get the Model of the current Resource
+   *
+   * @return The Model of the current Resource
+   */
+  Model *getModel();
+
+  /**
+   * @brief Get the name of the current Resource
+   *
+   * @return The name of the current Resource
+   */
+  const char *getName();
+
+  /**
+   * @brief Get the properties of the current Resource
+   *
+   * @return The properties of the current Resource
+   */
+  virtual xbt_dict_t getProperties();
+
+  /**
+   * @brief Update the state of the current Resource
+   * @details [TODO]
+   *
+   * @param event_type [TODO]
+   * @param value [TODO]
+   * @param date [TODO]
+   */
   virtual void updateState(tmgr_trace_event_t event_type, double value, double date)=0;
 
-  //private
+  /**
+   * @brief Check if the current Resource is used
+   * @return true if the current Resource is used, false otherwise
+   */
   virtual bool isUsed()=0;
-  //FIXME:updateActionState();
-  //FIXME:updateResourceState();
-  //FIXME:finilize();
 
+  /**
+   * @brief Check if the current Resource is active
+   *
+   * @return true if the current Resource is active, false otherwise
+   */
   bool isOn();
+
+  /**
+   * @brief Turn on the current Resource
+   */
   void turnOn();
+
+  /**
+   * @brief Turn off the current Resource
+   */
   void turnOff();
-  void setName(string name);
-  const char *getName();
-  virtual xbt_dict_t getProperties();
 
-  ModelPtr getModel() {return p_model;};
+  /**
+   * @brief Get the [state](\ref e_surf_resource_state_t) of the current Resource
+   *
+   * @return The state of the currenrt Resource
+   */
   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:
+  /**
+   * @brief Set the [state](\ref e_surf_resource_state_t) of the current Resource
+   *
+   * @param state The new state of the current Resource
+   */
+  virtual void setState(e_surf_resource_state_t state);
 
 private:
-  bool m_running;  
-};
+  const char *p_name;
+  xbt_dict_t p_properties;
+  Model *p_model;
+  bool m_running;
+  e_surf_resource_state_t m_stateCurrent;
 
-class ResourceLmm: virtual public Resource {
+  /* LMM */
 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() {
-  };
+  /**
+   * @brief Get the lmm constraint associated to this Resource if it is part of a LMM component
+   *
+   * @return The lmm constraint associated to this Resource
+   */
+  lmm_constraint_t getConstraint();
+private:
   lmm_constraint_t p_constraint;
-  tmgr_trace_event_t p_stateEvent;
-  s_surf_metric_t p_power;
 };
 
 /**********
  * Action *
  **********/
+void surf_action_lmm_update_index_heap(void *action, int i);
+
+/** @ingroup SURF_interface
+ * @brief SURF action interface class
+ * @details An action is an event generated by a resource (e.g.: a communication for the network)
+ */
+XBT_PUBLIC_CLASS Action : public actionHook, public actionLmmHook {
+private:
+  /**
+   * @brief Common initializations for the constructors
+   */
+  void initialize(Model *model, double cost, bool failed,
+                  lmm_variable_t var = NULL);
 
-class Action {
 public:
-  Action();
-  Action(ModelPtr model, double cost, bool failed);
+  /**
+   * @brief Action constructor
+   *
+   * @param model The Model associated to this Action
+   * @param cost The cost of the Action
+   * @param failed If the action is impossible (e.g.: execute something on a switched off host)
+   */
+  Action(Model *model, double cost, bool failed);
+
+  /**
+   * @brief Action constructor
+   *
+   * @param model The Model associated to this Action
+   * @param cost The cost of the Action
+   * @param failed If the action is impossible (e.g.: execute something on a switched off host)
+   * @param var The lmm variable associated to this Action if it is part of a LMM component
+   */
+  Action(Model *model, double cost, bool failed, lmm_variable_t var);
+
+  /** @brief Destructor */
   virtual ~Action();
-  
-  s_xbt_swag_hookup_t p_stateHookup;
 
+  /** @brief Mark that the action is now finished */
+  void finish();
+
+  /** @brief Get the [state](\ref e_surf_action_state_t) of the current Action */
   e_surf_action_state_t getState(); /**< get the state*/
-  virtual void setState(e_surf_action_state_t state); /**< Change state*/
-  double getStartTime(); /**< Return the start time of an action */
-  double getFinishTime(); /**< Return the finish time of an action */
+  /** @brief Set the [state](\ref e_surf_action_state_t) of the current Action */
+  virtual void setState(e_surf_action_state_t state);
+
+  /** @brief Get the bound of the current Action */
+  double getBound();
+  /** @brief Set the bound of the current Action */
+  void setBound(double bound);
+
+  /** @brief Get the start time of the current action */
+  double getStartTime();
+  /** @brief Get the finish time of the current action */
+  double getFinishTime();
+
+  /** @brief Get the user data associated to the current action */
+  void *getData() {return p_data;}
+  /** @brief Set the user data associated to the current action */
   void setData(void* data);
 
+  /** @brief Get the cost of the current action */
+  double getCost() {return m_cost;}
+  /** @brief Set the cost of the current action */
+  void setCost(double cost) {m_cost = cost;}
+
+  /** @brief Update the maximum duration of the current action
+   *  @param delta Amount to remove from the MaxDuration */
+  void updateMaxDuration(double delta) {double_update(&m_maxDuration, delta,sg_surf_precision);}
+
+  /** @brief Update the remaining time of the current action
+   *  @param delta Amount to remove from the remaining time */
+  void updateRemains(double delta) {double_update(&m_remains, delta, sg_maxmin_precision*sg_surf_precision);}
+
+  /** @brief Set the remaining time of the current action */
+  void setRemains(double value) {m_remains = value;}
+  /** @brief Get the remaining time of the current action after updating the resource */
+  virtual double getRemains();
+  /** @brief Get the remaining time of the current action without updating the resource */
+  double getRemainsNoUpdate();
+
+  /** @brief Set the finish time of the current action */
+  void setFinishTime(double value) {m_finish = value;}
+
+  /**@brief Add a reference to the current action (refcounting) */
   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 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 */
-#ifdef HAVE_TRACING
-  void setCategory(const char *category); /**< Set the category of an action */
-#endif
-  virtual double getRemains();     /**< Get the remains of an action */
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-  int getLatencyLimited();     /**< Return 1 if action is limited by latency, 0 otherwise */
-#endif
+  /** @brief Unref that action (and destroy it if refcount reaches 0)
+   *  @return true if the action was destroyed and false if someone still has references on it
+   */
+  virtual int unref();
+
+  /** @brief Cancel the current Action if running */
+  virtual void cancel();
+
+  /** @brief Recycle an Action */
+  virtual void recycle(){};
+
+  /** @brief Suspend the current Action */
+  virtual void suspend();
+
+  /** @brief Resume the current Action */
+  virtual void resume();
+
+  /** @brief Returns true if the current action is running */
+  virtual bool isSuspended();
+
+  /** @brief Get the maximum duration of the current action */
+  double getMaxDuration() {return m_maxDuration;}
+  /** @brief Set the maximum duration of the current Action */
+  virtual void setMaxDuration(double duration);
+
+  /** @brief Get the tracing category associated to the current action */
+  char *getCategory() {return p_category;}
+  /** @brief Set the tracing category of the current Action */
+  void setCategory(const char *category);
+
+  /** @brief Get the priority of the current Action */
+  double getPriority() {return m_priority;};
+  /** @brief Set the priority of the current Action */
+  virtual void setPriority(double priority);
 
-  xbt_swag_t p_stateSet;
+  /**
+   * @brief Get the state set in which the action is
+   *
+   * @return The state set in which the action is
+   */
+  ActionListPtr getStateSet() {return p_stateSet;};
 
+  s_xbt_swag_hookup_t p_stateHookup;
+
+  Model *getModel() {return p_model;}
+
+protected:
+  ActionListPtr p_stateSet;
   double m_priority; /**< priority (1.0 by default) */
-  double m_bound;              /**< the capping of the CPU use  */
+  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 */
+
+private:
   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 */
+  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
-  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;
+  double    m_cost;
+  Model *p_model;
   void *p_data; /**< for your convenience */
-protected:
-  ModelPtr p_model;  
-  int    m_refcount;
-#ifdef HAVE_TRACING
-#endif
-
-private:
-  int resourceUsed(void *resource_id);
-  /* Share the resources to the actions and return in how much time
-     the next action may terminate */
-  double shareResources(double now);
-  /* Update the actions' state */
-  void updateActionsState(double now, double delta);
-  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);
 
-class ActionLmm: virtual public Action {
+  /* LMM */
 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 heapUpdate(xbt_heap_t heap, double key, enum heap_action_type hat);
   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();
 
+protected:
   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;
+  double m_lastUpdate;
   int m_suspended;
+  int m_indexHeap;
+  enum heap_action_type m_hat;
 };
 
 #endif /* SURF_MODEL_H_ */