X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2ea635a5734eea3e3a9e4ac3577471c8307bb597..def75190166f07cc72917cb15535b660aa976e7f:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index bc07ffe3ee..4c0fb6c743 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -32,24 +32,26 @@ namespace simix { class Process; class Context; class ContextFactory; - + class Mutex; } } typedef simgrid::simix::Context *smx_context_t; typedef simgrid::simix::Process *smx_process_t; +/** + * \ingroup simix_synchro_management + */ +typedef simgrid::simix::Mutex *smx_mutex_t; + #else typedef struct s_smx_context *smx_context_t; typedef struct s_smx_process *smx_process_t; +typedef struct s_smx_mutex *smx_mutex_t; #endif - - -SG_BEGIN_DECL() - /**************************** Scalar Values **********************************/ typedef union u_smx_scalar u_smx_scalar_t; @@ -83,10 +85,7 @@ typedef enum { /** @} */ /* ******************************** Synchro ************************************ */ -/** - * \ingroup simix_synchro_management - */ -typedef struct s_smx_mutex *smx_mutex_t; + /** * \ingroup simix_synchro_management */ @@ -127,6 +126,8 @@ extern int smx_context_stack_size_was_set; extern int smx_context_guard_size; extern int smx_context_guard_size_was_set; +SG_BEGIN_DECL() + XBT_PUBLIC(xbt_dynar_t) SIMIX_process_get_runnable(void); XBT_PUBLIC(smx_process_t) SIMIX_process_from_PID(int PID); XBT_PUBLIC(xbt_dynar_t) SIMIX_processes_as_dynar(void);