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
less strdup/free
[simgrid.git]
/
src
/
surf
/
surf_interface.hpp
diff --git
a/src/surf/surf_interface.hpp
b/src/surf/surf_interface.hpp
index
6f99474
..
998d260
100644
(file)
--- a/
src/surf/surf_interface.hpp
+++ b/
src/surf/surf_interface.hpp
@@
-342,7
+342,7
@@
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_;
protected:
ActionLmmListPtr modifiedSet_;
@@
-383,14
+383,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
*
@@
-431,7
+423,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;
@@
-439,7
+431,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;
};
}
};
}