kill an unused parameter in the trace_mgr

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 676e706..5f99332 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -123,7 +123,7 @@ void CpuCas01Model::addTraces()
     xbt_assert(host, "Host %s undefined", elm);
     xbt_assert(trace, "Trace %s undefined", trace_name);
 
-    host->setStateEvent(future_evt_set->add_trace(trace, 0.0, 0, host));
+    host->setStateEvent(future_evt_set->add_trace(trace, 0.0, host));
   }
 
   xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
@@ -133,7 +133,7 @@ void CpuCas01Model::addTraces()
     xbt_assert(host, "Host %s undefined", elm);
     xbt_assert(trace, "Trace %s undefined", trace_name);
 
-    host->setPowerEvent(future_evt_set->add_trace(trace, 0.0, 0, host));
+    host->setPowerEvent(future_evt_set->add_trace(trace, 0.0, host));
   }
 }
 
@@ -154,10 +154,10 @@ CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t s
 
   m_core = core;
   if (speedTrace)
-    p_speedEvent = future_evt_set->add_trace(speedTrace, 0.0, 0, this);
+    p_speedEvent = future_evt_set->add_trace(speedTrace, 0.0, this);
 
   if (stateTrace)
-    p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, 0, this);
+    p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this);
 }
 
 CpuCas01::~CpuCas01()

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 1d6ea1e..d422089 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -515,7 +515,7 @@ void CpuTiModel::addTraces()
       continue;
     }
     XBT_DEBUG("Add state trace: %s to CPU(%s)", trace_name, elm);
-    cpu->p_stateEvent = future_evt_set->add_trace(trace, 0.0, 0, cpu);
+    cpu->p_stateEvent = future_evt_set->add_trace(trace, 0.0, cpu);
   }
 
   xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
@@ -538,7 +538,7 @@ void CpuTiModel::addTraces()
                         xbt_dynar_length(trace->s_list.event_list) - 1, &val);
       if (val.delta == 0) {
         cpu->p_speedEvent =
-            future_evt_set->add_trace(tmgr_empty_trace_new(), cpu->p_availTrace->m_lastTime, 0, cpu);
+            future_evt_set->add_trace(tmgr_empty_trace_new(), cpu->p_availTrace->m_lastTime, cpu);
       }
     }
   }
@@ -564,7 +564,7 @@ CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
   XBT_DEBUG("CPU create: peak=%f", m_speedPeak);
 
   if (stateTrace)
-    p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, 0, this);
+    p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this);
 
   if (speedTrace && xbt_dynar_length(speedTrace->s_list.event_list) > 1) {
        s_tmgr_event_t val;
@@ -573,7 +573,7 @@ CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
                       xbt_dynar_length(speedTrace->s_list.event_list) - 1, &val);
     if (val.delta == 0) {
       p_speedEvent =
-          future_evt_set->add_trace(tmgr_empty_trace_new(), p_availTrace->m_lastTime, 0, this);
+          future_evt_set->add_trace(tmgr_empty_trace_new(), p_availTrace->m_lastTime, this);
     }
   }
 }

diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp
index f5d4fe9..1d230ef 100644 (file)
--- a/src/surf/host_ptask_L07.cpp
+++ b/src/surf/host_ptask_L07.cpp
@@ -351,7 +351,7 @@ void HostL07Model::addTraces()
     xbt_assert(host, "Host %s undefined", elm);
     xbt_assert(trace, "Trace %s undefined", trace_name);
 
-    host->p_stateEvent = future_evt_set->add_trace(trace, 0.0, 0, host);
+    host->p_stateEvent = future_evt_set->add_trace(trace, 0.0, host);
   }
 
   xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
@@ -361,7 +361,7 @@ void HostL07Model::addTraces()
     xbt_assert(host, "Host %s undefined", elm);
     xbt_assert(trace, "Trace %s undefined", trace_name);
 
-    host->p_speedEvent = future_evt_set->add_trace(trace, 0.0, 0, host);
+    host->p_speedEvent = future_evt_set->add_trace(trace, 0.0, host);
   }
 
   /* Connect traces relative to network */
