From b15676deb07a259d852b8166f915e064b93901f5 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 14 May 2017 22:57:04 +0200 Subject: [PATCH] tmgr: kill a parameter that nobody uses --- src/surf/cpu_interface.cpp | 4 ++-- src/surf/cpu_ti.cpp | 2 +- src/surf/network_interface.cpp | 6 +++--- src/surf/trace_mgr.cpp | 4 ++-- src/surf/trace_mgr.hpp | 2 +- src/surf/trace_mgr_test.cpp | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 040472e35d..6443263e07 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -174,13 +174,13 @@ void Cpu::setStateTrace(tmgr_trace_t trace) { xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->cname()); - stateEvent_ = future_evt_set->add_trace(trace, 0.0, this); + stateEvent_ = future_evt_set->add_trace(trace, this); } void Cpu::setSpeedTrace(tmgr_trace_t trace) { xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->cname()); - speed_.event = future_evt_set->add_trace(trace, 0.0, this); + speed_.event = future_evt_set->add_trace(trace, this); } diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 7f0016036f..a03ab808fa 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -424,7 +424,7 @@ void CpuTi::setSpeedTrace(tmgr_trace_t trace) if (trace && trace->event_list.size() > 1) { s_tmgr_event_t val = trace->event_list.back(); if (val.delta < 1e-12) - speed_.event = future_evt_set->add_trace(tmgr_empty_trace_new(), 0.0, this); + speed_.event = future_evt_set->add_trace(tmgr_empty_trace_new(), this); } } diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 13ce41348d..8b4f978be4 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -169,17 +169,17 @@ namespace simgrid { void LinkImpl::setStateTrace(tmgr_trace_t trace) { xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", cname()); - stateEvent_ = future_evt_set->add_trace(trace, 0.0, this); + stateEvent_ = future_evt_set->add_trace(trace, this); } void LinkImpl::setBandwidthTrace(tmgr_trace_t trace) { xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", cname()); - bandwidth_.event = future_evt_set->add_trace(trace, 0.0, this); + bandwidth_.event = future_evt_set->add_trace(trace, this); } void LinkImpl::setLatencyTrace(tmgr_trace_t trace) { xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", cname()); - latency_.event = future_evt_set->add_trace(trace, 0.0, this); + latency_.event = future_evt_set->add_trace(trace, this); } diff --git a/src/surf/trace_mgr.cpp b/src/surf/trace_mgr.cpp index 9029597874..1d988b0917 100644 --- a/src/surf/trace_mgr.cpp +++ b/src/surf/trace_mgr.cpp @@ -118,7 +118,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, surf::Resource* resource) { tmgr_trace_iterator_t trace_iterator = nullptr; @@ -129,7 +129,7 @@ tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t xbt_assert((trace_iterator->idx < trace->event_list.size()), "Your trace should have at least one event!"); - xbt_heap_push(p_heap, trace_iterator, start_time); + xbt_heap_push(p_heap, trace_iterator, 0. /*start_time*/); return trace_iterator; } diff --git a/src/surf/trace_mgr.hpp b/src/surf/trace_mgr.hpp index cc9c16ee52..13e91bbea3 100644 --- a/src/surf/trace_mgr.hpp +++ b/src/surf/trace_mgr.hpp @@ -84,7 +84,7 @@ public: virtual ~future_evt_set(); double next_date() const; tmgr_trace_iterator_t pop_leq(double date, double *value, simgrid::surf::Resource** resource); - tmgr_trace_iterator_t add_trace(tmgr_trace_t trace, double start_time, simgrid::surf::Resource *resource); + tmgr_trace_iterator_t add_trace(tmgr_trace_t trace, simgrid::surf::Resource * resource); private: // TODO: use a boost type for the heap (or a ladder queue) diff --git a/src/surf/trace_mgr_test.cpp b/src/surf/trace_mgr_test.cpp index 0ef287dc90..2cf197bae5 100644 --- a/src/surf/trace_mgr_test.cpp +++ b/src/surf/trace_mgr_test.cpp @@ -58,7 +58,7 @@ static void trace2vector(const char* str, std::vector* whereto) MockedResource daResource; simgrid::trace_mgr::future_evt_set fes; - tmgr_trace_iterator_t insertedIt = fes.add_trace(trace, 0.0, &daResource); + tmgr_trace_iterator_t insertedIt = fes.add_trace(trace, &daResource); while (fes.next_date() <= 20.0 && fes.next_date() >= 0) { thedate = fes.next_date(); -- 2.20.1