#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
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,
XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_bandwidth;
XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency;
-
/*********
* Model *
*********/
class Model {
const char *p_name;
- 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 */
+ 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:
- xbt_swag_t p_modifiedSet;
+ ActionLmmListPtr p_modifiedSet;
lmm_system_t p_maxminSystem;
e_UM_t p_updateMechanism;
virtual ~Model();
const char *getName() {return p_name;}
- xbt_swag_t getReadyActionSet() {return p_readyActionSet;}
- xbt_swag_t getRunningActionSet() {return p_runningActionSet;}
- xbt_swag_t getFailedActionSet() {return p_failedActionSet;}
- xbt_swag_t getDoneActionSet() {return p_doneActionSet;}
- xbt_swag_t getModifiedSet() {return p_modifiedSet;}
+ 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;}
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);
public:
Resource();
- Resource(ModelPtr model, const char *name, xbt_dict_t properties);
- Resource(surf_model_t model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit);
+ 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*)p_name);
xbt_dict_free(&p_properties);
virtual e_surf_resource_state_t getState();
virtual void setState(e_surf_resource_state_t state);
-};
-class ResourceLmm: virtual public Resource {
+ /* LMM */
+private:
lmm_constraint_t p_constraint;
-
public:
- ResourceLmm();
- ResourceLmm(lmm_constraint_t constraint);
- ~ResourceLmm() {
- };
+ lmm_constraint_t getConstraint() {return p_constraint;};
- lmm_constraint_t constraint() {return p_constraint;};
};
/**********
* Action *
**********/
+void surf_action_lmm_update_index_heap(void *action, int i);
-class Action {
- xbt_swag_t p_modifiedSet;
+class Action : public actionHook, public actionLmmHook {
+ ActionLmmListPtr p_modifiedSet;
xbt_heap_t p_actionHeap;
int m_selectiveUpdate;
ModelPtr p_model;
void *p_data; /**< for your convenience */
protected:
- xbt_swag_t p_stateSet;
+ 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 */
Action();
Action(ModelPtr model, double cost, bool failed);
+ Action(ModelPtr model, double cost, bool failed, lmm_variable_t var);
virtual ~Action();
void finish();
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
-
double getPriority() {return m_priority;};
- xbt_swag_t getStateSet() {return p_stateSet;};
+ ActionListPtr getStateSet() {return p_stateSet;};
private:
int resourceUsed(void *resource_id);
void updateResourceState(void *id, tmgr_trace_event_t event_type,
double value, double time);
-
-};
-
-//FIXME:REMOVE
-void surf_action_lmm_update_index_heap(void *action, int i);
-
-class ActionLmm: virtual public Action {
-
+ /* LMM */
protected:
lmm_variable_t p_variable;
double m_lastUpdate;
enum heap_action_type m_hat;
public:
- ActionLmm() : m_suspended(false) {
- p_actionListHookup.prev = 0;
- p_actionListHookup.next = 0;
- m_lastUpdate = 0;
- m_lastValue = 0;
- };
- ActionLmm(lmm_variable_t var) : m_suspended(false) {
- p_actionListHookup.prev = 0;
- p_actionListHookup.next = 0;
- m_lastUpdate = 0;
- m_lastValue = 0;
- p_variable = var;
- };
-
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);
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;}
-
- virtual int unref();
- void cancel();
- void suspend();
- void resume();
- bool isSuspended();
- void setMaxDuration(double duration);
- void setPriority(double priority);
+ bool is_linked() {return actionLmmHook::is_linked();}
void gapRemove();
- s_xbt_swag_hookup_t p_actionListHookup;
-
};
#endif /* SURF_MODEL_H_ */
