update things

diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp
index 0b5b174..db486e9 100644 (file)
--- a/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@ -125,11 +125,6 @@ public:
   }
 
   void* get_user_data() { return user_data_; }
-  XBT_ATTRIB_DEPRECATED_v323("Please use Activity::set_user_data()") AnyActivity* setUserData(void* data)
-  {
-    return set_user_data(data);
-  }
-  XBT_ATTRIB_DEPRECATED_v323("Please use Activity::get_user_data()") void* getUserData() { return user_data_; }
 };
 
 } // namespace s4u

diff --git a/include/simgrid/s4u/Exec.hpp b/include/simgrid/s4u/Exec.hpp
index 1e9de25..e55b407 100644 (file)
--- a/include/simgrid/s4u/Exec.hpp
+++ b/include/simgrid/s4u/Exec.hpp
@@ -62,8 +62,6 @@ public:
   ExecPtr set_priority(double priority);
   ExecPtr set_timeout(double timeout);
   Exec* cancel() override;
-  const std::string& get_name() const { return name_; }
-  const char* get_cname() const { return name_.c_str(); }
   Host* get_host() const;
   unsigned int get_host_number() const;
   double get_start_time() const;

diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp
index 7684d9c..0bee8d4 100644 (file)
--- a/src/s4u/s4u_Exec.cpp
+++ b/src/s4u/s4u_Exec.cpp
@@ -98,13 +98,6 @@ ExecPtr Exec::set_timeout(double timeout)
   return this;
 }
 
-ExecPtr Exec::set_name(const std::string& name)
-{
-  xbt_assert(state_ == State::INITED, "Cannot change the name of an exec after its start");
-  name_ = name;
-  return this;
-}
-
 /** @brief Retrieve the host on which this activity takes place.
  *  If it runs on more than one host, only the first host is returned.
  */
@@ -153,8 +146,8 @@ Exec* ExecSeq::start()
 {
   kernel::actor::simcall([this] {
     (*boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_))
-        .set_name(name_)
-        .set_tracing_category(tracing_category_)
+        .set_name(get_name())
+        .set_tracing_category(get_tracing_category())
         .set_sharing_penalty(1. / priority_)
         .set_bound(bound_)
         .set_flops_amount(flops_amount_)

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index 4cf33bc..8f1f764 100644 (file)
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -31,14 +31,14 @@ Io* Io::start()
   kernel::actor::simcall([this] {
     if (storage_) {
       (*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_))
-          .set_name(name_)
+          .set_name(get_name())
           .set_storage(storage_->get_impl())
           .set_size(size_)
           .set_type(type_)
           .start();
     } else {
       (*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_))
-          .set_name(name_)
+          .set_name(get_name())
           .set_disk(disk_->get_impl())
           .set_size(size_)
           .set_type(type_)