From: Martin Quinson Date: Thu, 21 Apr 2016 13:24:09 +0000 (+0200) Subject: rename a struct for consistency X-Git-Tag: v3_13~34^2~41 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/05d190ed39b43f561714b3a065dbb6dcab48b364 rename a struct for consistency --- diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 0ea4c0ef63..7642313895 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -26,7 +26,7 @@ SG_BEGIN_DECL() * #MSG_task_send and friends) hide this object behind a string * alias. That mean that you don't provide the mailbox on which you * want to send your task, but only the name of this mailbox. */ -typedef struct s_smx_rvpoint *msg_mailbox_t; +typedef struct s_smx_mailbox *msg_mailbox_t; /* ******************************** Environment ************************************ */ typedef simgrid_As *msg_as_t; diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index ae24e72b22..78977d088b 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -138,7 +138,7 @@ typedef smx_process_t (*smx_creation_func_t) ( /** * \ingroup simix_rdv_management */ -typedef struct s_smx_rvpoint *smx_mailbox_t; +typedef struct s_smx_mailbox *smx_mailbox_t; XBT_PUBLIC(void*) SIMIX_comm_get_src_data(smx_synchro_t synchro); XBT_PUBLIC(void*) SIMIX_comm_get_dst_data(smx_synchro_t synchro); diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index 9b79a4f915..2e353dc325 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -49,7 +49,7 @@ smx_mailbox_t SIMIX_rdv_create(const char *name) smx_mailbox_t rdv = name ? (smx_mailbox_t) xbt_dict_get_or_null(rdv_points, name) : NULL; if (!rdv) { - rdv = xbt_new0(s_smx_rvpoint_t, 1); + rdv = xbt_new0(s_smx_mailbox_t, 1); rdv->name = name ? xbt_strdup(name) : NULL; rdv->comm_fifo = xbt_fifo_new(); rdv->done_comm_fifo = xbt_fifo_new(); diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h index a1039d6551..22428e45c3 100644 --- a/src/simix/smx_network_private.h +++ b/src/simix/smx_network_private.h @@ -13,13 +13,13 @@ #include "popping_private.h" /** @brief Rendez-vous point datatype */ -typedef struct s_smx_rvpoint { +typedef struct s_smx_mailbox { char *name; xbt_fifo_t comm_fifo; void *data; smx_process_t permanent_receiver; //process which the mailbox is attached to xbt_fifo_t done_comm_fifo;//messages already received in the permanent receive mode -} s_smx_rvpoint_t; +} s_smx_mailbox_t; XBT_PRIVATE void SIMIX_network_init(void); XBT_PRIVATE void SIMIX_network_exit(void);