From: Arnaud Giersch Date: Fri, 11 Oct 2019 12:41:08 +0000 (+0200) Subject: Undeprecate SIMIX_process_self_{get,set}_data. X-Git-Tag: v3.25~548 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/412a7b3712a71356caefcff17c554dbdd22284d2?hp=f5f972472de4503232dcb8658fb650b6f7c40b80 Undeprecate SIMIX_process_self_{get,set}_data. It's used by user code (e.g. StarPU) and the suggested replacement cannot work since ActorImpl is not part of the public API. --- diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index db8f5dc34e..296d7071f4 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -133,9 +133,8 @@ 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_ATTRIB_DEPRECATED_v325("Please use ActorImpl::set_user_data()") XBT_PUBLIC - void SIMIX_process_self_set_data(void* data); -XBT_ATTRIB_DEPRECATED_v325("Please use ActorImpl::get_user_data()") XBT_PUBLIC void* SIMIX_process_self_get_data(); +XBT_PUBLIC void SIMIX_process_self_set_data(void* data); +XBT_PUBLIC void* SIMIX_process_self_get_data(); XBT_ATTRIB_DEPRECATED_v325("Please manifest if you actually need this function") XBT_PUBLIC int SIMIX_process_has_pending_comms(smx_actor_t process); XBT_ATTRIB_DEPRECATED_v325("Please use SIMIX_process_on_exit(smx_actor_t, const std::function&)") XBT_PUBLIC diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 4c83228784..a599e878da 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -557,7 +557,7 @@ int SIMIX_process_count() return simix_global->process_list.size(); } -void* SIMIX_process_self_get_data() // deprecated +void* SIMIX_process_self_get_data() { smx_actor_t self = SIMIX_process_self(); @@ -567,7 +567,7 @@ void* SIMIX_process_self_get_data() // deprecated return self->get_user_data(); } -void SIMIX_process_self_set_data(void* data) // deprecated +void SIMIX_process_self_set_data(void* data) { SIMIX_process_self()->set_user_data(data); }