A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove surf_routing.hpp
[simgrid.git]
/
src
/
surf
/
surf_interface.hpp
diff --git
a/src/surf/surf_interface.hpp
b/src/surf/surf_interface.hpp
index
c397b6b
..
a013167
100644
(file)
--- a/
src/surf/surf_interface.hpp
+++ b/
src/surf/surf_interface.hpp
@@
-7,6
+7,7
@@
#define SURF_MODEL_H_
#include <cstddef>
#define SURF_MODEL_H_
#include <cstddef>
+#include <string>
#include <xbt.h>
#include <memory>
#include <xbt.h>
#include <memory>
@@
-114,13
+115,6
@@
public:
not_in_the_system /**< Not in the system anymore. Why did you ask ? */
};
not_in_the_system /**< Not in the system anymore. Why did you ask ? */
};
-private:
- /**
- * @brief Common initializations for the constructors
- */
- void initialize(simgrid::surf::Model *model, double cost, bool failed,
- lmm_variable_t var = nullptr);
-
public:
/**
* @brief Action constructor
public:
/**
* @brief Action constructor
@@
-277,13
+271,6
@@
typedef boost::intrusive::member_hook<
typedef boost::intrusive::list<Action, ActionLmmOptions> ActionLmmList;
typedef ActionLmmList* ActionLmmListPtr;
typedef boost::intrusive::list<Action, ActionLmmOptions> ActionLmmList;
typedef ActionLmmList* ActionLmmListPtr;
-/********************
- * Helper functions *
- ********************/
-
-double shareResourcesMaxMin(ActionList* runningActions, lmm_system_t sys, void (*solve) (lmm_system_t));
-
-
/*********
* Model *
*********/
/*********
* Model *
*********/
@@
-330,9
+317,9
@@
public:
* @param now The current time of the simulation
* @return The delta of time till the next action will finish
*/
* @param now The current time of the simulation
* @return The delta of time till the next action will finish
*/
- virtual double next
_occuring_e
vent(double now);
- virtual double next
_occuring_event_l
azy(double now);
- virtual double next
_occuring_event_f
ull(double now);
+ virtual double next
OccuringE
vent(double now);
+ virtual double next
OccuringEventL
azy(double now);
+ virtual double next
OccuringEventF
ull(double now);
/**
* @brief Update action to the current time
/**
* @brief Update action to the current time
@@
-349,13
+336,13
@@
public:
* The only model that is not is NS3: computing the next timestamp moves the model up to that point,
* so we need to call it only when the next timestamp of other sources is computed.
*/
* The only model that is not is NS3: computing the next timestamp moves the model up to that point,
* so we need to call it only when the next timestamp of other sources is computed.
*/
- virtual bool next
_occuring_event_isIdempotent()=0;
+ virtual bool next
OccuringEventIsIdempotent() { return true;}
protected:
ActionLmmListPtr modifiedSet_;
lmm_system_t maxminSystem_ = nullptr;
e_UM_t updateMechanism_ = UM_UNDEFINED;
protected:
ActionLmmListPtr modifiedSet_;
lmm_system_t maxminSystem_ = nullptr;
e_UM_t updateMechanism_ = UM_UNDEFINED;
-
int
selectiveUpdate_;
+
bool
selectiveUpdate_;
xbt_heap_t actionHeap_;
private:
xbt_heap_t actionHeap_;
private:
@@
-390,14
+377,6
@@
namespace surf {
*/
XBT_PUBLIC_CLASS Resource {
public:
*/
XBT_PUBLIC_CLASS Resource {
public:
- /**
- * @brief Constructor of non-LMM Resources
- *
- * @param model Model associated to this Resource
- * @param name The name of the Resource
- */
- Resource(Model *model, const char *name);
-
/**
* @brief Constructor of LMM Resources
*
/**
* @brief Constructor of LMM Resources
*
@@
-438,7
+417,7
@@
public:
virtual void turnOff();
private:
virtual void turnOff();
private:
-
const char *
name_;
+
std::string
name_;
Model *model_;
bool isOn_ = true;
Model *model_;
bool isOn_ = true;
@@
-446,7
+425,7
@@
public: /* LMM */
/** @brief Get the lmm constraint associated to this Resource if it is part of a LMM component (or null if none) */
lmm_constraint_t getConstraint() const;
protected:
/** @brief Get the lmm constraint associated to this Resource if it is part of a LMM component (or null if none) */
lmm_constraint_t getConstraint() const;
protected:
- lmm_constraint_t constraint_ = nullptr;
+
const
lmm_constraint_t constraint_ = nullptr;
};
}
};
}