From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Sun, 3 Nov 2019 17:36:03 +0000 (+0100)
Subject: user data doesn't have to be stored at kernel level
X-Git-Tag: v3.25~456
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/476af0bd54f9d111a5adae1d316faa4625b2411b

user data doesn't have to be stored at kernel level
---

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index c04265f29e..f2d5e439d5 100644
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -109,8 +109,9 @@ SG_BEGIN_DECL
 XBT_PUBLIC int SIMIX_process_count();
 XBT_PUBLIC smx_actor_t SIMIX_process_self();
 XBT_PUBLIC const char* SIMIX_process_self_get_name();
-XBT_PUBLIC void SIMIX_process_self_set_data(void* data);
-XBT_PUBLIC void* SIMIX_process_self_get_data();
+XBT_ATTRIB_DEPRECATED_v329("This function will be removed in 3.29") XBT_PUBLIC
+    void SIMIX_process_self_set_data(void* data);
+XBT_ATTRIB_DEPRECATED_v329("This function will be removed in 3.29") XBT_PUBLIC void* SIMIX_process_self_get_data();
 SG_END_DECL
 
 #ifdef __cplusplus
diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp
index 1d2d122d7a..b428cf68d8 100644
--- a/src/kernel/actor/ActorImpl.cpp
+++ b/src/kernel/actor/ActorImpl.cpp
@@ -534,6 +534,7 @@ int SIMIX_process_count()
   return simix_global->process_list.size();
 }
 
+// XBT_DEPRECATED_v329
 void* SIMIX_process_self_get_data()
 {
   smx_actor_t self = SIMIX_process_self();
@@ -544,6 +545,7 @@ void* SIMIX_process_self_get_data()
   return self->get_user_data();
 }
 
+// XBT_DEPRECATED_v329
 void SIMIX_process_self_set_data(void* data)
 {
   SIMIX_process_self()->set_user_data(data);
diff --git a/src/kernel/actor/ActorImpl.hpp b/src/kernel/actor/ActorImpl.hpp
index 21373eac61..423debc9a0 100644
--- a/src/kernel/actor/ActorImpl.hpp
+++ b/src/kernel/actor/ActorImpl.hpp
@@ -21,6 +21,7 @@ namespace actor {
 
 class XBT_PUBLIC ActorImpl : public surf::PropertyHolder {
   s4u::Host* host_   = nullptr; /* the host on which the actor is running */
+  // XBT_DEPRECATED_v329
   void* userdata_    = nullptr; /* kept for compatibility, it should be replaced with moddata */
   aid_t pid_         = 0;
   aid_t ppid_        = -1;
@@ -46,7 +47,9 @@ public:
   // Accessors to private fields
   s4u::Host* get_host() { return host_; }
   void set_host(s4u::Host* dest);
+  // XBT_DEPRECATED_v329
   void* get_user_data() { return userdata_; }
+  // XBT_DEPRECATED_v329
   void set_user_data(void* data) { userdata_ = data; }
   aid_t get_pid() const { return pid_; }
   aid_t get_ppid() const { return ppid_; }