From e379b4008b304af4688fe6cb29fbfdaf9e9e6873 Mon Sep 17 00:00:00 2001 From: navarrop Date: Fri, 4 Jun 2010 16:04:26 +0000 Subject: [PATCH] Use a portable inline git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7827 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/simix/private.h | 18 +++++++++--------- src/simix/smx_network.c | 26 +++++++++++++++----------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/simix/private.h b/src/simix/private.h index eec2c34c6f..6cf1c9a1c9 100644 --- a/src/simix/private.h +++ b/src/simix/private.h @@ -165,10 +165,10 @@ typedef struct s_smx_comm { void SIMIX_network_copy_data(smx_comm_t comm); smx_comm_t SIMIX_communication_new(smx_comm_type_t type); -static inline void SIMIX_communication_use(smx_comm_t comm); -static inline void SIMIX_communication_wait_for_completion(smx_comm_t comm, double timeout); -static inline void SIMIX_rdv_push(smx_rdv_t rdv, smx_comm_t comm); -static inline void SIMIX_rdv_remove(smx_rdv_t rdv, smx_comm_t comm); +static XBT_INLINE void SIMIX_communication_use(smx_comm_t comm); +static XBT_INLINE void SIMIX_communication_wait_for_completion(smx_comm_t comm, double timeout); +static XBT_INLINE void SIMIX_rdv_push(smx_rdv_t rdv, smx_comm_t comm); +static XBT_INLINE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_comm_t comm); /********************************* Action *************************************/ @@ -284,7 +284,7 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory); * \param cleanup_func the function to call when the context stops * \param cleanup_arg the argument of the cleanup_func function */ -static inline smx_context_t SIMIX_context_new(xbt_main_func_t code, int argc, +static XBT_INLINE smx_context_t SIMIX_context_new(xbt_main_func_t code, int argc, char** argv, void_f_pvoid_t cleanup_func, void* cleanup_arg) { @@ -298,7 +298,7 @@ static inline smx_context_t SIMIX_context_new(xbt_main_func_t code, int argc, * \param context the context to destroy * Argument must be stopped first -- runs in maestro context */ -static inline void SIMIX_context_free(smx_context_t context) { +static XBT_INLINE void SIMIX_context_free(smx_context_t context) { (*(simix_global->context_factory->free)) (context); } @@ -306,7 +306,7 @@ static inline void SIMIX_context_free(smx_context_t context) { * \brief stops the execution of a context * \param context to stop */ -static inline void SIMIX_context_stop(smx_context_t context) { +static XBT_INLINE void SIMIX_context_stop(smx_context_t context) { (*(simix_global->context_factory->stop)) (context); } @@ -315,7 +315,7 @@ static inline void SIMIX_context_stop(smx_context_t context) { \param old_context the actual context from which is resuming \param new_context the context to resume */ -static inline void SIMIX_context_resume(smx_context_t new_context) +static XBT_INLINE void SIMIX_context_resume(smx_context_t new_context) { (*(simix_global->context_factory->resume)) (new_context); } @@ -325,7 +325,7 @@ static inline void SIMIX_context_resume(smx_context_t new_context) scheduled it \param context the context to be suspended (it must be the running one) */ -static inline void SIMIX_context_suspend(smx_context_t context) +static XBT_INLINE void SIMIX_context_suspend(smx_context_t context) { (*(simix_global->context_factory->suspend)) (context); } diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c index f1533a8019..4c7ae51d6c 100644 --- a/src/simix/smx_network.c +++ b/src/simix/smx_network.c @@ -54,7 +54,7 @@ void SIMIX_rdv_destroy(smx_rdv_t rdv) * \param rdv The rendez-vous point * \param comm The communication request */ -static inline void SIMIX_rdv_push(smx_rdv_t rdv, smx_comm_t comm) +static XBT_INLINE void SIMIX_rdv_push(smx_rdv_t rdv, smx_comm_t comm) { xbt_fifo_push(rdv->comm_fifo, comm); comm->rdv = rdv; @@ -65,7 +65,7 @@ static inline void SIMIX_rdv_push(smx_rdv_t rdv, smx_comm_t comm) * \param rdv The rendez-vous point * \param comm The communication request */ -static inline void SIMIX_rdv_remove(smx_rdv_t rdv, smx_comm_t comm) +static XBT_INLINE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_comm_t comm) { xbt_fifo_remove(rdv->comm_fifo, comm); comm->rdv = NULL; @@ -194,7 +194,7 @@ void SIMIX_communication_destroy(smx_comm_t comm) * maybe is in use by others. * \ */ -static inline void SIMIX_communication_use(smx_comm_t comm) +static XBT_INLINE void SIMIX_communication_use(smx_comm_t comm) { comm->refcount++; } @@ -203,7 +203,7 @@ static inline void SIMIX_communication_use(smx_comm_t comm) * \brief Start the simulation of a communication request * \param comm The communication request */ -static inline void SIMIX_communication_start(smx_comm_t comm) +static XBT_INLINE void SIMIX_communication_start(smx_comm_t comm) { /* If both the sender and the receiver are already there, start the communication */ if(comm->src_proc && comm->dst_proc){ @@ -242,7 +242,7 @@ static inline void SIMIX_communication_start(smx_comm_t comm) * - timeout_error if communication reached the timeout specified (either because of local peer or remote peer) * - network_error if network failed or remote peer failed */ -static inline void SIMIX_communication_wait_for_completion(smx_comm_t comm, double timeout) +static XBT_INLINE void SIMIX_communication_wait_for_completion(smx_comm_t comm, double timeout) { smx_action_t act_sleep = NULL; int src_timeout = 0; @@ -360,7 +360,8 @@ void SIMIX_network_copy_buffer_callback(smx_comm_t comm, size_t buff_size) { void SIMIX_network_copy_data(smx_comm_t comm) { size_t buff_size = comm->src_buff_size; - + uintptr_t casted_size = 0; + uintptr_t amount = 0; /* If there is no data to be copy then return */ if(!comm->src_buff || !comm->dst_buff || comm->copied == 1) return; @@ -391,8 +392,8 @@ void SIMIX_network_copy_data(smx_comm_t comm) { if (msg_sizes == NULL) msg_sizes = xbt_dict_new(); - uintptr_t casted_size = comm->task_size; - uintptr_t amount = xbt_dicti_get(msg_sizes, casted_size); + casted_size = comm->task_size; + amount = xbt_dicti_get(msg_sizes, casted_size); amount++; xbt_dicti_set(msg_sizes,casted_size, amount); @@ -401,10 +402,13 @@ void SIMIX_network_copy_data(smx_comm_t comm) #include "xbt.h" /* pimple to display the message sizes */ void SIMIX_message_sizes_output(const char *filename) { - FILE * out = fopen(filename,"w"); - xbt_assert1(out,"Cannot open file %s",filename); - uintptr_t key,data; + uintptr_t key = 0; + uintptr_t data = 0; xbt_dict_cursor_t cursor; + FILE * out = NULL; + out = fopen(filename,"w"); + xbt_assert1(out,"Cannot open file %s",filename); + xbt_dict_foreach(msg_sizes,cursor,key,data) { fprintf(out,"%zu %zu\n",key,data); } -- 2.20.1