X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f0f0055361aed39f6a2d2f9b33f67c71239fcc81..e36ab8605881c80995e3df732c33bd44bd4eda86:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 49f23e9ac4..e6fdd84087 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -194,9 +194,6 @@ static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ #endif double NOW = 0; -double *surf_mins = NULL; /* return value of share_resources for each model */ -int surf_min_index; /* current index in surf_mins */ -double surf_min; /* duration determined by surf_solve */ double surf_get_clock(void) { @@ -332,11 +329,6 @@ static XBT_INLINE void routing_asr_prop_free(void *p) //xbt_dict_free(&elm); FIXME: leaking in some case? That's a sometimes double-free with AsCluster::~AsCluster } -static XBT_INLINE void surf_link_free(void *r) -{ - delete static_cast(r); -} - static XBT_INLINE void surf_host_free(void *r) { delete static_cast(r); @@ -432,9 +424,6 @@ void surf_exit(void) xbt_parmap_destroy(surf_parmap); #endif - xbt_free(surf_mins); - surf_mins = NULL; - tmgr_finalize(); surf_parse_lex_destroy(); surf_parse_free_callbacks(); @@ -446,9 +435,8 @@ void surf_exit(void) * Model * *********/ -Model::Model(const char *name) +Model::Model() : p_maxminSystem(NULL) - , p_name(name) { p_readyActionSet = new ActionList(); p_runningActionSet = new ActionList(); @@ -731,7 +719,6 @@ void Action::initialize(Model *model, double cost, bool failed, m_remains = cost; m_maxDuration = NO_MAX_DURATION; m_finish = -1.0; - m_failed = failed; m_start = surf_get_clock(); m_cost = cost; p_model = model;