From e7d1d5c0992980f857cb281b7f168b1ca9b54297 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 22 Mar 2018 15:20:41 +0100 Subject: [PATCH] seek and destroy more of MSG out of include/ --- include/simgrid/host.h | 14 +++++++------- include/simgrid/s4u/Engine.hpp | 4 ++-- include/simgrid/simix.h | 2 +- include/smpi/smpi.h | 2 +- include/xbt/base.h | 10 +++++----- include/xbt/str.h | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/simgrid/host.h b/include/simgrid/host.h index 57e7e3e446..75aceb87ed 100644 --- a/include/simgrid/host.h +++ b/include/simgrid/host.h @@ -25,7 +25,7 @@ SG_BEGIN_DECL() XBT_PUBLIC sg_host_t* sg_host_list(); /** \ingroup m_host_management - * \brief Return the current number MSG hosts. + * \brief Return the current number of hosts. */ XBT_PUBLIC size_t sg_host_count(); @@ -40,7 +40,7 @@ XBT_PUBLIC size_t sg_host_extension_create(void (*deleter)(void*)); XBT_PUBLIC void* sg_host_extension_get(sg_host_t host, size_t rank); /** \ingroup m_host_management - * \brief Finds a msg_host_t using its name. + * \brief Finds a sg_host_t using its name. * * This is a name directory service * \param name the name of an host. @@ -50,20 +50,20 @@ XBT_PUBLIC sg_host_t sg_host_by_name(const char* name); /** \ingroup m_host_management * - * \brief Return the name of the #msg_host_t. */ + * \brief Return the name of the #sg_host_t. */ XBT_PUBLIC const char* sg_host_get_name(sg_host_t host); // ========== User Data ============== /** \ingroup m_host_management * - * \brief Return the user data of a #msg_host_t. + * \brief Return the user data of a #sg_host_t. * * This functions returns the user data associated to \a host if it is possible. */ XBT_PUBLIC void* sg_host_user(sg_host_t host); /** \ingroup m_host_management * - * \brief Set the user data of a #msg_host_t. + * \brief Set the user data of a #sg_host_t. * * This functions attach \a data to \a host if it is possible. */ @@ -74,7 +74,7 @@ XBT_PUBLIC void sg_host_user_destroy(sg_host_t host); /** \ingroup m_host_management * \brief Return the list of mount point names on an host. * \param host a host - * \return a dict containing all mount point on the host (mount_name => msg_storage_t) + * \return a dict containing all mount point on the host (mount_name => sg_storage_t) */ XBT_PUBLIC xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host); @@ -99,7 +99,7 @@ XBT_PUBLIC int sg_host_core_count(sg_host_t host); /** \ingroup m_process_management * \brief Return the location on which a process is running. * \param process a process (nullptr means the current one) - * \return the msg_host_t corresponding to the location on which \a process is running. + * \return the sg_host_t corresponding to the location on which \a process is running. */ XBT_PUBLIC sg_host_t sg_host_self(); diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp index 232f0f0ea6..636f678ed2 100644 --- a/include/simgrid/s4u/Engine.hpp +++ b/include/simgrid/s4u/Engine.hpp @@ -46,7 +46,7 @@ public: /** Registers a function as the default main function of actors * * It will be used as fallback when the function requested from the deployment file was not registered. - * It is used for trace-based simulations (see examples/msg/actions). + * It is used for trace-based simulations (see examples/s4u/replay-comms and similar). */ void registerDefault(int (*code)(int, char**)); @@ -139,7 +139,7 @@ private: * right before the actual simulation starts. */ extern XBT_PUBLIC xbt::signal onPlatformCreated; -/** Callback fired when the main simulation loop ends, just before MSG_run (or similar) ends */ +/** Callback fired when the main simulation loop ends, just before the end of Engine::run() */ extern XBT_PUBLIC xbt::signal onSimulationEnd; /** Callback fired when the time jumps into the future */ diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 6bd4bf6231..51196db6de 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -194,7 +194,7 @@ XBT_PUBLIC smx_actor_t simcall_process_create(const char* name, xbt_main_func_t #endif XBT_PUBLIC void simcall_process_killall(); -XBT_PUBLIC void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const char* msg); +XBT_PUBLIC void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const char* mesg); /* Process handling */ XBT_PUBLIC void simcall_process_cleanup(smx_actor_t process); diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index ba669e79dc..0f28c90ac7 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -934,7 +934,7 @@ XBT_PUBLIC void smpi_sample_3(int global, const char* file, int line); /** * Need a public setter for SMPI copy_callback function, so users can define - * their own while still using default SIMIX_copy_callback for MSG copies. + * their own while still using default SIMIX_copy_callback for S4U copies. */ XBT_PUBLIC void smpi_comm_set_copy_data_callback(void (*callback)(smx_activity_t, void*, size_t)); diff --git a/include/xbt/base.h b/include/xbt/base.h index 24f28c2f94..c4579cf727 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -53,7 +53,7 @@ #define XBT_ATTRIB_UNUSED [[maybe_unused]] #endif #if __cplusplus >= 201402L -#define XBT_ATTRIB_DEPRECATED(msg) [[deprecated(msg)]] +#define XBT_ATTRIB_DEPRECATED(mesg) [[deprecated(mesg)]] #endif #elif defined(__STDC_VERSION__) #if __STDC_VERSION__ >= 201112L @@ -68,12 +68,12 @@ #define XBT_ATTRIB_UNUSED __attribute__((unused)) #endif #ifndef XBT_ATTRIB_DEPRECATED -#define XBT_ATTRIB_DEPRECATED(msg) __attribute__((deprecated(msg))) +#define XBT_ATTRIB_DEPRECATED(mesg) __attribute__((deprecated(mesg))) #endif -#define XBT_ATTRIB_DEPRECATED_v320(msg) XBT_ATTRIB_DEPRECATED(msg) /* Will be dropped in v3.20 */ -#define XBT_ATTRIB_DEPRECATED_v321(msg) XBT_ATTRIB_DEPRECATED(msg) /* Will be dropped in v3.21 */ -#define XBT_ATTRIB_DEPRECATED_v322(msg) XBT_ATTRIB_DEPRECATED(msg) /* Will be dropped in v3.22 */ +#define XBT_ATTRIB_DEPRECATED_v320(mesg) XBT_ATTRIB_DEPRECATED(mesg) /* Will be dropped in v3.20 */ +#define XBT_ATTRIB_DEPRECATED_v321(mesg) XBT_ATTRIB_DEPRECATED(mesg) /* Will be dropped in v3.21 */ +#define XBT_ATTRIB_DEPRECATED_v322(mesg) XBT_ATTRIB_DEPRECATED(mesg) /* Will be dropped in v3.22 */ #define XBT_ATTRIB_CONSTRUCTOR(prio) __attribute__((__constructor__(prio))) #define XBT_ATTRIB_DESTRUCTOR(prio) __attribute__((__destructor__(prio))) diff --git a/include/xbt/str.h b/include/xbt/str.h index 20b9a65b59..7880b4be8e 100644 --- a/include/xbt/str.h +++ b/include/xbt/str.h @@ -30,8 +30,8 @@ XBT_PUBLIC xbt_dynar_t xbt_str_split_quoted_in_place(char* s); XBT_PUBLIC char* xbt_str_join_array(const char* const* strs, const char* sep); -XBT_PUBLIC long int xbt_str_parse_int(const char* str, const char* error_msg); -XBT_PUBLIC double xbt_str_parse_double(const char* str, const char* error_msg); +XBT_PUBLIC long int xbt_str_parse_int(const char* str, const char* error_mesg); +XBT_PUBLIC double xbt_str_parse_double(const char* str, const char* error_mesg); #define XBT_DJB2_HASH_FUNCTION //#define XBT_FNV_HASH_FUNCTION -- 2.20.1