From e6be248713757287eb951054a63c9f251d52ee0a Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 2 Apr 2018 11:41:50 +0200 Subject: [PATCH] finish snake-casing resource::Model --- include/simgrid/kernel/resource/Model.hpp | 4 ++-- src/surf/host_clm03.cpp | 2 +- src/surf/network_ns3.hpp | 2 +- src/surf/surf_c_bindings.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/simgrid/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp index ad3e0cb17b..045d201d60 100644 --- a/include/simgrid/kernel/resource/Model.hpp +++ b/include/simgrid/kernel/resource/Model.hpp @@ -78,12 +78,12 @@ public: virtual void update_actions_state_lazy(double now, double delta); virtual void update_actions_state_full(double now, double delta); - /** @brief Returns whether this model have an idempotent shareResource() + /** @brief Returns whether this model have an idempotent share_resource() * * The only model that is not is NS3: computing the next timestamp moves the model up to that point, * so we need to call it only when the next timestamp of other sources is computed. */ - virtual bool nextOccuringEventIsIdempotent() { return true; } + virtual bool next_occuring_event_is_idempotent() { return true; } private: lmm::System* maxmin_system_ = nullptr; diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp index 3bf108254f..84127e0d1e 100644 --- a/src/surf/host_clm03.cpp +++ b/src/surf/host_clm03.cpp @@ -51,7 +51,7 @@ double HostCLM03Model::next_occuring_event(double now) double min_by_cpu = surf_cpu_model_pm->next_occuring_event(now); double min_by_net = - surf_network_model->nextOccuringEventIsIdempotent() ? surf_network_model->next_occuring_event(now) : -1; + surf_network_model->next_occuring_event_is_idempotent() ? surf_network_model->next_occuring_event(now) : -1; double min_by_sto = surf_storage_model->next_occuring_event(now); XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f", diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index 542558e4e7..aa8ab6bde4 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -21,7 +21,7 @@ public: e_surf_link_sharing_policy_t policy) override; kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; double next_occuring_event(double now) override; - bool nextOccuringEventIsIdempotent() override { return false; } + bool next_occuring_event_is_idempotent() override { return false; } void update_actions_state(double now, double delta) override; }; diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index e96c017c84..06af81e3c0 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -83,7 +83,7 @@ double surf_solve(double max_date) double next_event_date = future_evt_set->next_date(); XBT_DEBUG("Next TRACE event: %f", next_event_date); - if (not surf_network_model->nextOccuringEventIsIdempotent()) { // NS3, I see you + if (not surf_network_model->next_occuring_event_is_idempotent()) { // NS3, I see you if (next_event_date != -1.0) { time_delta = std::min(next_event_date - NOW, time_delta); } else { -- 2.20.1