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
change simgrid::surf::Resource into simgrid::kernel::model::Resource
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
3549820
..
d887e1f
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-337,7
+337,6
@@
void surf_exit()
delete model;
delete all_existing_models;
delete model;
delete all_existing_models;
- simgrid::surf::surfExitCallbacks();
if (future_evt_set) {
delete future_evt_set;
if (future_evt_set) {
delete future_evt_set;
@@
-517,9
+516,10
@@
void Model::updateActionsStateFull(double /*now*/, double /*delta*/)
************/
namespace simgrid {
************/
namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace model {
-Resource::Resource(
Model* model, const std::string& name, lmm_constraint_t
constraint)
+Resource::Resource(
surf::Model* model, const std::string& name, lmm::Constraint*
constraint)
: name_(name), model_(model), constraint_(constraint)
{}
: name_(name), model_(model), constraint_(constraint)
{}
@@
-547,7
+547,7
@@
double Resource::getLoad()
return constraint_->get_usage();
}
return constraint_->get_usage();
}
-Model* Resource::model() const
+
surf::
Model* Resource::model() const
{
return model_;
}
{
return model_;
}
@@
-566,12
+566,13
@@
bool Resource::operator==(const Resource &other) const {
return name_ == other.name_;
}
return name_ == other.name_;
}
-
lmm_constraint_t
Resource::constraint() const
+
kernel::lmm::Constraint*
Resource::constraint() const
{
{
- return const
raint_
;
+ return const
_cast<kernel::lmm::Constraint*>(constraint_)
;
}
}
}
}
+} // namespace kernel
}
/**********
}
/**********
@@
-585,7
+586,7
@@
Action::Action(simgrid::surf::Model* model, double cost, bool failed) : Action(m
{
}
{
}
-Action::Action(simgrid::surf::Model* model, double cost, bool failed,
lmm_variable_t
var)
+Action::Action(simgrid::surf::Model* model, double cost, bool failed,
kernel::lmm::Variable*
var)
: remains_(cost), start_(surf_get_clock()), cost_(cost), model_(model), variable_(var)
{
if (failed)
: remains_(cost), start_(surf_get_clock()), cost_(cost), model_(model), variable_(var)
{
if (failed)