@@ -372,7 +372,7 @@ void HostL07Model::addTraces()
     xbt_assert(link, "Link %s undefined", elm);
     xbt_assert(trace, "Trace %s undefined", trace_name);
 
-    link->p_stateEvent = future_evt_set->add_trace(trace, 0.0, 0, link);
+    link->p_stateEvent = future_evt_set->add_trace(trace, 0.0, link);
   }
 
   xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
@@ -382,7 +382,7 @@ void HostL07Model::addTraces()
     xbt_assert(link, "Link %s undefined", elm);
     xbt_assert(trace, "Trace %s undefined", trace_name);
 
-    link->p_bwEvent = future_evt_set->add_trace(trace, 0.0, 0, link);
+    link->p_bwEvent = future_evt_set->add_trace(trace, 0.0, link);
   }
 
   xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
@@ -392,7 +392,7 @@ void HostL07Model::addTraces()
     xbt_assert(link, "Link %s undefined", elm);
     xbt_assert(trace, "Trace %s undefined", trace_name);
 
-    link->p_latEvent = future_evt_set->add_trace(trace, 0.0, 0, link);
+    link->p_latEvent = future_evt_set->add_trace(trace, 0.0, link);
   }
 }
 
@@ -410,12 +410,10 @@ CpuL07::CpuL07(CpuL07Model *model, simgrid::s4u::Host *host,
   p_constraint = lmm_constraint_new(model->getMaxminSystem(), this, xbt_dynar_get_as(speedPeakList,pstate,double) * speedScale);
 
   if (speedTrace)
-    p_speedEvent = future_evt_set->add_trace(speedTrace, 0.0, 0, this);
-  else
-    p_speedEvent = NULL;
+    p_speedEvent = future_evt_set->add_trace(speedTrace, 0.0, this);
 
   if (state_trace)
-       p_stateEvent = future_evt_set->add_trace(state_trace, 0.0, 0, this);
+    p_stateEvent = future_evt_set->add_trace(state_trace, 0.0, this);
 }
 
 CpuL07::~CpuL07()
@@ -434,7 +432,7 @@ LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props,
 {
   m_bwCurrent = bw_initial;
   if (bw_trace)
-    p_bwEvent = future_evt_set->add_trace(bw_trace, 0.0, 0, this);
+    p_bwEvent = future_evt_set->add_trace(bw_trace, 0.0, this);
 
   if (initiallyOn)
     turnOn();
@@ -443,7 +441,7 @@ LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props,
   m_latCurrent = lat_initial;
 
   if (lat_trace)
-    p_latEvent = future_evt_set->add_trace(lat_trace, 0.0, 0, this);
+    p_latEvent = future_evt_set->add_trace(lat_trace, 0.0, this);
 
   if (policy == SURF_LINK_FATPIPE)
        lmm_constraint_shared(getConstraint());

diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp
index 89d109f..71728ac 100644 (file)
--- a/src/surf/host_ptask_L07.hpp
+++ b/src/surf/host_ptask_L07.hpp
@@ -94,8 +94,8 @@ public:
 
 class CpuL07 : public Cpu {
   friend void HostL07Model::addTraces();
-  tmgr_trace_iterator_t p_stateEvent;
-  tmgr_trace_iterator_t p_speedEvent;
+  tmgr_trace_iterator_t p_stateEvent = nullptr;
+  tmgr_trace_iterator_t p_speedEvent = nullptr;
 public:
   CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeakList, int pstate,
                 double power_scale, tmgr_trace_t power_trace,

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 503bf1b..aa99623 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -479,7 +479,7 @@ void NetworkCm02Model::addTraces(){
                "Cannot connect trace %s to link %s: trace undefined",
                trace_name, elm);
 
-    link->p_stateEvent = future_evt_set->add_trace(trace, 0.0, 0, link);
+    link->p_stateEvent = future_evt_set->add_trace(trace, 0.0, link);
   }
 
   xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
@@ -492,7 +492,7 @@ void NetworkCm02Model::addTraces(){
                "Cannot connect trace %s to link %s: trace undefined",
                trace_name, elm);
 
-    link->p_speed.event = future_evt_set->add_trace(trace, 0.0, 0, link);
+    link->p_speed.event = future_evt_set->add_trace(trace, 0.0, link);
   }
 
   xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
