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
Exposing a pointer to internals is not considered as good OOP practices
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
ed60663
..
dccea91
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-31,7
+31,7
@@
xbt_dynar_t model_list_invoke = NULL; /* to invoke callbacks */
simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
xbt_dynar_t surf_path = NULL;
simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
xbt_dynar_t surf_path = NULL;
-xbt_dynar_t host_that_restart =
NULL
;
+xbt_dynar_t host_that_restart =
xbt_dynar_new(sizeof(char*), NULL)
;
xbt_dict_t watched_hosts_lib;
namespace simgrid {
xbt_dict_t watched_hosts_lib;
namespace simgrid {
@@
-412,18
+412,18
@@
Model::~Model(){
delete p_doneActionSet;
}
delete p_doneActionSet;
}
-double Model::
shareResources
(double now)
+double Model::
next_occuring_event
(double now)
{
//FIXME: set the good function once and for all
if (p_updateMechanism == UM_LAZY)
{
//FIXME: set the good function once and for all
if (p_updateMechanism == UM_LAZY)
- return
shareResourcesL
azy(now);
+ return
next_occuring_event_l
azy(now);
else if (p_updateMechanism == UM_FULL)
else if (p_updateMechanism == UM_FULL)
- return
shareResourcesF
ull(now);
+ return
next_occuring_event_f
ull(now);
else
xbt_die("Invalid cpu update mechanism!");
}
else
xbt_die("Invalid cpu update mechanism!");
}
-double Model::
shareResourcesL
azy(double now)
+double Model::
next_occuring_event_l
azy(double now)
{
Action *action = NULL;
double min = -1;
{
Action *action = NULL;
double min = -1;
@@
-500,7
+500,7
@@
double Model::shareResourcesLazy(double now)
return min;
}
return min;
}
-double Model::
shareResourcesF
ull(double /*now*/) {
+double Model::
next_occuring_event_f
ull(double /*now*/) {
THROW_UNIMPLEMENTED;
}
THROW_UNIMPLEMENTED;
}