Deprecate Activity::{get,set}_user_data().

Use Extendable::{get,set}_data instead.

diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp
index 3d6b355..df49b9e 100644 (file)
--- a/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@ -215,7 +215,6 @@ private:
 template <class AnyActivity> class Activity_T : public Activity {
   std::string name_             = "unnamed";
   std::string tracing_category_ = "";
-  void* user_data_              = nullptr;
 
 public:
   AnyActivity* add_successor(ActivityPtr a)
@@ -245,13 +244,16 @@ public:
   }
   const std::string& get_tracing_category() const { return tracing_category_; }
 
-  AnyActivity* set_user_data(void* data)
+  XBT_ATTRIB_DEPRECATED_v334("Please use Activity::set_data()") AnyActivity* set_user_data(void* data)
   {
-    user_data_ = data;
+    set_data(data);
     return static_cast<AnyActivity*>(this);
   }
 
-  void* get_user_data() const { return user_data_; }
+  XBT_ATTRIB_DEPRECATED_v334("Please use Activity::get_data<>()") void* get_user_data() const
+  {
+    return get_data<void>();
+  }
 
   AnyActivity* vetoable_start()
   {

diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp
index d3a766b..81f3df1 100644 (file)
--- a/src/s4u/s4u_Comm.cpp
+++ b/src/s4u/s4u_Comm.cpp
@@ -221,12 +221,12 @@ Comm* Comm::start()
   } else if (src_buff_ != nullptr) { // Sender side
     on_send(*this);
     pimpl_ = simcall_comm_isend(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
-                                clean_fun_, copy_data_function_, get_user_data(), detached_);
+                                clean_fun_, copy_data_function_, get_data<void>(), detached_);
   } else if (dst_buff_ != nullptr) { // Receiver side
     xbt_assert(not detached_, "Receive cannot be detached");
     on_recv(*this);
     pimpl_ = simcall_comm_irecv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_,
-                                copy_data_function_, get_user_data(), rate_);
+                                copy_data_function_, get_data<void>(), rate_);
 
   } else {
     xbt_die("Cannot start a communication before specifying whether we are the sender or the receiver");
@@ -265,12 +265,12 @@ Comm* Comm::wait_for(double timeout)
       } else if (src_buff_ != nullptr) {
         on_send(*this);
         simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
-                          copy_data_function_, get_user_data(), timeout);
+                          copy_data_function_, get_data<void>(), timeout);
 
       } else { // Receiver
         on_recv(*this);
         simcall_comm_recv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_,
-                          get_user_data(), timeout, rate_);
+                          get_data<void>(), timeout, rate_);
       }
       break;