Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
tmgr: kill a parameter that nobody uses
authorMartin Quinson <martin.quinson@loria.fr>
Sun, 14 May 2017 20:57:04 +0000 (22:57 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Sun, 14 May 2017 20:59:27 +0000 (22:59 +0200)
src/surf/cpu_interface.cpp
src/surf/cpu_ti.cpp
src/surf/network_interface.cpp
src/surf/trace_mgr.cpp
src/surf/trace_mgr.hpp
src/surf/trace_mgr_test.cpp

index 040472e..6443263 100644 (file)
@@ -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);
 }
 
 
index 7f00160..a03ab80 100644 (file)
@@ -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);
   }
 }
 
index 13ce413..8b4f978 100644 (file)
@@ -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);
     }
 
 
index 9029597..1d988b0 100644 (file)
@@ -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;
 }
index cc9c16e..13e91bb 100644 (file)
@@ -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)
index 0ef287d..2cf197b 100644 (file)
@@ -58,7 +58,7 @@ static void trace2vector(const char* str, std::vector<Evt>* 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();