X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55b17883ef3f90e6d5899e321610d6716e2d0928..8bfd0f3647c66d4f6c20019475ebb0bfb8018293:/src/msg/msg_private.hpp

diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp
index 13f17f4973..505c892d4c 100644
--- a/src/msg/msg_private.hpp
+++ b/src/msg/msg_private.hpp
@@ -10,16 +10,16 @@
 #include "simgrid/msg.h"
 #include "src/kernel/activity/CommImpl.hpp"
 #include <simgrid/modelchecker.h>
+#include <xbt/Extendable.hpp>
 
 #include <cmath>
 
 /**************** datatypes **********************************/
 namespace simgrid {
 namespace msg {
-class Task {
+class Task : public xbt::Extendable<Task> {
   std::string name_             = "";
   std::string tracing_category_ = "";
-  void* userdata_               = nullptr;
   long long int id_;
 
   double timeout_  = 0.0;
@@ -59,8 +59,8 @@ public:
   void set_tracing_category(const char* category) { tracing_category_ = category ? std::string(category) : ""; }
   const std::string& get_tracing_category() { return tracing_category_; }
   bool has_tracing_category() { return not tracing_category_.empty(); }
-  void* get_user_data() { return userdata_; }
-  void set_user_data(void* data) { userdata_ = data; }
+  XBT_ATTRIB_DEPRECATED_v329("Please use set_data()") void* get_user_data() { return get_data(); }
+  XBT_ATTRIB_DEPRECATED_v329("Please use get_data()") void set_user_data(void* data) { set_data(data); }
   long long int get_id() { return id_; }
   double get_priority() { return priority_; }
   void set_priority(double priority);
@@ -101,16 +101,6 @@ public:
   msg_error_t get_status() { return status_; }
 };
 
-class ActorUserData {
-  void* userdata_      = nullptr;
-
-public:
-  static xbt::Extension<simgrid::s4u::Actor, ActorUserData> EXTENSION_ID;
-
-  void set_user_data(void* data) { userdata_ = data; }
-  void* get_user_data() { return userdata_; }
-};
-
 } // namespace msg
 } // namespace simgrid
 
@@ -125,6 +115,5 @@ struct MSG_Global_t {
 XBT_PUBLIC_DATA MSG_Global_t* msg_global;
 
 /*************************************************************/
-XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size);
 
 #endif