From: Arnaud Giersch Date: Tue, 3 Apr 2018 13:56:50 +0000 (+0200) Subject: Kill useless typedefs const_lmm_element_t and lmm_constraint_light_t. X-Git-Tag: v3.20~536 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/67f2bef36fb0768512ea46896f2373b1362b30c1 Kill useless typedefs const_lmm_element_t and lmm_constraint_light_t. --- diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 4f75329884..aa75b46e15 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -99,9 +99,6 @@ typedef simgrid::kernel::activity::MutexImpl* smx_mutex_t; typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t; typedef simgrid::surf::StorageImpl* surf_storage_t; -typedef const simgrid::kernel::lmm::Element* const_lmm_element_t; -typedef simgrid::kernel::lmm::ConstraintLight* lmm_constraint_light_t; - #else typedef struct s4u_Actor s4u_Actor; diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp index 002b9c046c..d33ce2365e 100644 --- a/src/kernel/lmm/maxmin.cpp +++ b/src/kernel/lmm/maxmin.cpp @@ -326,7 +326,7 @@ void System::expand_add(Constraint* cnst, Variable* var, double value) check_concurrency(); } -Variable* Constraint::get_variable(const_lmm_element_t* elem) const +Variable* Constraint::get_variable(const Element** elem) const { if (*elem == nullptr) { // That is the first call, pick the first element among enabled_element_set (or disabled_element_set if @@ -361,7 +361,7 @@ Variable* Constraint::get_variable(const_lmm_element_t* elem) const // if we modify the list between calls, normal version may loop forever // this safe version ensures that we browse the list elements only once -Variable* Constraint::get_variable_safe(const_lmm_element_t* elem, const_lmm_element_t* nextelem, int* numelem) const +Variable* Constraint::get_variable_safe(const Element** elem, const Element** nextelem, int* numelem) const { if (*elem == nullptr) { *numelem = enabled_element_set.size() + disabled_element_set.size() - 1; diff --git a/src/kernel/lmm/maxmin.hpp b/src/kernel/lmm/maxmin.hpp index c67f8c415c..469068384c 100644 --- a/src/kernel/lmm/maxmin.hpp +++ b/src/kernel/lmm/maxmin.hpp @@ -260,7 +260,7 @@ public: * @param elem A element of constraint of the constraint or NULL * @return A variable associated to a constraint */ - Variable* get_variable(const_lmm_element_t * elem) const; + Variable* get_variable(const Element** elem) const; /** * @brief Get a var associated to a constraint @@ -270,7 +270,7 @@ public: * @param numelem parameter representing the number of elements to go * @return A variable associated to a constraint */ - Variable* get_variable_safe(const_lmm_element_t * elem, const_lmm_element_t * nextelem, int* numelem) const; + Variable* get_variable_safe(const Element** elem, const Element** nextelem, int* numelem) const; /** * @brief Get the data associated to a constraint @@ -304,7 +304,7 @@ public: int id_int; double lambda; double new_lambda; - lmm_constraint_light_t cnst_light; + ConstraintLight* cnst_light; private: static int Global_debug_id; diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index d03c3c09f1..1bce074e28 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -112,7 +112,7 @@ bool CpuCas01::is_used() /** @brief take into account changes of speed (either load or max) */ void CpuCas01::onSpeedChange() { kernel::lmm::Variable* var = nullptr; - const_lmm_element_t elem = nullptr; + const kernel::lmm::Element* elem = nullptr; get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), coresAmount_ * speed_.scale * speed_.peak); @@ -147,7 +147,7 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value) } else { kernel::lmm::Constraint* cnst = get_constraint(); kernel::lmm::Variable* var = nullptr; - const_lmm_element_t elem = nullptr; + const kernel::lmm::Element* elem = nullptr; double date = surf_get_clock(); turn_off(); diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index c264794bd2..1a65f0437c 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -371,7 +371,7 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) turn_on(); else { kernel::lmm::Variable* var = nullptr; - const_lmm_element_t elem = nullptr; + const kernel::lmm::Element* elem = nullptr; double now = surf_get_clock(); turn_off(); @@ -407,8 +407,8 @@ void NetworkCm02Link::setBandwidth(double value) double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale); kernel::lmm::Variable* var; - const_lmm_element_t elem = nullptr; - const_lmm_element_t nextelem = nullptr; + const kernel::lmm::Element* elem = nullptr; + const kernel::lmm::Element* nextelem = nullptr; int numelem = 0; while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { NetworkCm02Action* action = static_cast(var->get_id()); @@ -423,8 +423,8 @@ void NetworkCm02Link::setLatency(double value) { double delta = value - latency_.peak; kernel::lmm::Variable* var = nullptr; - const_lmm_element_t elem = nullptr; - const_lmm_element_t nextelem = nullptr; + const kernel::lmm::Element* elem = nullptr; + const kernel::lmm::Element* nextelem = nullptr; int numelem = 0; latency_.peak = value; diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 0e41e5625a..b0a80bb863 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -290,7 +290,7 @@ bool CpuL07::is_used() /** @brief take into account changes of speed (either load or max) */ void CpuL07::onSpeedChange() { kernel::lmm::Variable* var = nullptr; - const_lmm_element_t elem = nullptr; + const kernel::lmm::Element* elem = nullptr; get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), speed_.peak * speed_.scale); while ((var = get_constraint()->get_variable(&elem))) { @@ -360,7 +360,7 @@ void LinkL07::setLatency(double value) { kernel::lmm::Variable* var = nullptr; L07Action *action; - const_lmm_element_t elem = nullptr; + const kernel::lmm::Element* elem = nullptr; latency_.peak = value; while ((var = get_constraint()->get_variable(&elem))) {