From: Martin Quinson Date: Fri, 22 Apr 2016 10:19:51 +0000 (+0200) Subject: don't include a smx private header in xbt implem X-Git-Tag: v3_13~34^2~32 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/104db8990fcd552633e6f08ccd9568f26299d0cb don't include a smx private header in xbt implem --- diff --git a/include/xbt/synchro_core.h b/include/xbt/synchro_core.h index 9f94e82b3c..50684edca2 100644 --- a/include/xbt/synchro_core.h +++ b/include/xbt/synchro_core.h @@ -31,7 +31,7 @@ SG_BEGIN_DECL() /** @brief Thread mutex data type (opaque object) * @hideinitializer */ -typedef struct s_xbt_mutex_ *xbt_mutex_t; +typedef struct s_smx_mutex_ *xbt_mutex_t; /** @brief Creates a new mutex variable */ XBT_PUBLIC(xbt_mutex_t) xbt_mutex_init(void); @@ -57,7 +57,7 @@ XBT_PUBLIC(void) xbt_mutex_destroy(xbt_mutex_t mutex); /** @brief Thread condition data type (opaque object) * @hideinitializer */ -typedef struct s_xbt_cond_ *xbt_cond_t; +typedef struct s_smx_cond_ *xbt_cond_t; /** @brief Creates a condition variable */ XBT_PUBLIC(xbt_cond_t) xbt_cond_init(void); diff --git a/src/xbt/xbt_os_synchro.c b/src/xbt/xbt_os_synchro.c index 5ece743e10..52b1762a1c 100644 --- a/src/xbt/xbt_os_synchro.c +++ b/src/xbt/xbt_os_synchro.c @@ -13,15 +13,10 @@ #include "xbt/synchro_core.h" #include "simgrid/simix.h" /* used implementation */ -#include "../simix/smx_private.h" /* FIXME */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt, "Synchronization mechanism"); /****** mutex related functions ******/ -struct s_xbt_mutex_ { - s_smx_mutex_t mutex; -}; - xbt_mutex_t xbt_mutex_init(void) { return (xbt_mutex_t) simcall_mutex_init(); @@ -48,10 +43,6 @@ void xbt_mutex_destroy(xbt_mutex_t mutex) } /***** condition related functions *****/ -struct s_xbt_cond_ { - s_smx_cond_t cond; -}; - xbt_cond_t xbt_cond_init(void) { return (xbt_cond_t) simcall_cond_init();