X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79f4c4c467150b3bea841b968cabd629e9d9282a..173e6cb373d42d61f6eb620771dc5a2e5492173b:/src/kernel/actor/ActorImpl.hpp diff --git a/src/kernel/actor/ActorImpl.hpp b/src/kernel/actor/ActorImpl.hpp index ee082de7a6..e368b49cd8 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; @@ -34,9 +35,10 @@ public: ActorImpl& operator=(const ActorImpl&) = delete; ~ActorImpl(); + static ActorImpl* self(); double get_kill_time(); void set_kill_time(double kill_time); - boost::intrusive::list_member_hook<> host_process_list_hook; /* simgrid::simix::Host::process_list */ + boost::intrusive::list_member_hook<> host_actor_list_hook; /* simgrid::simix::Host::process_list */ boost::intrusive::list_member_hook<> smx_destroy_list_hook; /* simix_global->actors_to_destroy */ boost::intrusive::list_member_hook<> smx_synchro_hook; /* {mutex,cond,sem}->sleeping */ @@ -46,7 +48,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_; }