}
#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__)
-
-#ifdef _MSC_VER
-#pragma warning( disable : 4251)
-// 4251: needs to have dll-interface to be used by clients of class
-#endif
-
extern XBT_PRIVATE tmgr_history_t history;
#define NO_MAX_DURATION -1.0
-using namespace std;
-
/*********
* Utils *
*********/
extern XBT_PRIVATE double sg_sender_gap;
-extern XBT_PRIVATE surf_callback(void, void) surfExitCallbacks;
+namespace simgrid {
+namespace surf {
+
+extern XBT_PRIVATE simgrid::surf::signal<void(void)> surfExitCallbacks;
+
+}
+}
int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path);
/**********
* Action *
**********/
+
XBT_PRIVATE void surf_action_lmm_update_index_heap(void *action, int i);
+XBT_PUBLIC_DATA(xbt_dynar_t) all_existing_models;
+
+namespace simgrid {
+namespace surf {
+
/** @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)
/**
* @brief Common initializations for the constructors
*/
- void initialize(Model *model, double cost, bool failed,
+ void initialize(simgrid::surf::Model *model, double cost, bool failed,
lmm_variable_t var = NULL);
public:
* @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);
+ Action(simgrid::surf::Model *model, double cost, bool failed);
/**
* @brief Action constructor
* @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);
+ Action(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var);
/** @brief Destructor */
virtual ~Action();
s_xbt_swag_hookup_t p_stateHookup;
- Model *getModel() {return p_model;}
+ simgrid::surf::Model *getModel() {return p_model;}
protected:
ActionList* p_stateSet;
int m_latencyLimited; /**< Set to 1 if is limited by latency, 0 otherwise */
#endif
double m_cost;
- Model *p_model;
+ simgrid::surf::Model *p_model;
void *p_data; /**< for your convenience */
/* LMM */
lmm_variable_t p_variable;
double m_lastValue;
double m_lastUpdate;
- int m_suspended;
+ int m_suspended = 0;
int m_indexHeap;
enum heap_action_type m_hat;
};
/*********
* Model *
*********/
-XBT_PUBLIC_DATA(xbt_dynar_t) all_existing_models;
/** @ingroup SURF_interface
* @brief SURF model interface class
ActionList* p_doneActionSet; /**< Actions in state SURF_ACTION_DONE */
};
+}
+}
+
/************
* Resource *
************/
tmgr_trace_event_t event; /**< The associated trace event associated to the metric */
} s_surf_metric_t;
+namespace simgrid {
+namespace surf {
+
/** @ingroup SURF_interface
* @brief SURF resource interface class
* @details A resource represent an element of a component (e.g.: a link for the network)
*
* @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);
+ Resource(Model *model, const char *name);
/**
* @brief Constructor of LMM Resources
*
* @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);
+ Resource(Model *model, const char *name, lmm_constraint_t constraint);
- Resource(Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, e_surf_resource_state_t stateInit);
+ Resource(Model *model, const char *name, lmm_constraint_t constraint, e_surf_resource_state_t stateInit);
/**
* @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);
+ Resource(Model *model, const char *name, e_surf_resource_state_t stateInit);
virtual ~Resource();
/** @brief Get the name of the current Resource */
const char *getName();
- /** @brief Get the properties of the current Resource */
- virtual xbt_dict_t getProperties();
-
/**
* @brief Update the state of the current Resource
* @details [TODO]
private:
const char *p_name;
- xbt_dict_t p_properties;
Model *p_model;
bool m_running;
e_surf_resource_state_t m_stateCurrent;
public: /* LMM */
/** @brief Get the lmm constraint associated to this Resource if it is part of a LMM component */
lmm_constraint_t getConstraint();
-private:
+protected:
lmm_constraint_t p_constraint;
};
+}
+}
+
#endif /* SURF_MODEL_H_ */
