Reduce the layering madness a bit

[simgrid.git] / include / xbt / synchro.h

diff --git a/include/xbt/synchro_core.h b/include/xbt/synchro.h
similarity index 78%
rename from include/xbt/synchro_core.h
rename to include/xbt/synchro.h
index 6a54d5a..d0664f9 100644 (file)
--- a/include/xbt/synchro_core.h
+++ b/include/xbt/synchro.h
@@ -1,20 +1,17 @@
-/* xbt/synchro_core.h -- Simulated synchronization                          */
+/* xbt/synchro.h -- Simulated synchronization                               */
 
 /* Copyright (c) 2009-2016. The SimGrid Team.                               */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-/* splited away from synchro.h since we are used by dynar.h, and synchro.h uses dynar */
-
-
 #ifndef _XBT_THREAD_H
 #define _XBT_THREAD_H
 
 #include <simgrid/simix.h>
 
-#include "xbt/misc.h"           /* SG_BEGIN_DECL */
 #include "xbt/function_types.h"
+#include "xbt/misc.h" /* SG_BEGIN_DECL */
 
 SG_BEGIN_DECL()
 
@@ -31,7 +28,7 @@ SG_BEGIN_DECL()
 /** @brief Thread mutex data type (opaque object)
  *  @hideinitializer
  */
-typedef struct s_smx_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);
@@ -39,7 +36,7 @@ XBT_PUBLIC(xbt_mutex_t) xbt_mutex_init(void);
 /** @brief Blocks onto the given mutex variable */
 XBT_PUBLIC(void) xbt_mutex_acquire(xbt_mutex_t mutex);
 
-/** @brief Tries to block onto the given mutex variable 
+/** @brief Tries to block onto the given mutex variable
  * Tries to lock a mutex, return 1 if the mutex is unlocked, else 0.
  * This function does not block and wait for the mutex to be unlocked.
  * \param mutex The mutex
@@ -53,11 +50,10 @@ XBT_PUBLIC(void) xbt_mutex_release(xbt_mutex_t mutex);
 /** @brief Destroyes the given mutex variable */
 XBT_PUBLIC(void) xbt_mutex_destroy(xbt_mutex_t mutex);
 
-
 /** @brief Thread condition data type (opaque object)
  *  @hideinitializer
  */
-typedef struct s_smx_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);
@@ -74,13 +70,7 @@ XBT_PUBLIC(void) xbt_cond_broadcast(xbt_cond_t cond);
 /** @brief Destroys the given mutex variable */
 XBT_PUBLIC(void) xbt_cond_destroy(xbt_cond_t cond);
 
-#define XBT_BARRIER_SERIAL_PROCESS -1
-typedef struct s_xbt_bar_ *xbt_bar_t;
-XBT_PUBLIC(xbt_bar_t) xbt_barrier_init( unsigned int count);
-XBT_PUBLIC(void) xbt_barrier_destroy(xbt_bar_t bar);
-XBT_PUBLIC(int) xbt_barrier_wait(xbt_bar_t bar);
-
 /** @} */
 
 SG_END_DECL()
-#endif                          /* _XBT_THREAD_H */
+#endif /* _XBT_THREAD_H */