@@ -505,7 +505,7 @@ void NetworkCm02Model::addTraces(){
                "Cannot connect trace %s to link %s: trace undefined",
                trace_name, elm);
 
-    link->p_latEvent = future_evt_set->add_trace(trace, 0.0, 0, link);
+    link->p_latEvent = future_evt_set->add_trace(trace, 0.0, link);
   }
 }
 
@@ -533,13 +533,13 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_
   p_speed.scale = 1.0;
   p_speed.peak = metric_peak;
   if (metric_trace)
-    p_speed.event = fes->add_trace(metric_trace, 0.0, 0, this);
+    p_speed.event = fes->add_trace(metric_trace, 0.0, this);
   else
     p_speed.event = NULL;
 
   m_latCurrent = lat_initial;
   if (lat_trace)
-       p_latEvent = fes->add_trace(lat_trace, 0.0, 0, this);
+       p_latEvent = fes->add_trace(lat_trace, 0.0, this);
 
   if (policy == SURF_LINK_FATPIPE)
        lmm_constraint_shared(getConstraint());

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 323652b..0996ae3 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -207,7 +207,7 @@ Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t prop
   PropertyHolder(props)
 {
   if (state_trace)
-    p_stateEvent = fes->add_trace(state_trace, 0.0, 0, this);
+    p_stateEvent = fes->add_trace(state_trace, 0.0, this);
 
   links->insert({name, this});
   XBT_DEBUG("Create link '%s'",name);

diff --git a/src/surf/trace_mgr.cpp b/src/surf/trace_mgr.cpp
index 79a6e06..bc84964 100644 (file)
--- a/src/surf/trace_mgr.cpp
+++ b/src/surf/trace_mgr.cpp
@@ -375,14 +375,13 @@ void tmgr_trace_free(tmgr_trace_t trace)
 tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::add_trace(
     tmgr_trace_t trace,
     double start_time,
-    unsigned int offset,
     void *resource)
 {
   tmgr_trace_iterator_t trace_iterator = NULL;
 
   trace_iterator = xbt_new0(s_tmgr_trace_event_t, 1);
   trace_iterator->trace = trace;
-  trace_iterator->idx = offset;
+  trace_iterator->idx = 0;
   trace_iterator->resource = resource;
 
   if(trace->type == e_trace_list) {

diff --git a/src/surf/trace_mgr.hpp b/src/surf/trace_mgr.hpp
index 617c6bd..a6af8e0 100644 (file)
--- a/src/surf/trace_mgr.hpp
+++ b/src/surf/trace_mgr.hpp
@@ -108,7 +108,6 @@ public:
   tmgr_trace_iterator_t add_trace(
       tmgr_trace_t trace,
       double start_time,
-      unsigned int offset,
       void *model);
 
 private:

diff --git a/teshsuite/surf/trace_usage/trace_usage.cpp b/teshsuite/surf/trace_usage/trace_usage.cpp
index 595d649..3cb5899 100644 (file)
--- a/teshsuite/surf/trace_usage/trace_usage.cpp
+++ b/teshsuite/surf/trace_usage/trace_usage.cpp
@@ -29,8 +29,8 @@ static void test(void)
   char *host_A = strdup("Host A");
   char *host_B = strdup("Host B");
 
-  fes->add_trace(trace_A, 1.0, 2, host_A);
-  fes->add_trace(trace_B, 0.0, 0, host_B);
+  fes->add_trace(trace_A, 1.0, host_A);
+  fes->add_trace(trace_B, 0.0, host_B);
 
   while ((next_event_date = fes->next_date()) != -1.0) {
     XBT_DEBUG("%g" " : \n", next_event_date);