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
Simplify the code taking Cpu::m_speedPeak changes into account
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
3f7d33a
..
fe54219
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-38,7
+38,7
@@
xbt_dict_t watched_hosts_lib;
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
-s
urf_callback(void, void)
surfExitCallbacks;
+s
imgrid::surf::signal<void(void)>
surfExitCallbacks;
}
}
}
}
@@
-302,7
+302,7
@@
void surf_init(int *argc, char **argv)
{
XBT_DEBUG("Create all Libs");
host_list = xbt_dict_new_homogeneous([](void*p) {
{
XBT_DEBUG("Create all Libs");
host_list = xbt_dict_new_homogeneous([](void*p) {
- delete
(simgrid::Host*)p
;
+ delete
static_cast<simgrid::Host*>(p)
;
});
as_router_lib = xbt_lib_new();
storage_lib = xbt_lib_new();
});
as_router_lib = xbt_lib_new();
storage_lib = xbt_lib_new();
@@
-316,7
+316,7
@@
void surf_init(int *argc, char **argv)
ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_prop_free);
XBT_DEBUG("Add SURF levels");
ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_prop_free);
XBT_DEBUG("Add SURF levels");
- simgrid::surf::Host::
i
nit();
+ simgrid::surf::Host::
classI
nit();
SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free);
xbt_init(argc, argv);
SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free);
xbt_init(argc, argv);
@@
-363,7
+363,7
@@
void surf_exit(void)
xbt_dynar_free(&model_list_invoke);
routing_exit();
xbt_dynar_free(&model_list_invoke);
routing_exit();
- s
urf_callback_emit(simgrid::surf::surfExitCallbacks
);
+ s
imgrid::surf::surfExitCallbacks(
);
if (maxmin_system) {
lmm_system_free(maxmin_system);
if (maxmin_system) {
lmm_system_free(maxmin_system);
@@
-614,6
+614,7
@@
Resource::Resource(Model *model, const char *name, e_surf_resource_state_t state
, m_running(true), m_stateCurrent(stateInit)
{}
, m_running(true), m_stateCurrent(stateInit)
{}
+
Resource::~Resource() {
xbt_free((void*)p_name);
}
Resource::~Resource() {
xbt_free((void*)p_name);
}
@@
-686,23
+687,11
@@
namespace surf {
void Action::initialize(simgrid::surf::Model *model, double cost, bool failed,
lmm_variable_t var)
{
void Action::initialize(simgrid::surf::Model *model, double cost, bool failed,
lmm_variable_t var)
{
- m_priority = 1.0;
- m_refcount = 1;
m_remains = cost;
m_remains = cost;
- m_maxDuration = NO_MAX_DURATION;
- m_finish = -1.0;
m_start = surf_get_clock();
m_cost = cost;
p_model = model;
m_start = surf_get_clock();
m_cost = cost;
p_model = model;
- p_data = NULL;
p_variable = var;
p_variable = var;
- m_lastValue = 0;
- m_lastUpdate = 0;
- m_suspended = false;
- m_hat = NOTSET;
- p_category = NULL;
- p_stateHookup.prev = 0;
- p_stateHookup.next = 0;
if (failed)
p_stateSet = getModel()->getFailedActionSet();
else
if (failed)
p_stateSet = getModel()->getFailedActionSet();
else