remove the last remainings of the addTraces() pimple \o/

At least. That was not easy to untangle that.

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 04d4f3e..0a95337 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -101,11 +101,6 @@ double CpuCas01Model::next_occuring_event_full(double /*now*/)
   return Model::shareResourcesMaxMin(getRunningActionSet(), p_maxminSystem, lmm_solve);
 }
 
-void CpuCas01Model::addTraces()
-{
-  THROW_DEADCODE;
-}
-
 /************
  * Resource *
  ************/

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 447553a..6580407 100644 (file)
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -33,7 +33,6 @@ public:
                           int initiallyOn,
                           tmgr_trace_t state_trace) override;
   double next_occuring_event_full(double now) override;
-  void addTraces() override;
   ActionList *p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
 };
 

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index ec7f4e6..ad7f673 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -476,11 +476,6 @@ void CpuTiModel::updateActionsState(double now, double /*delta*/)
   }
 }
 
-void CpuTiModel::addTraces()
-{
-THROW_DEADCODE;
-}
-
 /************
  * Resource *
  ************/

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index f479e39..3212b62 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -160,7 +160,6 @@ public:
                           tmgr_trace_t state_trace) override;
   double next_occuring_event(double now) override;
   void updateActionsState(double now, double delta) override;
-  void addTraces() override;
 
   ActionList *p_runningActionSetThatDoesNotNeedBeingChecked;
   CpuTiList *p_modifiedCpu;

diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp
index 1ce8ee3..d2fc8d0 100644 (file)
--- a/src/surf/host_interface.hpp
+++ b/src/surf/host_interface.hpp
@@ -53,7 +53,6 @@ public:
   ~HostModel() override {}
 
   Host *createHost(const char *name, NetCard *net, Cpu *cpu, xbt_dict_t props);
-  void addTraces() override {DIE_IMPOSSIBLE;}
 
   virtual void adjustWeightOfDummyCpuActions();
   virtual Action *executeParallelTask(int host_nb,

diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp
index c062c50..e31cc32 100644 (file)
--- a/src/surf/host_ptask_L07.cpp
+++ b/src/surf/host_ptask_L07.cpp
@@ -329,11 +329,6 @@ Link* NetworkL07Model::createLink(const char *name,
   return link;
 }
 
-void HostL07Model::addTraces()
-{
-  THROW_DEADCODE;
-}
-
 /************
  * Resource *
  ************/

diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp
index d2a6029..b10d8c9 100644 (file)
--- a/src/surf/host_ptask_L07.hpp
+++ b/src/surf/host_ptask_L07.hpp
@@ -48,8 +48,6 @@ public:
   Action *executeParallelTask(int host_nb, sg_host_t *host_list,
                 double *flops_amount, double *bytes_amount,
                 double rate) override;
-
-  void addTraces() override;
 };
 
 class CpuL07Model : public CpuModel {
@@ -62,8 +60,6 @@ public:
                           tmgr_trace_t speedTrace, int core,
                           int initiallyOn,
                           tmgr_trace_t state_trace) override;
-  void addTraces() override {DIE_IMPOSSIBLE;};
-
   HostL07Model *p_hostModel;
 };
 
@@ -82,7 +78,6 @@ public:
       xbt_dict_t properties) override;
 
   Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
-  void addTraces() override {DIE_IMPOSSIBLE;};
   bool next_occuring_event_isIdempotent() override {return true;}
 
   HostL07Model *p_hostModel;

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 9322e1b..1f2794f 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -454,10 +454,6 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst,
   return action;
 }
 
-void NetworkCm02Model::addTraces(){
-THROW_DEADCODE;
-}
-
 /************
  * Resource *
  ************/

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index c2accc5..7cdf4f5 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -55,7 +55,6 @@ public:
       tmgr_trace_t state_trace,
       e_surf_link_sharing_policy_t policy,
       xbt_dict_t properties) override;
-  void addTraces() override;
   void updateActionsStateLazy(double now, double delta) override;
   void updateActionsStateFull(double now, double delta) override;
   Action *communicate(NetCard *src, NetCard *dst,

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 0096b3d..f428c3a 100644 (file)
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -41,7 +41,6 @@ public:
       int initiallyOn, tmgr_trace_t state_trace,
       e_surf_link_sharing_policy_t policy,
       xbt_dict_t properties)          override { DIE_IMPOSSIBLE; }
-  void addTraces()                    override { DIE_IMPOSSIBLE; }
 };
 
 /**********

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 9194532..4afc93d 100644 (file)
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -57,7 +57,6 @@ public:
   double next_occuring_event(double now) override;
   bool next_occuring_event_isIdempotent() {return false;}
   void updateActionsState(double now, double delta) override;
-  void addTraces() override {DIE_IMPOSSIBLE;}
 };
 
 /************

diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp
index 8d9e65c..6a5eabd 100644 (file)
--- a/src/surf/storage_n11.hpp
+++ b/src/surf/storage_n11.hpp
@@ -32,7 +32,6 @@ public:
   ~StorageN11Model();
   Storage *createStorage(const char* id, const char* type_id,
        const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach) override;
-  void addTraces() override {DIE_IMPOSSIBLE;}
   double next_occuring_event(double now) override;
   void updateActionsState(double now, double delta) override;
 };

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 1635966..500219f 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -273,8 +273,6 @@ public:
   Model();
   virtual ~Model();
 
-  virtual void addTraces() =0;
-
   /** @brief Get the set of [actions](@ref Action) in *ready* state */
   virtual ActionList* getReadyActionSet() {return p_readyActionSet;}