From: Martin Quinson Date: Fri, 4 Mar 2016 10:04:53 +0000 (+0100) Subject: kill dead code X-Git-Tag: v3_13~567 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3df7050c4f04270c1f7dbab4c9c6d43bc648f637?ds=sidebyside kill dead code --- diff --git a/src/surf/trace_mgr.cpp b/src/surf/trace_mgr.cpp index cc0eeddd1e..32558c2bfc 100644 --- a/src/surf/trace_mgr.cpp +++ b/src/surf/trace_mgr.cpp @@ -17,7 +17,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_trace, surf, "Surf trace management"); static xbt_dict_t trace_list = NULL; -simgrid::trace_mgr::future_evt_set::future_evt_set() { +simgrid::trace_mgr::future_evt_set::future_evt_set() +{ } simgrid::trace_mgr::future_evt_set::~future_evt_set() @@ -25,224 +26,7 @@ simgrid::trace_mgr::future_evt_set::~future_evt_set() xbt_heap_free(p_heap); } -#if 0 /* probabilistic dead code. Should be reimplemented, not killed (please) */ -/** - * \brief Create a #tmgr_trace_t from probabilist generators - * - * This trace will generate an infinite set of events. - * It needs two #probabilist_event_generator_t. The date when the event are - * triggered is directed by date_generator, and will be interpreted as seconds. - * The value of the event is set by value_generator. The value should be between - * 0 and 1. - * - * \param id The name of the trace - * \param date_generator The #probabilist_event_generator_t which generates the time - * between two events - * \param generator2 The #probabilist_event_generator_t which generates the value - * of each events. - * \return The new #tmgr_trace_t - */ -tmgr_trace_t tmgr_trace_generator_value(const char *id, - probabilist_event_generator_t date_generator, - probabilist_event_generator_t value_generator) -{ - tmgr_trace_t trace = NULL; - - trace = xbt_new0(s_tmgr_trace_t, 1); - trace->type = e_trace_probabilist; - - trace->s_probabilist.event_generator[0] = date_generator; - trace->s_probabilist.event_generator[1] = value_generator; - trace->s_probabilist.is_state_trace = 0; - - return trace; -} - -/** - * \brief Create a #tmgr_trace_t from probabilist generators - * - * This trace will generate an infinite set of events. Value of the events - * will be alternatively 0 and 1, so this should be used as a state trace. - * - * \param id The name of the trace - * \param date_generator The #probabilist_event_generator_t which generates the time - * between two events - * \param first_event_value Set the first event value - * \return The new #tmgr_trace_t - */ -tmgr_trace_t tmgr_trace_generator_state(const char *id, - probabilist_event_generator_t date_generator, - int first_event_hostIsOn) -{ - tmgr_trace_t trace = NULL; - - trace = xbt_new0(s_tmgr_trace_t, 1); - trace->type = e_trace_probabilist; - - trace->s_probabilist.event_generator[0] = date_generator; - trace->s_probabilist.event_generator[1] = date_generator; - trace->s_probabilist.is_state_trace = 1; - trace->s_probabilist.next_event = first_event_hostIsOn; - - return trace; -} - -/** - * \brief Create a #tmgr_trace_t from probabilist generators - * - * This trace will generate an infinite set of events. Value of the events - * will be alternatively 0 and 1, so this should be used as a state trace. - * - * \param id The name of the trace - * \param avail_duration_generator The #probabilist_event_generator_t which - * set the duration of the available state, (ie 1 value) - * \param unavail_duration_generator The #probabilist_event_generator_t which - * set the duration of the unavailable state, (ie 0 value) - * \param first_event_value Set the first event value - * \return The new #tmgr_trace_t - */ -tmgr_trace_t tmgr_trace_generator_avail_unavail(const char *id, - probabilist_event_generator_t avail_duration_generator, - probabilist_event_generator_t unavail_duration_generator, - int first_event_hostIsOn) -{ - tmgr_trace_t trace = NULL; - - trace = xbt_new0(s_tmgr_trace_t, 1); - trace->type = e_trace_probabilist; - - trace->s_probabilist.event_generator[0] = unavail_duration_generator; - trace->s_probabilist.event_generator[1] = avail_duration_generator; - trace->s_probabilist.is_state_trace = 1; - trace->s_probabilist.next_event = first_event_hostIsOn; - - return trace; -} - -/** - * \brief Create a new #probabilist_event_generator_t following the uniform distribution - * - * This generator will generate uniformly distributed random values between min and max - * The id is important : it controls the seed of the generator. So, generators with the - * same id and the same parameters will generate the same values. - * - * \param id The name of the generator - * \param min The minimal generated value - * \param max The maximal generated value - * \return a new #probabilist_event_generator_t - */ -probabilist_event_generator_t tmgr_event_generator_new_uniform(const char* id, - double min, - double max) -{ - probabilist_event_generator_t event_generator = NULL; - RngStream rng_stream = NULL; - - rng_stream = sg_platf_rng_stream_get(id); - - event_generator = xbt_new0(s_probabilist_event_generator_t, 1); - event_generator->type = e_generator_uniform; - event_generator->s_uniform_parameters.min = min; - event_generator->s_uniform_parameters.max = max; - event_generator->rng_stream = rng_stream; - - tmgr_event_generator_next_value(event_generator); - - return event_generator; -} - - -/** - * \brief Create a new #probabilist_event_generator_t following the exponential distribution - * - * This generator will generate random values following the exponential distribution. - * The mean value is 1/rate . - * The id is important : it controls the seed of the generator. So, generators with the - * same id and the same parameters will generate the same values. - * - * \param id The name of the generator - * \param rate The rate parameter - * \return a new #probabilist_event_generator_t - */ -probabilist_event_generator_t tmgr_event_generator_new_exponential(const char* id, - double rate) -{ - probabilist_event_generator_t event_generator = NULL; - RngStream rng_stream = NULL; - - rng_stream = sg_platf_rng_stream_get(id); - - event_generator = xbt_new0(s_probabilist_event_generator_t, 1); - event_generator->type = e_generator_exponential; - event_generator->s_exponential_parameters.rate = rate; - event_generator->rng_stream = rng_stream; - - tmgr_event_generator_next_value(event_generator); - - return event_generator; -} - -/** - * \brief Create a new #probabilist_event_generator_t following the weibull distribution - * - * This generator will generate random values following the weibull distribution. - * The id is important : it controls the seed of the generator. So, generators with the - * same id and the same parameters will generate the same values. - * - * \param id The name of the generator - * \param scale The scale parameter - * \param shape The shape parameter - * \return a new #probabilist_event_generator_t - */ -probabilist_event_generator_t tmgr_event_generator_new_weibull(const char* id, - double scale, - double shape) -{ - probabilist_event_generator_t event_generator = NULL; - RngStream rng_stream = NULL; - - rng_stream = sg_platf_rng_stream_get(id); - - event_generator = xbt_new0(s_probabilist_event_generator_t, 1); - event_generator->type = e_generator_weibull; - event_generator->s_weibull_parameters.scale = scale; - event_generator->s_weibull_parameters.shape = shape; - event_generator->rng_stream = rng_stream; - - tmgr_event_generator_next_value(event_generator); - - return event_generator; -} -/** - * \brief Get the next random value of a #probabilist_event_generator_t - * \param generator The #probabilist_event_generator_t - * \return the next random value - */ -double tmgr_event_generator_next_value(probabilist_event_generator_t generator) -{ - - switch(generator->type) { - case e_generator_uniform: - generator->next_value = (RngStream_RandU01(generator->rng_stream) - * (generator->s_uniform_parameters.max - generator->s_uniform_parameters.min)) - + generator->s_uniform_parameters.min; - break; - case e_generator_exponential: - generator->next_value = -log(RngStream_RandU01(generator->rng_stream)) - / generator->s_exponential_parameters.rate; - break; - case e_generator_weibull: - generator->next_value = generator->s_weibull_parameters.scale - * pow( -log(RngStream_RandU01(generator->rng_stream)), - 1.0 / generator->s_weibull_parameters.shape ); - } - - return generator->next_value; -} -#endif /* probabilistic dead code */ - -tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input, - double periodicity) +tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input, double periodicity) { tmgr_trace_t trace = NULL; int linecount = 0; @@ -362,8 +146,7 @@ void tmgr_trace_free(tmgr_trace_t trace) } /** @brief Registers a new trace into the future event set, and get an iterator over the integrated trace */ -tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::add_trace( - tmgr_trace_t trace, double start_time, surf::Resource *resource) +tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t trace, double start_time, surf::Resource *resource) { tmgr_trace_iterator_t trace_iterator = NULL; @@ -372,8 +155,7 @@ tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::add_trace( trace_iterator->idx = 0; trace_iterator->resource = resource; - xbt_assert((trace_iterator->idx < xbt_dynar_length(trace->event_list)), - "Your trace should have at least one event!"); + xbt_assert((trace_iterator->idx < xbt_dynar_length(trace->event_list)), "Your trace should have at least one event!"); xbt_heap_push(p_heap, trace_iterator, start_time);