From 5f9b13c6302e914a514168da8ff54818c0ee6787 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 8 Feb 2016 12:11:39 +0100 Subject: [PATCH 1/1] cosmetics around surf::Resouce::apply_event() --- src/surf/cpu_cas01.cpp | 8 +++----- src/surf/cpu_cas01.hpp | 2 +- src/surf/cpu_ti.cpp | 6 +++--- src/surf/cpu_ti.hpp | 5 ++--- src/surf/host_interface.hpp | 2 +- src/surf/host_ptask_L07.cpp | 5 +++++ src/surf/host_ptask_L07.hpp | 4 ++-- src/surf/network_cm02.cpp | 2 ++ src/surf/network_cm02.hpp | 32 ++++++++++++-------------------- src/surf/network_ns3.cpp | 2 +- src/surf/network_ns3.hpp | 2 +- src/surf/storage_interface.cpp | 2 +- src/surf/storage_interface.hpp | 9 +-------- src/surf/surf_interface.hpp | 7 +++---- 14 files changed, 38 insertions(+), 50 deletions(-) diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 0a9533758b..a3dec9ae48 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -159,9 +159,6 @@ void CpuCas01::onSpeedChange() { void CpuCas01::apply_event(tmgr_trace_iterator_t event, double value) { - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; - if (event == p_speed.event) { /* TODO (Hypervisor): do the same thing for constraint_core[i] */ xbt_assert(m_core == 1, "FIXME: add speed scaling code also for constraint_core[i]"); @@ -180,6 +177,8 @@ void CpuCas01::apply_event(tmgr_trace_iterator_t event, double value) turnOn(); } else { lmm_constraint_t cnst = getConstraint(); + lmm_variable_t var = NULL; + lmm_element_t elem = NULL; double date = surf_get_clock(); turnOff(); @@ -196,11 +195,10 @@ void CpuCas01::apply_event(tmgr_trace_iterator_t event, double value) } } tmgr_trace_event_unref(&p_stateEvent); + } else { xbt_die("Unknown event!\n"); } - - return; } CpuAction *CpuCas01::execution_start(double size) diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp index 6580407b83..d2022aae48 100644 --- a/src/surf/cpu_cas01.hpp +++ b/src/surf/cpu_cas01.hpp @@ -46,7 +46,7 @@ public: int pstate, double speedScale, tmgr_trace_t speedTrace, int core, int initiallyOn, tmgr_trace_t stateTrace) ; ~CpuCas01(); - void apply_event(tmgr_trace_iterator_t event_type, double value) override; + void apply_event(tmgr_trace_iterator_t event, double value) override; CpuAction *execution_start(double size) override; CpuAction *sleep(double duration) override; diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index ad7f673e25..93c115c984 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -534,8 +534,6 @@ void CpuTi::set_speed_trace(tmgr_trace_t trace) void CpuTi::apply_event(tmgr_trace_iterator_t event, double value) { - CpuTiAction *action; - if (event == p_speed.event) { tmgr_trace_t speedTrace; CpuTiTgmr *trace; @@ -573,7 +571,8 @@ void CpuTi::apply_event(tmgr_trace_iterator_t event, double value) /* put all action running on cpu to failed */ for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end()) ; it != itend ; ++it) { - action = &*it; + + CpuTiAction *action = &*it; if (action->getState() == SURF_ACTION_RUNNING || action->getState() == SURF_ACTION_READY || action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) { @@ -589,6 +588,7 @@ void CpuTi::apply_event(tmgr_trace_iterator_t event, double value) } } tmgr_trace_event_unref(&p_stateEvent); + } else { xbt_die("Unknown event!\n"); } diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 3212b62134..1f8bb91298 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -120,7 +120,7 @@ public: void set_speed_trace(tmgr_trace_t trace) override; - void apply_event(tmgr_trace_iterator_t event_type, double value) override; + void apply_event(tmgr_trace_iterator_t event, double value) override; void updateActionsFinishTime(double now); void updateRemainingAmount(double now); @@ -156,8 +156,7 @@ public: Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak, int pstate, double speedScale, tmgr_trace_t speedTrace, int core, - int initiallyOn, - tmgr_trace_t state_trace) override; + int initiallyOn, tmgr_trace_t state_trace) override; double next_occuring_event(double now) override; void updateActionsState(double now, double delta) override; diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp index d2fc8d09c2..f1c199dc60 100644 --- a/src/surf/host_interface.hpp +++ b/src/surf/host_interface.hpp @@ -228,7 +228,7 @@ public: virtual int fileMove(surf_file_t fd, const char* fullpath); bool isUsed() override {DIE_IMPOSSIBLE;} // FIXME: Host should not be a Resource - void apply_event(tmgr_trace_iterator_t event_type, double value) override + void apply_event(tmgr_trace_iterator_t event, double value) override {THROW_IMPOSSIBLE;} // FIXME: Host should not be a Resource public: diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp index e31cc32e12..3106381a2d 100644 --- a/src/surf/host_ptask_L07.cpp +++ b/src/surf/host_ptask_L07.cpp @@ -432,12 +432,14 @@ void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double value){ p_speed.scale = value; onSpeedChange(); tmgr_trace_event_unref(&p_speed.event); + } else if (triggered == p_stateEvent) { if (value > 0) turnOn(); else turnOff(); tmgr_trace_event_unref(&p_stateEvent); + } else { xbt_die("Unknown event!\n"); } @@ -448,15 +450,18 @@ void LinkL07::apply_event(tmgr_trace_iterator_t triggered, double value) { if (triggered == m_bandwidth.event) { updateBandwidth(value); tmgr_trace_event_unref(&m_bandwidth.event); + } else if (triggered == m_latency.event) { updateLatency(value); tmgr_trace_event_unref(&m_latency.event); + } else if (triggered == m_stateEvent) { if (value > 0) turnOn(); else turnOff(); tmgr_trace_event_unref(&m_stateEvent); + } else { xbt_die("Unknown event ! \n"); } diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp index b10d8c9dc4..33a2ffc815 100644 --- a/src/surf/host_ptask_L07.hpp +++ b/src/surf/host_ptask_L07.hpp @@ -94,7 +94,7 @@ public: int core, int initiallyOn, tmgr_trace_t state_trace); ~CpuL07(); bool isUsed() override; - void apply_event(tmgr_trace_iterator_t event_type, double value) override; + void apply_event(tmgr_trace_iterator_t event, double value) override; Action *execution_start(double size) override; Action *sleep(double duration) override; protected: @@ -113,7 +113,7 @@ public: e_surf_link_sharing_policy_t policy); ~LinkL07(){ }; bool isUsed() override; - void apply_event(tmgr_trace_iterator_t event_type, double value) override; + void apply_event(tmgr_trace_iterator_t event, double value) override; void updateBandwidth(double value) override; void updateLatency(double value) override; }; diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 1f2794fddc..db6d3ab00e 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -496,9 +496,11 @@ void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value) if (triggered == m_bandwidth.event) { updateBandwidth(value); tmgr_trace_event_unref(&m_bandwidth.event); + } else if (triggered == m_latency.event) { updateLatency(value); tmgr_trace_event_unref(&m_latency.event); + } else if (triggered == m_stateEvent) { if (value > 0) turnOn(); diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index 7cdf4f554b..1fb97de3cd 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -47,18 +47,14 @@ public: NetworkCm02Model(); ~NetworkCm02Model() { } Link* createLink(const char *name, - double bw_initial, - tmgr_trace_t bw_trace, - double lat_initial, - tmgr_trace_t lat_trace, - int initiallyOn, - tmgr_trace_t state_trace, + double bw_initial, tmgr_trace_t bw_trace, + double lat_initial, tmgr_trace_t lat_trace, + int initiallyOn, tmgr_trace_t state_trace, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override; void updateActionsStateLazy(double now, double delta) override; void updateActionsStateFull(double now, double delta) override; - Action *communicate(NetCard *src, NetCard *dst, - double size, double rate) override; + Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override; bool next_occuring_event_isIdempotent() override {return true;} virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {}; protected: @@ -72,21 +68,17 @@ protected: class NetworkCm02Link : public Link { public: NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props, - lmm_system_t system, - double constraint_value, - int initiallyOn, - tmgr_trace_t state_trace, - double metric_peak, - tmgr_trace_t metric_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_link_sharing_policy_t policy); - void apply_event(tmgr_trace_iterator_t event_type, double value) override; + lmm_system_t system, + double constraint_value, + int initiallyOn, tmgr_trace_t state_trace, + double bw_peak, tmgr_trace_t bw_trace, + double lat_initial, tmgr_trace_t lat_trace, + e_surf_link_sharing_policy_t policy); + + void apply_event(tmgr_trace_iterator_t event, double value) override; void updateBandwidth(double value) override; void updateLatency(double value) override; virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {}; - - }; diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 224b4b9760..c095a6452d 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -401,7 +401,7 @@ NetworkNS3Link::~NetworkNS3Link() { } -void NetworkNS3Link::apply_event(tmgr_trace_iterator_t event_type, double value) +void NetworkNS3Link::apply_event(tmgr_trace_iterator_t event, double value) { THROW_UNIMPLEMENTED; } diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index 4afc93da4f..716dc4c2e9 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -68,7 +68,7 @@ public: double bw_initial, double lat_initial); ~NetworkNS3Link(); - void apply_event(tmgr_trace_iterator_t event_type, double value) override; + void apply_event(tmgr_trace_iterator_t event, double value) override; void updateBandwidth(double value) override {THROW_UNIMPLEMENTED;} void updateLatency(double value) override {THROW_UNIMPLEMENTED;} diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp index 7960dfc1c8..001aac90a1 100644 --- a/src/surf/storage_interface.cpp +++ b/src/surf/storage_interface.cpp @@ -140,7 +140,7 @@ bool Storage::isUsed() return false; } -void Storage::apply_event(tmgr_trace_iterator_t /*event_type*/, double /*value*/) +void Storage::apply_event(tmgr_trace_iterator_t /*event*/, double /*value*/) { THROW_UNIMPLEMENTED; } diff --git a/src/surf/storage_interface.hpp b/src/surf/storage_interface.hpp index 7f48207572..8848f3ab0e 100644 --- a/src/surf/storage_interface.hpp +++ b/src/surf/storage_interface.hpp @@ -140,14 +140,7 @@ public: /** @brief Check if the Storage is used (if an action currently uses its resources) */ bool isUsed() override; - /** - * @brief Update the state of the current Storage - * - * @param event_type [description] - * @param value [description] - * @param date [description] - */ - void apply_event(tmgr_trace_iterator_t event_type, double value) override; + void apply_event(tmgr_trace_iterator_t event, double value) override; void turnOn() override; void turnOff() override; diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 500219f58d..de6cfa5669 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -405,13 +405,12 @@ public: const char *getName(); /** - * @brief Update the state of the current Resource - * @details [TODO] + * @brief Apply an event of external load event to that storage * - * @param event_type [TODO] + * @param event What happened * @param value [TODO] */ - virtual void apply_event(tmgr_trace_iterator_t event_type, double value)=0; + virtual void apply_event(tmgr_trace_iterator_t event, double value)=0; /** @brief Check if the current Resource is used (if it currently serves an action) */ virtual bool isUsed()=0; -- 2.20.1