From: Martin Quinson Date: Sun, 11 Mar 2018 12:09:06 +0000 (+0100) Subject: rename simgrid::kernel::model into simgrid::kernel::resource X-Git-Tag: v3.19~93 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dac676c1180a5ea95897072e55f698433a857d90 rename simgrid::kernel::model into simgrid::kernel::resource --- diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 67ba4588bc..b13224ff97 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -47,7 +47,7 @@ class Constraint; class ConstraintLight; class System; } -namespace model { +namespace resource { class Resource; } namespace routing { @@ -83,7 +83,7 @@ typedef simgrid::s4u::NetZone s4u_NetZone; typedef simgrid::s4u::VirtualMachine s4u_VM; typedef boost::intrusive_ptr smx_activity_t; typedef simgrid::kernel::routing::NetPoint routing_NetPoint; -typedef simgrid::kernel::model::Resource surf_Resource; +typedef simgrid::kernel::resource::Resource surf_Resource; typedef simgrid::trace_mgr::trace tmgr_Trace; typedef simgrid::kernel::context::Context* smx_context_t; diff --git a/src/kernel/model/Resource.cpp b/src/kernel/model/Resource.cpp index f7b290c48c..6367a23812 100644 --- a/src/kernel/model/Resource.cpp +++ b/src/kernel/model/Resource.cpp @@ -9,7 +9,7 @@ namespace simgrid { namespace kernel { -namespace model { +namespace resource { Resource::Resource(surf::Model* model, const std::string& name, lmm::Constraint* constraint) : name_(name), model_(model), constraint_(constraint) diff --git a/src/kernel/model/Resource.hpp b/src/kernel/model/Resource.hpp index b34bcc0759..4bdbfe2b65 100644 --- a/src/kernel/model/Resource.hpp +++ b/src/kernel/model/Resource.hpp @@ -10,7 +10,7 @@ namespace simgrid { namespace kernel { -namespace model { +namespace resource { /** @ingroup SURF_interface * @brief SURF resource interface class @@ -86,9 +86,9 @@ protected: } // namespace simgrid namespace std { -template <> class hash { +template <> class hash { public: - std::size_t operator()(const simgrid::kernel::model::Resource& r) const + std::size_t operator()(const simgrid::kernel::resource::Resource& r) const { return (std::size_t)xbt_str_hash(r.getCname()); } diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index e290906d60..b877e349ca 100644 --- a/src/surf/StorageImpl.hpp +++ b/src/surf/StorageImpl.hpp @@ -81,7 +81,7 @@ public: * @brief SURF storage interface class * @details A Storage represent a storage unit (e.g.: hard drive, usb key) */ -class StorageImpl : public kernel::model::Resource, public PropertyHolder { +class StorageImpl : public kernel::resource::Resource, public PropertyHolder { public: /** @brief Storage constructor */ StorageImpl(Model* model, std::string name, lmm_system_t maxminSystem, double bread, double bwrite, diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index e5a92661ea..1fcf505917 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -225,8 +225,8 @@ std::list CpuAction::cpus() { for (int i = 0; i < llen; i++) { /* Beware of composite actions: ptasks put links and cpus together */ // extra pb: we cannot dynamic_cast from void*... - kernel::model::Resource* resource = - static_cast(getVariable()->get_constraint(i)->get_id()); + kernel::resource::Resource* resource = + static_cast(getVariable()->get_constraint(i)->get_id()); Cpu* cpu = dynamic_cast(resource); if (cpu != nullptr) retlist.push_back(cpu); diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 5b97cf2267..b0ff040f28 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -46,7 +46,7 @@ public: * @brief SURF cpu resource interface class * @details A Cpu represent a cpu associated to a host */ -XBT_PUBLIC_CLASS Cpu : public simgrid::kernel::model::Resource +XBT_PUBLIC_CLASS Cpu : public simgrid::kernel::resource::Resource { public: /** diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 86202a2562..c53c07dee3 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -202,8 +202,8 @@ namespace simgrid { for (int i = 0; i < llen; i++) { /* Beware of composite actions: ptasks put links and cpus together */ // extra pb: we cannot dynamic_cast from void*... - kernel::model::Resource* resource = - static_cast(getVariable()->get_constraint(i)->get_id()); + kernel::resource::Resource* resource = + static_cast(getVariable()->get_constraint(i)->get_id()); LinkImpl* link = dynamic_cast(resource); if (link != nullptr) retlist.push_back(link); diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 87f37e0a91..b17ddad992 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -114,7 +114,7 @@ public: * @brief SURF network link interface class * @details A Link represents the link between two [hosts](\ref simgrid::surf::HostImpl) */ -class LinkImpl : public simgrid::kernel::model::Resource, public simgrid::surf::PropertyHolder { +class LinkImpl : public simgrid::kernel::resource::Resource, public simgrid::surf::PropertyHolder { protected: LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, kernel::lmm::Constraint* constraint); ~LinkImpl() override; diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 5d968fcb27..d4eb8a24bd 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -124,7 +124,7 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) while (cnst != nullptr) { i++; void* constraint_id = cnst->get_id(); - if (static_cast(constraint_id)->isOff()) { + if (static_cast(constraint_id)->isOff()) { XBT_DEBUG("Action (%p) Failed!!", &action); action.finish(Action::State::failed); break; diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index aeba3b6b5e..98b5dd9c1d 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -21,7 +21,7 @@ void surf_presolve() double next_event_date = -1.0; tmgr_trace_event_t event = nullptr; double value = -1.0; - simgrid::kernel::model::Resource* resource = nullptr; + simgrid::kernel::resource::Resource* resource = nullptr; XBT_DEBUG ("Consume all trace events occurring before the starting time."); while ((next_event_date = future_evt_set->next_date()) != -1.0) { @@ -44,7 +44,7 @@ double surf_solve(double max_date) double time_delta = -1.0; /* duration */ double model_next_action_end = -1.0; double value = -1.0; - simgrid::kernel::model::Resource* resource = nullptr; + simgrid::kernel::resource::Resource* resource = nullptr; tmgr_trace_event_t event = nullptr; if (max_date > 0.0) { diff --git a/src/surf/trace_mgr.cpp b/src/surf/trace_mgr.cpp index c5b9e2f349..07c5ba6f3e 100644 --- a/src/surf/trace_mgr.cpp +++ b/src/surf/trace_mgr.cpp @@ -121,7 +121,8 @@ tmgr_trace_t tmgr_trace_new_from_file(std::string filename) } /** @brief Registers a new trace into the future event set, and get an iterator over the integrated trace */ -tmgr_trace_event_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t trace, kernel::model::Resource* resource) +tmgr_trace_event_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t trace, + kernel::resource::Resource* resource) { tmgr_trace_event_t trace_iterator = nullptr; @@ -146,7 +147,7 @@ double simgrid::trace_mgr::future_evt_set::next_date() const /** @brief Retrieves the next occurring event, or nullptr if none happens before #date */ tmgr_trace_event_t simgrid::trace_mgr::future_evt_set::pop_leq(double date, double* value, - kernel::model::Resource** resource) + kernel::resource::Resource** resource) { double event_date = next_date(); if (event_date > date) diff --git a/src/surf/trace_mgr.hpp b/src/surf/trace_mgr.hpp index a3a8aa0db4..36ce190459 100644 --- a/src/surf/trace_mgr.hpp +++ b/src/surf/trace_mgr.hpp @@ -87,8 +87,8 @@ public: future_evt_set(); virtual ~future_evt_set(); double next_date() const; - tmgr_trace_event_t pop_leq(double date, double* value, simgrid::kernel::model::Resource** resource); - tmgr_trace_event_t add_trace(tmgr_trace_t trace, simgrid::kernel::model::Resource * resource); + tmgr_trace_event_t pop_leq(double date, double* value, simgrid::kernel::resource::Resource** resource); + tmgr_trace_event_t add_trace(tmgr_trace_t trace, simgrid::kernel::resource::Resource * resource); private: typedef std::pair Qelt; diff --git a/src/surf/trace_mgr_test.cpp b/src/surf/trace_mgr_test.cpp index d8bc1c94c0..d9a54b30ca 100644 --- a/src/surf/trace_mgr_test.cpp +++ b/src/surf/trace_mgr_test.cpp @@ -24,9 +24,9 @@ namespace tmgr = simgrid::trace_mgr; XBT_LOG_NEW_DEFAULT_CATEGORY(unit, "Unit tests of the Trace Manager"); double thedate; -class MockedResource : public simgrid::kernel::model::Resource { +class MockedResource : public simgrid::kernel::resource::Resource { public: - explicit MockedResource() : simgrid::kernel::model::Resource(nullptr, "fake", nullptr) {} + explicit MockedResource() : simgrid::kernel::resource::Resource(nullptr, "fake", nullptr) {} void apply_event(tmgr_trace_event_t event, double value) { XBT_VERB("t=%.1f: Change value to %lg (idx: %u)", thedate, value, event->idx); @@ -50,7 +50,7 @@ static void trace2vector(const char* str, std::vector* whereto while (fes.next_date() <= 20.0 && fes.next_date() >= 0) { thedate = fes.next_date(); double value; - simgrid::kernel::model::Resource* res; + simgrid::kernel::resource::Resource* res; tmgr_trace_event_t it = fes.pop_leq(thedate, &value, &res); if (it == nullptr) continue;