A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'condvar'
[simgrid.git]
/
include
/
smpi
/
mpi.h
diff --git
a/include/smpi/mpi.h
b/include/smpi/mpi.h
index
8129fda
..
5021574
100644
(file)
--- a/
include/smpi/mpi.h
+++ b/
include/smpi/mpi.h
@@
-9,12
+9,6
@@
#define SEED 221238
#define SEED 221238
-#define sleep(x) smpi_sleep(x)
-#if _POSIX_TIMERS > 0
-#define nanosleep(x, y) smpi_nanosleep(x, y)
-#endif
-#define usleep(x) smpi_usleep(x)
-
#include <smpi/smpi.h>
#include <xbt/sysdep.h>
#include <xbt/log.h>
#include <smpi/smpi.h>
#include <xbt/sysdep.h>
#include <xbt/log.h>
@@
-22,8
+16,12
@@
#include <simgrid/modelchecker.h>
#include <sys/time.h> /* Load it before the define next line to not mess with the system headers */
#include <simgrid/modelchecker.h>
#include <sys/time.h> /* Load it before the define next line to not mess with the system headers */
+
+#define sleep(x) smpi_sleep(x)
+#define usleep(x) smpi_usleep(x)
#define gettimeofday(x, y) smpi_gettimeofday(x, NULL)
#if _POSIX_TIMERS > 0
#define gettimeofday(x, y) smpi_gettimeofday(x, NULL)
#if _POSIX_TIMERS > 0
+#define nanosleep(x, y) smpi_nanosleep(x, y)
#define clock_gettime(x, y) smpi_clock_gettime(x, y)
#endif
#if HAVE_MC
#define clock_gettime(x, y) smpi_clock_gettime(x, y)
#endif
#if HAVE_MC